Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6aa902016 | ||
|
|
bfd38fca73 | ||
|
|
0788c12f40 | ||
|
|
3c405887b8 | ||
|
|
0c747f2c49 | ||
|
|
bc5606e32c | ||
|
|
37a0d8b0a7 | ||
|
|
8452563b03 | ||
|
|
96932541db | ||
|
|
a442fe0621 | ||
|
|
d6ebf18af2 | ||
|
|
84b3fd552a | ||
|
|
1239df4855 | ||
|
|
476e38ca41 | ||
|
|
0b07d0d374 | ||
|
|
48d2216394 | ||
|
|
bd5f4a4ccb | ||
|
|
9d050ff20b | ||
|
|
6e835a5dad | ||
|
|
4592ce5d95 | ||
|
|
1889eff0b7 | ||
|
|
e4c52c82fe | ||
|
|
3fa55eb32f | ||
|
|
11fce1e7db | ||
|
|
3616bce66d | ||
|
|
de3144d420 | ||
|
|
34768b446a | ||
|
|
465a962f58 | ||
|
|
addc24b60c | ||
|
|
46113fc833 | ||
|
|
34cc6c7481 | ||
|
|
401181824c | ||
|
|
0770c94f84 | ||
|
|
df26351d07 | ||
|
|
98851c8ddd | ||
|
|
c4c7563c20 | ||
|
|
22da143027 | ||
|
|
a3a87aa868 | ||
|
|
9f7f8896f3 | ||
|
|
6e53534df7 | ||
|
|
63367ececb | ||
|
|
e9c6684b40 | ||
|
|
57dc367b73 | ||
|
|
09bd3db9a3 | ||
|
|
c6b9cdd3ce | ||
|
|
0e2bb2f835 | ||
|
|
ef2d78c7ff | ||
|
|
215992c6b3 | ||
|
|
fab417e5b1 | ||
|
|
a460ffb25c | ||
|
|
9929ecd025 | ||
|
|
df9e62322e | ||
|
|
d1552d1bd4 | ||
|
|
f82794763c | ||
|
|
14d223de5a | ||
|
|
e5be6cda81 | ||
|
|
6b2723e651 | ||
|
|
f83228f6d2 | ||
|
|
2ef86dc304 | ||
|
|
893041b7fc | ||
|
|
84f32dbeaa | ||
|
|
81f4c26f4c | ||
|
|
1b60ce62db | ||
|
|
73d4ba84de |
No files matched your search
@@ -0,0 +1,143 @@
|
||||
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
|
||||
# the node-arcade-VERSION release. Inner Breeze's node follower then signs
|
||||
# that release and publishes it to Waozi's node, where Arcade downloads games.
|
||||
# A game's release workflow starts this at once; the timer is the fallback,
|
||||
# since GitHub runs scheduled workflows hours late.
|
||||
on:
|
||||
schedule:
|
||||
- cron: '7,22,37,52 * * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
concurrency:
|
||||
group: arcade-node-release
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
follow:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 45
|
||||
defaults:
|
||||
run:
|
||||
working-directory: waozixyz/arcade
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
path: waozixyz/arcade
|
||||
- name: Check release following
|
||||
run: python3 tests/game_updates_test.py
|
||||
- name: Find newer game releases
|
||||
id: updates
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
python3 scripts/follow-game-releases.py check
|
||||
if [ "$(python3 -c 'import json; print(len(json.load(open("build/game-updates.json"))))')" = 0 ]; then
|
||||
echo "changed=false" >> "$GITHUB_OUTPUT"
|
||||
echo "Arcade already pins every game's latest release."
|
||||
exit 0
|
||||
fi
|
||||
echo "changed=true" >> "$GITHUB_OUTPUT"
|
||||
python3 - <<'PY' >> "$GITHUB_OUTPUT"
|
||||
import json
|
||||
lock = json.load(open('ziran.lock'))
|
||||
print('toolchain=' + lock['toolchain']['commit'])
|
||||
PY
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
with:
|
||||
repository: ziranlang/ziran
|
||||
ref: ${{ steps.updates.outputs.toolchain }}
|
||||
path: ziranlang/ziran
|
||||
- name: Install build dependencies
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
working-directory: .
|
||||
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential python3-pil python3-cryptography
|
||||
- name: Build the locked toolchain and pin game dependencies
|
||||
id: pin
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
make -j2 -C ../../ziranlang/ziran
|
||||
echo "$GITHUB_WORKSPACE/ziranlang/ziran/build/bin" >> "$GITHUB_PATH"
|
||||
python3 scripts/follow-game-releases.py pin --ziran ../../ziranlang/ziran/build/bin/ziran
|
||||
python3 - <<'PY' >> "$GITHUB_OUTPUT"
|
||||
import json
|
||||
lock = json.load(open('ziran.lock'))
|
||||
shovey = lock['root']['dependencies']['shovey']
|
||||
print('shovey=' + next(p['commit'] for p in lock['packages'] if p['id'] == shovey))
|
||||
PY
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
with:
|
||||
repository: waozixyz/shovey
|
||||
ref: ${{ steps.pin.outputs.shovey }}
|
||||
path: waozixyz/shovey
|
||||
- name: Fetch the updated packages
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
run: |
|
||||
# The game is generated in its own checkout at the pinned release.
|
||||
printf '[overrides]\nshovey = "../shovey"\nziran = "../../ziranlang/ziran"\n' > ziran.local.toml
|
||||
../../ziranlang/ziran/build/bin/ziran fetch
|
||||
- name: Write the Arcade release
|
||||
id: release
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
run: |
|
||||
python3 scripts/follow-game-releases.py changelog --ziran ../../ziranlang/ziran/build/bin/ziran
|
||||
sh update_version.sh
|
||||
python3 scripts/follow-game-releases.py art
|
||||
echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
|
||||
head -12 CHANGELOG.md
|
||||
- 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
|
||||
- name: Commit the release
|
||||
id: commit
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
env:
|
||||
VERSION: ${{ steps.release.outputs.version }}
|
||||
run: |
|
||||
git config user.name Waozi
|
||||
git config user.email [email protected]
|
||||
git add ziran.toml ziran.lock CHANGELOG.md VERSION apps/versions.json assets/arcade/library
|
||||
git commit -q -m "Release Arcade $VERSION with the latest game releases"
|
||||
git push origin HEAD:master
|
||||
echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
|
||||
- name: Attach the checked catalog and game archive
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
VERSION: ${{ steps.release.outputs.version }}
|
||||
SHA: ${{ steps.commit.outputs.sha }}
|
||||
run: |
|
||||
set -eu
|
||||
gh release create "node-arcade-$VERSION" build/node-apps/arcade.zx build/node-apps/arcade.games.tar build/games/wurm.zx \
|
||||
--target "$SHA" --title "Arcade $VERSION" \
|
||||
--notes 'Arcade downloads the selected game separately and preserves earned progress.'
|
||||
echo "Arcade $VERSION is ready for the node: sha256 $(sha256sum build/node-apps/arcade.zx | cut -d' ' -f1)"
|
||||
# Breeze's node follower signs this release and publishes it to the
|
||||
# node now, not at its next timer. RELEASE_FOLLOW_TOKEN may only start
|
||||
# workflows in Arcade and Breeze; the follower takes no input and
|
||||
# checks Arcade's newest release itself. Without it the timer follows.
|
||||
- name: Start the node follower
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.RELEASE_FOLLOW_TOKEN }}
|
||||
run: |
|
||||
if [ -z "$GH_TOKEN" ]; then
|
||||
echo "No RELEASE_FOLLOW_TOKEN: Breeze's node follower picks this release up on its timer."
|
||||
exit 0
|
||||
fi
|
||||
gh workflow run node-app-follow.yml -R waozixyz/breeze --ref master
|
||||
@@ -0,0 +1,107 @@
|
||||
name: Arcade node release
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
sha256:
|
||||
description: SHA-256 of the locally verified node catalog
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
concurrency:
|
||||
group: arcade-node-release
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 30
|
||||
defaults:
|
||||
run:
|
||||
working-directory: waozixyz/arcade
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
path: waozixyz/arcade
|
||||
- name: Read the fixed dependency revisions
|
||||
id: dependencies
|
||||
env:
|
||||
EXPECTED_SHA256: ${{ inputs.sha256 }}
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import json, os, re
|
||||
if not re.fullmatch('[0-9a-f]{64}', os.environ['EXPECTED_SHA256']):
|
||||
raise SystemExit('Give the exact verified catalog SHA-256')
|
||||
lock = json.load(open('ziran.lock'))
|
||||
game = next(p['commit'] for p in lock['packages'] if p['url'] == 'https://github.com/waozixyz/shovey.git')
|
||||
with open(os.environ['GITHUB_OUTPUT'], 'a') as output:
|
||||
output.write('toolchain=' + lock['toolchain']['commit'] + '\nshovey=' + game + '\n')
|
||||
PY
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
repository: ziranlang/ziran
|
||||
ref: ${{ steps.dependencies.outputs.toolchain }}
|
||||
path: ziranlang/ziran
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
repository: waozixyz/shovey
|
||||
ref: ${{ steps.dependencies.outputs.shovey }}
|
||||
path: waozixyz/shovey
|
||||
- name: Install build dependencies
|
||||
working-directory: .
|
||||
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential python3-pil python3-cryptography
|
||||
- name: Build the locked toolchain and fetch packages
|
||||
run: |
|
||||
make -j2 -C ../../ziranlang/ziran
|
||||
echo "$GITHUB_WORKSPACE/ziranlang/ziran/build/bin" >> "$GITHUB_PATH"
|
||||
# These are the exact revisions read from the release lock above.
|
||||
# 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: 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
|
||||
# The candidate's digest, so a local check can compare the exact bytes.
|
||||
sha256sum build/node-apps/arcade.zx
|
||||
echo "$EXPECTED_SHA256 build/node-apps/arcade.zx" | sha256sum --check --strict
|
||||
# When the digest is not the expected one, keep the candidate for a local
|
||||
# check; nothing is published.
|
||||
- name: Keep the unpublished candidate
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: arcade-candidate
|
||||
path: |
|
||||
waozixyz/arcade/build/node-apps/arcade.zx
|
||||
waozixyz/arcade/build/node-apps/arcade.json
|
||||
waozixyz/arcade/build/node-apps/arcade.games.tar
|
||||
waozixyz/arcade/build/games/wurm.zx
|
||||
waozixyz/arcade/build/apps-ui/apps.zx
|
||||
if-no-files-found: ignore
|
||||
retention-days: 1
|
||||
- name: Publish the checked catalog and game archive
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
set -eu
|
||||
version=$(cat VERSION)
|
||||
tag="node-arcade-$version"
|
||||
if gh release view "$tag" >/dev/null 2>&1; then
|
||||
mkdir -p build/prior-node-release
|
||||
gh release download "$tag" --pattern arcade.zx --pattern arcade.games.tar --pattern wurm.zx --dir build/prior-node-release
|
||||
cmp build/prior-node-release/arcade.zx build/node-apps/arcade.zx
|
||||
cmp build/prior-node-release/arcade.games.tar build/node-apps/arcade.games.tar
|
||||
cmp build/prior-node-release/wurm.zx build/games/wurm.zx
|
||||
else
|
||||
gh release create "$tag" build/node-apps/arcade.zx build/node-apps/arcade.games.tar build/games/wurm.zx \
|
||||
--target "$GITHUB_SHA" --title "Arcade $version" \
|
||||
--notes 'Arcade downloads the selected game separately and preserves earned progress.'
|
||||
fi
|
||||
@@ -0,0 +1,123 @@
|
||||
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.
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
workflow_run:
|
||||
workflows: [Arcade node release, Game updates]
|
||||
types: [completed]
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
# A running build finishes; only the newest waiting one follows it.
|
||||
concurrency:
|
||||
group: arcade-site
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
build:
|
||||
if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 45
|
||||
defaults:
|
||||
run:
|
||||
working-directory: waozixyz/arcade
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
path: waozixyz/arcade
|
||||
ref: master
|
||||
fetch-depth: 0
|
||||
- name: Read the locked toolchain
|
||||
id: toolchain
|
||||
run: |
|
||||
python3 -c 'import json,os; open(os.environ["GITHUB_OUTPUT"],"a").write("commit="+json.load(open("ziran.lock"))["toolchain"]["commit"]+"\n")'
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
repository: ziranlang/ziran
|
||||
ref: ${{ steps.toolchain.outputs.commit }}
|
||||
path: ziranlang/ziran
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 22
|
||||
- name: Install build dependencies
|
||||
working-directory: .
|
||||
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential cmake pkg-config
|
||||
- uses: mymindstorm/setup-emsdk@v14
|
||||
with:
|
||||
version: '6.0.6'
|
||||
actions-cache-folder: emsdk-cache
|
||||
- name: Build the locked toolchain and fetch packages
|
||||
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
|
||||
- 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"
|
||||
- name: Build the browser edition
|
||||
run: |
|
||||
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)" \
|
||||
--version '${{ steps.published.outputs.version }}'
|
||||
rm -f build/web-site/runtime.html
|
||||
- name: Open Arcade in a private browser
|
||||
run: |
|
||||
export CHROMIUM="$(command -v google-chrome || command -v chromium)"
|
||||
env -u DISPLAY -u WAYLAND_DISPLAY -u XAUTHORITY -u DBUS_SESSION_BUS_ADDRESS node tests/web_site_test.mjs build/web-site
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: arcade-site
|
||||
path: waozixyz/arcade/build/web-site
|
||||
retention-days: 1
|
||||
|
||||
deploy:
|
||||
needs: build
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 10
|
||||
environment:
|
||||
name: cloudflare-pages
|
||||
url: https://arcade.waozi.xyz
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
ref: master
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: arcade-site
|
||||
path: build/web-site
|
||||
- name: Prepare the Pages project
|
||||
env:
|
||||
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||
run: python3 scripts/cloudflare-site.py prepare
|
||||
- name: Deploy to Cloudflare Pages
|
||||
uses: cloudflare/wrangler-action@v3
|
||||
with:
|
||||
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||
command: pages deploy build/web-site --project-name=arcade --branch=master --commit-hash=${{ github.sha }}
|
||||
- name: Connect arcade.waozi.xyz
|
||||
env:
|
||||
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||
run: python3 scripts/cloudflare-site.py connect
|
||||
@@ -1,5 +1,142 @@
|
||||
# Arcade changelog
|
||||
|
||||
## 0.7.93
|
||||
|
||||
- Shovey 0.6.156: Finishing all 175 levels opens a reward window: press Claim to get your Dew. The first 10 players to finish get 100 Dew, the next 20 get 50, players up to the 100th get 20, and everyone after gets 5.
|
||||
|
||||
## 0.7.92
|
||||
|
||||
- Shovey 0.6.156: Finishing all 175 levels opens a reward window: press Claim to get your Dew. The first 10 players to finish get 100 Dew, the next 20 get 50, players up to the 100th get 20, and everyone after gets 5.
|
||||
|
||||
## 0.7.91
|
||||
|
||||
- Shovey 0.6.155: Set an account alias with capitals, an @ or spaces; a taken alias now says so.
|
||||
- Apfelwurm 0.2.2: Set an account alias with capitals, an @ or spaces; a taken alias now says so.
|
||||
|
||||
## 0.7.90
|
||||
|
||||
- Set an account alias with capitals, an @ or spaces; a taken alias now says so.
|
||||
- Shovey 0.6.155: Set an account alias with capitals, an @ or spaces; a taken alias now says so.
|
||||
|
||||
## 0.7.89
|
||||
|
||||
- Apfelwurm 0.2.1: Use Arcade or Inner Breeze's Profile, Dew and navigation when playing inside them, without duplicate title controls or an extra Back button.
|
||||
- Apfelwurm 0.2.1: Open the shared Profile reliably from the skin shop's sign-in button.
|
||||
|
||||
## 0.7.88
|
||||
|
||||
- Apfelwurm 0.2.0: Play with softer Dusk, Forest and Sage themes, with saved sound and control settings.
|
||||
- Apfelwurm 0.2.0: See a continuous painted meadow instead of a repeating grass grid, and clear Profile and Dew icons on the title.
|
||||
- Apfelwurm 0.2.0: Sign in through the shared Profile to sync completed levels, playtime, settings and your chosen character across devices.
|
||||
- Apfelwurm 0.2.0: Browse the skin shop from the title beside Profile and your Dew balance. Mint, Berry and Rose cost 10, 20 and 30 Dew, with confirmation before buying.
|
||||
- Apfelwurm 0.2.0: Earn Night owl after five hours of active play, Golden apple by reaching level 40, and Explorer by visiting waozi.xyz. Purchased skins belong to your account.
|
||||
- Apfelwurm 0.2.0: Unlock all 200 levels by playing. The mobile selector shows large previews for unlocked levels and only a lock for later ones. Dew is used for optional cosmetics.
|
||||
|
||||
## 0.7.87
|
||||
|
||||
- Open the game library faster with smaller cached cover thumbnails for every game.
|
||||
- Keep covers sharp and logos transparent while downloading much less artwork.
|
||||
|
||||
## 0.7.86
|
||||
|
||||
- Shovey 0.6.154: Keep opened chests open across restarts and account sync; show the blue Dew diamond only while their reward is unclaimed.
|
||||
- Shovey 0.6.154: Show an empty open chest after its Dew is claimed.
|
||||
- Shovey 0.6.154: Use corrected campaign boards after an update, including level 29 when an older campaign was cached offline.
|
||||
|
||||
## 0.7.85
|
||||
|
||||
- Shovey keeps opened and claimed chests synchronized, with a blue diamond only for an unclaimed reward.
|
||||
- Shovey uses corrected boards after an update instead of an older cached campaign.
|
||||
- Apfelwurm shows level previews only after they are unlocked.
|
||||
|
||||
## 0.7.84
|
||||
|
||||
- Complete automatic reward recovery for older Shovey saves.
|
||||
|
||||
## 0.7.83
|
||||
|
||||
- Preserve earned Shovey reward eligibility when upgrading older synced saves.
|
||||
|
||||
## 0.7.82
|
||||
|
||||
- Apfelwurm 0.1.6: Try again after game over starts the furthest unlocked level with three lives and a fresh score.
|
||||
- Apfelwurm 0.1.6: Choose level from the title to browse all five landscapes, preview each board and replay any unlocked level. Future levels remain locked until you reach them.
|
||||
- Apfelwurm 0.1.6: Use Escape to pause or go back in the browser without stopping the game.
|
||||
|
||||
## 0.7.81
|
||||
|
||||
- Update Shovey to the approved campaign and solve puzzles using wooden crates as water bridges.
|
||||
- Shovey Editor recognizes device unlocks, returns to the title, accepts right-click movement and shows a clearer object palette.
|
||||
|
||||
## 0.7.80
|
||||
|
||||
- Keep games covered until their first board is ready and keep complete pictures visible while animation sprites load.
|
||||
- Shovey’s secret chest reopens for unclaimed Dew and shows an empty chest after a confirmed claim.
|
||||
|
||||
## 0.7.79
|
||||
|
||||
- On phones the library shows small covers, two or three in a row.
|
||||
|
||||
## 0.7.78
|
||||
|
||||
- Download Arcade itself in under one megabyte: it lists the games, and their covers and each game arrive separately when you need them.
|
||||
- Covers show only the game art; the download dialog shows the size.
|
||||
- Shovey Editor downloads as a small add-on that reuses Shovey’s game.
|
||||
|
||||
## 0.7.77
|
||||
|
||||
- Apfelwurm 0.1.4: Press Play and go straight into the game: no stage or level select. Play every level in order through all five landscapes, earning lives as your score grows; a game over starts again from level 1.
|
||||
- Apfelwurm 0.1.4: Continue your run from the start of the level you reached; existing stage progress continues from your first uncleared level.
|
||||
|
||||
## 0.7.76
|
||||
|
||||
- Install Shovey Editor as an add-on and reuse Shovey’s art and sounds.
|
||||
- Review every required download and its total size before installing.
|
||||
- Download each game from the server before playing, including Apfelwurm.
|
||||
- Use clean title-screen covers without repeated game names underneath.
|
||||
- Recognize Shovey Editor by its matching Editor title logo.
|
||||
- Shovey includes approved Classic levels 1–175.
|
||||
- All objects stop at the abyss and leave it open.
|
||||
- Existing Shovey saves and completed levels are retained.
|
||||
## 0.7.75
|
||||
|
||||
- See each game’s download size under its cover until it is installed.
|
||||
- Read secondary profile labels clearly in the dark theme.
|
||||
- Browse a dark Arcade library with large rounded title covers; click a cover to play or download its game.
|
||||
- Download games individually, including Apfelwurm, and keep downloaded games available offline.
|
||||
- Return from Shovey levels with the fixed Back control while retaining existing progress.
|
||||
|
||||
## 0.7.74
|
||||
|
||||
- Shovey includes approved Classic levels 1–175.
|
||||
- All objects stop at the abyss and leave it open.
|
||||
- Existing Shovey saves and completed levels are retained.
|
||||
## 0.7.73
|
||||
|
||||
- Shovey includes approved Classic levels 1–175.
|
||||
- All objects stop at the abyss and leave it open.
|
||||
- Existing Shovey saves and completed levels are retained.
|
||||
## 0.7.72
|
||||
|
||||
- Shovey includes approved Classic levels 1–175.
|
||||
- All objects stop at the abyss and leave it open.
|
||||
- Existing Shovey saves and completed levels are retained.
|
||||
## 0.7.71
|
||||
|
||||
- Shovey includes approved Classic levels 1–175.
|
||||
- All objects stop at the abyss and leave it open.
|
||||
- Existing Shovey saves and completed levels are retained.
|
||||
## 0.7.70
|
||||
|
||||
- Shovey includes approved Classic levels 1–175.
|
||||
- All objects stop at the abyss and leave it open.
|
||||
- Existing Shovey saves and completed levels are retained.
|
||||
## 0.7.69
|
||||
|
||||
- Arcade downloads each selected game separately, keeping its initial download smaller.
|
||||
- Shovey keeps movement and unfinished puzzles on each device.
|
||||
- Completed puzzles share unlocks without moving a player already in a level.
|
||||
|
||||
## 0.7.68
|
||||
|
||||
- Shovey includes approved Classic levels 1–175.
|
||||
|
||||
@@ -54,15 +54,18 @@ run: all
|
||||
./build/arcade
|
||||
|
||||
test: all
|
||||
python3 tests/game_updates_test.py
|
||||
$(ZIRAN) fmt --check src/*.zi apps/chess/*.zi tests/chess_engine_behavior.zi tests/chess_app_behavior.zi
|
||||
python3 tests/chess_locale_test.py
|
||||
INBE_SOURCE='$(INBE_SOURCE)' python3 tests/catalog_test.py
|
||||
python3 tests/publisher_test.py
|
||||
python3 tests/apps_controller_test.py
|
||||
python3 tests/startup_art_test.py
|
||||
./build/arcade --list
|
||||
sh tests/chess_engine_zi_test.sh '$(ZIRAN)'
|
||||
sh tests/chess_app_test.sh '$(ZIRAN)'
|
||||
python3 tests/sound_test.py
|
||||
sh tests/collection_loading_test.sh
|
||||
|
||||
chess-engine-test:
|
||||
sh tests/chess_engine_zi_test.sh '$(ZIRAN)'
|
||||
@@ -104,7 +107,17 @@ navigation-ui-test: all
|
||||
timeout 150s xvfb-run -a -n 400 -s '-screen 0 1280x1000x24' python3 tests/standalone_navigation_ui_test.py \
|
||||
--binary '$(CURDIR)/build/arcade' --binary '$(CURDIR)/build/shovey' --inbe-source '$(INBE_SOURCE)'
|
||||
|
||||
install: all
|
||||
.PHONY: install-arcade
|
||||
install-arcade: collection build/entity.zx build/arcade
|
||||
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'
|
||||
ln -sfn '$(LIB_DIR)/arcade' '$(BIN_DIR)/arcade'
|
||||
install -m 0644 packaging/xyz.waozi.arcade.desktop '$(DATA_DIR)/applications/'
|
||||
|
||||
install: all install-arcade
|
||||
mkdir -p '$(BIN_DIR)' '$(LIB_DIR)/games' '$(DATA_DIR)/applications'
|
||||
mkdir -p '$(LIB_DIR)/startup/shovey'
|
||||
install -m 0644 build/startup/shovey/*.png '$(LIB_DIR)/startup/shovey/'
|
||||
@@ -113,8 +126,7 @@ install: all
|
||||
install -m 0755 build/shovey '$(LIB_DIR)/shovey.new'
|
||||
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 build/games/*.zx '$(LIB_DIR)/games/'
|
||||
install -m 0644 build/games/*-preview.png '$(LIB_DIR)/games/'
|
||||
install -m 0644 '$(APPS_BUNDLE)' '$(LIB_DIR)/apps.zx'
|
||||
ln -sfn '$(LIB_DIR)/arcade' '$(BIN_DIR)/arcade'
|
||||
ln -sfn '$(LIB_DIR)/shovey' '$(BIN_DIR)/shovey'
|
||||
mkdir -p '$(DATA_DIR)/icons/hicolor/256x256/apps'
|
||||
|
||||
@@ -1,15 +1,29 @@
|
||||
# Arcade
|
||||
|
||||
Games and entertainment, alongside Werkzeug for practical tools and Inner
|
||||
Breeze for personal growth. The library opens Shovey Classic and Editor
|
||||
directly from full-screen covers.
|
||||
Swipe, turn the arrows, scroll the wheel, or use the arrow keys to choose;
|
||||
press Play/Open or Enter to launch. Standalone Shovey opens on the same
|
||||
carousel with its own covers. Chess is temporarily disabled in Arcade; its code and
|
||||
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.
|
||||
Standalone Shovey opens on its own cover carousel;
|
||||
swipe, use the arrows or scroll the wheel to choose, then press Play/Open.
|
||||
Its desktop startup first draws a small full-colour title preview, then uses
|
||||
the original artwork when the collection is ready.
|
||||
Chess is temporarily disabled in Arcade; its code and
|
||||
existing saved games remain available for a later return.
|
||||
Each edition has a separate save and earned unlocks. Unlocked puzzles show
|
||||
their whole board; locked puzzles keep their lock until earned.
|
||||
|
||||
The published Arcade carries only its catalog, well under one megabyte. Its host supplies the shared Apps controller (Inner Breeze its own, standalone Arcade the `apps.zx` installed beside it), and the covers and previews download once as one separate art bundle. Library covers use thumbnails up to 640 pixels on their longest side, and logos up to 512 pixels, preserving full colours and transparency. Games keep their original artwork. The verified art bundle stays cached across restarts and is replaced when its content changes. The art lives in `assets/arcade/library/` (`python3 scripts/library-art.py` refreshes it when a game's art changes; the build stops until it does). Inner Breeze needs host interface 35 for it. Each game
|
||||
downloads when opened, with its existing identity and saved progress. This
|
||||
catalog requires Inner Breeze host API 34. Downloaded games work offline;
|
||||
standalone Shovey keeps its complete offline collection. Apfelwurm comes from
|
||||
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
|
||||
the editor’s additions download. The editor reuses the original game’s art
|
||||
and sounds, and both remain available offline.
|
||||
|
||||
Chess’s retained implementation can choose a side and one of four computer
|
||||
levels. A local game
|
||||
survives returning to the library and restarting the app. Ask for a hint, take
|
||||
@@ -32,8 +46,8 @@ review are not implemented.
|
||||
|
||||
## Shared Apps library
|
||||
|
||||
Arcade embeds the shared `apps.zx` controller and exact game bundles in a
|
||||
verified collection. Each game package lists its apps in its own `apps.json`:
|
||||
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`:
|
||||
the app's `catalog.json`, and for an app the library opens from a cover, the
|
||||
cover's portrait art, landscape art, logo, caption and action. `games.json`
|
||||
names the game packages, and Arcade's own `apps.json` its own apps. Arcade
|
||||
@@ -69,6 +83,22 @@ bundle, so Inbe supplies its existing profile and account. Inbe retains its
|
||||
existing game sync and friend games. Arcade and Inbe keep separate
|
||||
saved games; this version does not migrate or synchronize games between them.
|
||||
|
||||
## Website
|
||||
|
||||
https://arcade.waozi.xyz runs Arcade in the browser: the latest published
|
||||
`arcade.zx`, the same collection Inner Breeze downloads, with Arcade's own host
|
||||
(`src/web/runtime.zi`) compiled to WebAssembly by Entity's web build. Games
|
||||
download from the node when someone opens them; saves stay in the browser.
|
||||
`.github/workflows/site.yml` rebuilds and publishes it after every push to
|
||||
master and every Arcade release, after `tests/web_site_test.mjs` opens the
|
||||
library in a private browser. `scripts/cloudflare-site.py` creates the Pages
|
||||
project and connects the domain with the repository's `CLOUDFLARE_API_TOKEN`
|
||||
and `CLOUDFLARE_ACCOUNT_ID` secrets.
|
||||
|
||||
Build it locally from this checkout's collection with `make collection`,
|
||||
`python3 scripts/build-entity.py` and `python3 scripts/build-web.py`, then serve
|
||||
`build/web-site`.
|
||||
|
||||
## Build and run
|
||||
|
||||
Dependencies are Git repositories pinned in `ziran.lock`. The toolchain
|
||||
@@ -152,16 +182,30 @@ The cover collection requires an Inbe host with API 28 and the reviewed
|
||||
carousel controller. Older hosts must keep their compatible Arcade release.
|
||||
Building or installing never publishes.
|
||||
|
||||
`make collection` writes the same catalog to `build/arcade.zx`
|
||||
and `build/node-apps/arcade.zx`. Its exact game payloads
|
||||
are in `build/node-apps/arcade.games/`, named by their SHA-256, and in
|
||||
`build/node-apps/arcade.games.tar` for the existing signed node publisher.
|
||||
`make install-arcade` updates only Arcade's desktop launcher and catalog;
|
||||
it does not install game payloads. Previously downloaded games and saves stay
|
||||
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 installs
|
||||
Shovey by default and builds it from that package. Opening Classic
|
||||
Island and 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.
|
||||
|
||||
## Shared Entity profile
|
||||
|
||||
Leaderboard is inside the shared Profile, including standalone Arcade and
|
||||
Shovey. Games report their own level totals under their verified identity;
|
||||
Profile shows only games that are installed, with friend rankings for a
|
||||
connected account. Removing a game hides its board while retaining its save
|
||||
and reported score. Account switches keep rankings separate.
|
||||
|
||||
Standalone Shovey's Profile control on its covers opens the shared `entity.zx`
|
||||
supplied by the Entity package. The host keeps account keys and native file
|
||||
access behind Entity's versioned management service. Returning from Profile
|
||||
|
||||
@@ -1 +1 @@
|
||||
20ad36d054088484f069e3e7aa72135762fe25354fb8249ca0a2fcc019834a48
|
||||
a81eb5b14d2066925d19c3fd922865af40c90673cf54fb11bd7f9bf89a29cb98
|
||||
@@ -13,30 +13,37 @@
|
||||
"shovey": {
|
||||
"id": "arcade.shovey",
|
||||
"title": "Shovey",
|
||||
"version": "0.6.141",
|
||||
"sequence": 149,
|
||||
"version": "0.6.156",
|
||||
"sequence": 164,
|
||||
"host_api": 12
|
||||
},
|
||||
"shovey-island": {
|
||||
"id": "arcade.shovey-island",
|
||||
"title": "Shovey Island \u2014 Coming Soon",
|
||||
"version": "0.4.6",
|
||||
"sequence": 10,
|
||||
"version": "0.4.7",
|
||||
"sequence": 11,
|
||||
"host_api": 12
|
||||
},
|
||||
"shovey-editor": {
|
||||
"id": "arcade.shovey-editor",
|
||||
"title": "Shovey Editor",
|
||||
"version": "0.2.134",
|
||||
"sequence": 136,
|
||||
"version": "0.2.144",
|
||||
"sequence": 146,
|
||||
"host_api": 12
|
||||
},
|
||||
"arcade": {
|
||||
"id": "inbe.arcade",
|
||||
"title": "Arcade",
|
||||
"version": "0.7.68",
|
||||
"sequence": 147,
|
||||
"host_api": 28
|
||||
"version": "0.7.93",
|
||||
"sequence": 172,
|
||||
"host_api": 36
|
||||
},
|
||||
"wurm": {
|
||||
"id": "xyz.waozi.wurm",
|
||||
"title": "Apfelwurm",
|
||||
"version": "0.2.2",
|
||||
"sequence": 9,
|
||||
"host_api": 12
|
||||
}
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 458 KiB |
|
After Width: | Height: | Size: 145 KiB |
|
After Width: | Height: | Size: 444 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 422 KiB |
|
After Width: | Height: | Size: 122 KiB |
|
After Width: | Height: | Size: 429 KiB |
|
After Width: | Height: | Size: 5.4 KiB |
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"shovey-editor-landscape": {
|
||||
"source_sha256": "7b1eae4209ede14807806a4cbce1e2bf7a14d342e75c89042958a524cf60d67e"
|
||||
},
|
||||
"shovey-editor-logo": {
|
||||
"source_sha256": "5417341ed432c49d4ce1df45e5e6bf7e07e11a81face45cb93d7cc9fa976f7a5"
|
||||
},
|
||||
"shovey-editor-portrait": {
|
||||
"source_sha256": "bf0bbeb15249f3d73c1b410e9737f7fd207310dcb5f28b7c3ce45401b77c8f9e"
|
||||
},
|
||||
"shovey-editor-preview": {
|
||||
"source_sha256": "1846b823110fffe82a3dbb319960ce768eefc16699d507d48b8608151eaff430"
|
||||
},
|
||||
"shovey-landscape": {
|
||||
"source_sha256": "40c01eb8300e4c5db52b2d75373e17cdaf7f68140c33c0a225613fc174660747"
|
||||
},
|
||||
"shovey-logo": {
|
||||
"source_sha256": "e47781aa3328f68077589f95d813e9c2e6fff10ebd62a9d003773bb2c2f7a092"
|
||||
},
|
||||
"shovey-portrait": {
|
||||
"source_sha256": "ddcbf989eab5971157d8cdc73494ed03660bb4c7a7679543248f45be260777e3"
|
||||
},
|
||||
"shovey-preview": {
|
||||
"source_sha256": "b1f2e5662cb96f2f5062cb0e5a8cd8ede153173ebc32ad17e26b404f3baf5924"
|
||||
},
|
||||
"wurm-landscape": {
|
||||
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30"
|
||||
},
|
||||
"wurm-portrait": {
|
||||
"source_sha256": "e8962c969f554567d598eb0b54db5836f7f1ed7462619463040c6cc2887a5a47"
|
||||
},
|
||||
"wurm-preview": {
|
||||
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 559 KiB |
|
After Width: | Height: | Size: 461 KiB |
|
After Width: | Height: | Size: 110 KiB |
@@ -50,6 +50,9 @@ Unknown languages fall back to the game's English text.
|
||||
|
||||
Arcade and Inbe still provide separate local/account storage. Sharing one
|
||||
game implementation does not silently merge or migrate their saved games.
|
||||
Host API 36 adds read-only records explicitly exported to verified direct
|
||||
dependencies. Shovey exports its local campaign so Editor can display device
|
||||
unlocks alongside account progress without uploading device-only progress.
|
||||
|
||||
## Updates and publication gate
|
||||
|
||||
@@ -87,7 +90,15 @@ Host API numbers alone do not prove compatibility: the intended host must
|
||||
also understand the bundle's VM format. Test each platform and oldest host
|
||||
version a release is intended to support. An unsupported VM format requires
|
||||
a compatible build or a host update; never relabel a package to bypass it.
|
||||
Passing checks prepares a release; the owner still approves publication.
|
||||
Passing checks prepares a release.
|
||||
|
||||
Game releases reach Arcade players automatically. Every fifteen minutes the
|
||||
Game updates workflow compares each game package's latest published GitHub
|
||||
release with Arcade's pin (`scripts/follow-game-releases.py`). For a newer
|
||||
version it pins that release, adds the game's notes as a new Arcade version,
|
||||
builds and checks the collection, commits it and attaches the catalog to the
|
||||
`node-arcade-VERSION` release. Inner Breeze's Node app follower then signs
|
||||
that release and publishes it to Waozi's node.
|
||||
|
||||
Chess 1.1.0 requires host API 12. Public Inbe 2.1.34 supplies API 11 and
|
||||
predates installable Chess apps, so it is outside the declared range. The
|
||||
|
||||
@@ -47,7 +47,8 @@ android {
|
||||
'-DZIRAN_DIR=' + ziranDir,
|
||||
'-DRAYLIB_DIR=' + raylibDir,
|
||||
'-DAPP_CODEGEN=' + appCodegen,
|
||||
'-DSHOVEY_STANDALONE=' + (standaloneShovey ? 'ON' : 'OFF')
|
||||
'-DSHOVEY_STANDALONE=' + (standaloneShovey ? 'ON' : 'OFF'),
|
||||
'-DGOOGLE_PLAY=' + (project.findProperty('app.googlePlay') == 'true' ? 'ON' : 'OFF')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,6 +26,9 @@ set(APP_ZIRAN_DEFINES --define ANDROID_BUILD)
|
||||
if(SHOVEY_STANDALONE)
|
||||
list(APPEND APP_ZIRAN_DEFINES --define SHOVEY_STANDALONE)
|
||||
endif()
|
||||
if(GOOGLE_PLAY)
|
||||
list(APPEND APP_ZIRAN_DEFINES --define GOOGLE_PLAY)
|
||||
endif()
|
||||
if(NOT DEFINED APP_CODEGEN)
|
||||
set(APP_CODEGEN c99)
|
||||
endif()
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"packages": ["shovey"]
|
||||
"packages": ["shovey", "wurm"]
|
||||
}
|
||||
@@ -49,6 +49,7 @@ def main():
|
||||
LIBOQS_DIR=str(package('liboqs')), MONOCYPHER_DIR=str(package('monocypher')))
|
||||
command = ['sh', str(ROOT / 'droid/gradlew'), '-p', str(ROOT / 'droid'), '--no-daemon', '--max-workers=2',
|
||||
'-Papp.product=shovey', '-Papp.abis=' + args.abis,
|
||||
'-Papp.googlePlay=' + ('true' if args.bundle else 'false'),
|
||||
'-Pkryon.dir=' + str(package('kryon')), '-Pziran.dir=' + str(package('ziran')),
|
||||
'-Praylib.dir=' + str(package('raylib') / 'src'),
|
||||
'-Papp.versionName=' + metadata['version'], '-Papp.versionCode=' + str(release['sequence']),
|
||||
|
||||
@@ -1,23 +1,50 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Build the reviewed Apps controller from its locked package, including in development."""
|
||||
import argparse
|
||||
import json
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import tomllib
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def controller_context(root, context):
|
||||
"""Keep the host's exact launcher graph without fetching unrelated games."""
|
||||
manifest = tomllib.loads((root / 'ziran.toml').read_text())
|
||||
lock = json.loads((root / 'ziran.lock').read_text())
|
||||
packages = {package['id']: package for package in lock['packages']}
|
||||
needed = set()
|
||||
|
||||
def include(identifier):
|
||||
if identifier in needed:
|
||||
return
|
||||
needed.add(identifier)
|
||||
for dependency in packages[identifier]['dependencies'].values():
|
||||
include(dependency)
|
||||
|
||||
launcher = lock['root']['dependencies']['apps']
|
||||
include(launcher)
|
||||
lock['packages'] = [package for package in lock['packages'] if package['id'] in needed]
|
||||
lock['root']['dependencies'] = {'apps': launcher}
|
||||
lines = ['[package]', 'name = ' + json.dumps(lock['root']['name'])]
|
||||
for section, values in [('toolchain', manifest['toolchain']),
|
||||
('dependencies.apps', manifest['dependencies']['apps'])]:
|
||||
lines.extend(['', '[' + section + ']'])
|
||||
lines.extend(key + ' = ' + json.dumps(value) for key, value in values.items())
|
||||
(context / 'ziran.toml').write_text('\n'.join(lines) + '\n')
|
||||
(context / 'ziran.lock').write_text(json.dumps(lock, indent=2) + '\n')
|
||||
|
||||
|
||||
def build(root, output):
|
||||
(root / 'build').mkdir(exist_ok=True)
|
||||
# --locked rejects local overrides. Resolve using only the committed
|
||||
# package inputs, so local Kryon/toolchain work cannot change trusted bytes.
|
||||
with tempfile.TemporaryDirectory(prefix='apps-lock-', dir=root / 'build') as directory:
|
||||
context = Path(directory)
|
||||
for name in ('ziran.toml', 'ziran.lock'):
|
||||
shutil.copyfile(root / name, context / name)
|
||||
controller_context(root, context)
|
||||
package = Path(subprocess.check_output(
|
||||
['ziran', 'pkg', 'path', 'apps', '--locked'], cwd=context, text=True).strip())
|
||||
subprocess.run([sys.executable, str(package / 'scripts/build-ui.py'),
|
||||
|
||||
@@ -9,6 +9,7 @@ from pathlib import Path
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import tarfile
|
||||
from game_packages import declared_packages
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
@@ -20,6 +21,17 @@ 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."""
|
||||
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()
|
||||
|
||||
|
||||
def stage(root, controller, expected_controller_digest, output):
|
||||
"""Validate before replacing a previously staged collection. Returns the
|
||||
catalog and each game package with the IDs of its packed apps."""
|
||||
@@ -63,13 +75,28 @@ def stage(root, controller, expected_controller_digest, output):
|
||||
bundle_bytes, preview_bytes = bundle.read_bytes(), preview.read_bytes()
|
||||
if not bundle_bytes or not preview_bytes:
|
||||
raise ValueError("Game bundles and previews must be built first")
|
||||
preview_bytes = library_art(root, name, "preview", preview_bytes)
|
||||
total += len(bundle_bytes) + len(preview_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(),
|
||||
preview=f"assets/arcade/previews/{name}.png")
|
||||
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
|
||||
if app.get('shared_records'):
|
||||
child['shared_records'] = app['shared_records']
|
||||
if app.get('requires'):
|
||||
shared = json.loads((root / 'build/games' / (name + '-resources.json')).read_text())
|
||||
if shared['dependencies'] != app['requires']:
|
||||
raise ValueError('Game resource dependencies differ from its manifest')
|
||||
child['dependencies'] = shared['dependencies']
|
||||
if shared['resources']:
|
||||
child['resources'] = shared['resources']
|
||||
# The package's declared cover: the library opens the app from it.
|
||||
cover = app["cover"]
|
||||
if cover:
|
||||
@@ -80,7 +107,7 @@ def stage(root, controller, expected_controller_digest, output):
|
||||
relative = Path(cover[key])
|
||||
if relative.is_absolute() or ".." in relative.parts or relative.suffix != ".png":
|
||||
raise ValueError("Invalid cover asset path")
|
||||
contents = (app["source"] / relative).read_bytes()
|
||||
contents = library_art(root, name, key, (app["source"] / relative).read_bytes())
|
||||
destination = Path("arcade/covers") / f"{name}-{key}.png"
|
||||
packed_cover[key] = "assets/" + destination.as_posix()
|
||||
copies.append((contents, destination))
|
||||
@@ -93,7 +120,7 @@ def stage(root, controller, expected_controller_digest, output):
|
||||
if total > MAX_PAYLOAD_BYTES:
|
||||
raise ValueError("Arcade collection exceeds the host's payload limit")
|
||||
catalog = dict(schema=1, id=arcade["id"], title=arcade["title"],
|
||||
harness="assets/apps/apps.zx", children=children)
|
||||
harness="assets/apps/apps.zx", presentation={"mode": "covers"}, children=children)
|
||||
# This stable directory contains disposable build output only. Clear it
|
||||
# after all inputs validate so removed registrations cannot linger.
|
||||
if output.exists():
|
||||
@@ -112,6 +139,64 @@ def stage(root, controller, expected_controller_digest, output):
|
||||
return catalog, packages[1:]
|
||||
|
||||
|
||||
def stage_downloads(catalog, source, output, games, art):
|
||||
"""Keep only Arcade's catalog; serve each game and the library art separately.
|
||||
|
||||
The published Arcade is a launcher: the host supplies the shared Apps
|
||||
controller, and the games' covers and previews go to ART for one separate
|
||||
download. The full staging directory is also used by standalone players,
|
||||
which keep their bundled games, art and controller. Validate every game
|
||||
before replacing outputs.
|
||||
"""
|
||||
payloads = {}
|
||||
for child in catalog["children"]:
|
||||
data = (source / child["bundle"]).read_bytes()
|
||||
if hashlib.sha256(data).hexdigest() != child["sha256"]:
|
||||
raise ValueError("Game differs from the collection's declared digest")
|
||||
payloads[child["sha256"]] = data
|
||||
for directory in (output, games, art):
|
||||
if directory.exists():
|
||||
shutil.rmtree(directory)
|
||||
shutil.copytree(source, output)
|
||||
games.mkdir(parents=True)
|
||||
(output / catalog["harness"]).unlink()
|
||||
for child in catalog["children"]:
|
||||
(output / child["bundle"]).unlink()
|
||||
pictures = [child["preview"]] + [path for key, path in child.get("cover", {}).items()
|
||||
if key in ("portrait", "landscape", "logo")]
|
||||
for relative in pictures:
|
||||
if not (output / relative).exists():
|
||||
continue
|
||||
destination = art / relative
|
||||
destination.parent.mkdir(parents=True, exist_ok=True)
|
||||
shutil.move(output / relative, destination)
|
||||
for digest, data in payloads.items():
|
||||
(games / (digest + ".zx")).write_bytes(data)
|
||||
|
||||
|
||||
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()
|
||||
digest = hashlib.sha256(data).hexdigest()
|
||||
(games / (digest + ".zx")).write_bytes(data)
|
||||
path = output / "assets/apps/catalog.json"
|
||||
catalog = json.loads(path.read_text())
|
||||
catalog["art"] = dict(sha256=digest, bytes=len(data))
|
||||
path.write_text(json.dumps(catalog, indent=2) + "\n")
|
||||
return catalog["art"]
|
||||
|
||||
|
||||
def archive_downloads(games, archive):
|
||||
"""The release asset contains only the immutable game payloads."""
|
||||
with tarfile.open(archive, "w") as output:
|
||||
for path in sorted(games.glob("*.zx")):
|
||||
entry = tarfile.TarInfo(path.name)
|
||||
entry.size = path.stat().st_size
|
||||
entry.mode = 0o644
|
||||
with path.open("rb") as data:
|
||||
output.addfile(entry, data)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--ziran", default=str(ROOT / "scripts/ziran.sh"))
|
||||
@@ -160,15 +245,30 @@ def main():
|
||||
sha256=digest(ROOT / f"build/{name}.zx"), apps_sha256=args.apps_sha256,
|
||||
children=children, source_mode="project")
|
||||
(ROOT / f"build/{name}.json").write_text(json.dumps(metadata, indent=2) + "\n")
|
||||
# Arcade exposes every declared leaf directly; there is no nested chooser.
|
||||
bundle("collection.zi", "collection:Main", output / "assets", ROOT / "build/arcade.zx")
|
||||
# Arcade carries only its catalog. Standalone players keep their offline
|
||||
# games; Arcade downloads the library art once and exactly the game the
|
||||
# person selects.
|
||||
node_apps = ROOT / "build/node-apps"
|
||||
catalog_assets = node_apps / "arcade-catalog"
|
||||
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")
|
||||
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")
|
||||
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(),
|
||||
sha256=digest(ROOT / "build/arcade.zx"),
|
||||
apps_sha256=args.apps_sha256, children=catalog["children"],
|
||||
apps_sha256=args.apps_sha256, children=catalog["children"], art=art,
|
||||
source_mode="project")
|
||||
(output / "receipt.json").write_text(json.dumps(receipt, indent=2) + "\n")
|
||||
(ROOT / "build/arcade.json").write_text(json.dumps(receipt, indent=2) + "\n")
|
||||
print("Arcade collection built with unchanged game bundles and verified Apps controller")
|
||||
node_receipt = receipt | {"sha256": digest(node_apps / "arcade.zx")}
|
||||
(node_apps / "arcade.json").write_text(json.dumps(node_receipt, indent=2) + "\n")
|
||||
print("Arcade catalog built with separate unchanged game downloads; standalone players keep their games")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -11,16 +11,29 @@ ROOT = Path(__file__).resolve().parents[1]
|
||||
ZIRAN = str(ROOT / 'scripts/ziran.sh')
|
||||
|
||||
|
||||
def stage_startup_art(source, output):
|
||||
"""Draw small full-colour images before the collection's originals load."""
|
||||
from PIL import Image
|
||||
startup = output / 'startup/shovey'
|
||||
startup.mkdir(parents=True, exist_ok=True)
|
||||
for name, edge in [('title-portrait.png', 640), ('title-landscape.png', 640), ('logo.png', 512)]:
|
||||
with Image.open(source / 'assets/shovey' / name) as original:
|
||||
image = original.convert('RGBA' if 'A' in original.getbands() else 'RGB')
|
||||
image.thumbnail((edge, edge), Image.Resampling.LANCZOS)
|
||||
image.save(startup / name, optimize=True)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--output', type=Path, default=ROOT / 'build/arcade')
|
||||
parser.add_argument('--output', type=Path)
|
||||
parser.add_argument('--standalone-shovey', action='store_true')
|
||||
parser.add_argument('--generated', type=Path, help='Private generated-source output for an isolated build')
|
||||
args = parser.parse_args()
|
||||
output = args.output.resolve()
|
||||
output = (args.output or ROOT / 'build' / ('shovey' if args.standalone_shovey else 'arcade')).resolve()
|
||||
lock = [] if (ROOT / 'ziran.local.toml').exists() else ['--locked']
|
||||
toolchain = Path(subprocess.check_output([ZIRAN, 'pkg', 'path', 'ziran', *lock],
|
||||
cwd=ROOT, text=True).strip())
|
||||
generated = ROOT / ('build/shovey-native' if args.standalone_shovey else 'build/arcade-native') / 'c'
|
||||
generated = args.generated.resolve() if args.generated else ROOT / ('build/shovey-native' if args.standalone_shovey else 'build/arcade-native') / 'c'
|
||||
# Only this build purpose owns generated C. Never replace an installed
|
||||
# binary in place: link separately, then atomically replace the path.
|
||||
if generated.exists():
|
||||
@@ -53,15 +66,12 @@ def main():
|
||||
'-I' + str(package('monocypher') / 'src'), str(package('monocypher') / 'src/monocypher.c'),
|
||||
# Entity's device keys sign with Monocypher's standard Ed25519.
|
||||
str(package('monocypher') / 'src/optional/monocypher-ed25519.c'), str(oqs / 'lib/liboqs.a'),
|
||||
'-Wl,--gc-sections', *libraries, '-lX11', '-l:libcurl.so.4', '-lm', '-lpthread', '-o', str(temporary)], check=True)
|
||||
'-Wl,--gc-sections', *libraries, '-lX11', '-l:libcurl.so.4', '-lz', '-lm', '-lpthread', '-o', str(temporary)], check=True)
|
||||
temporary.replace(output)
|
||||
if args.standalone_shovey:
|
||||
from PIL import Image
|
||||
source = Path(subprocess.check_output([ZIRAN, 'pkg', 'path', 'shovey', *lock], cwd=ROOT, text=True).strip())
|
||||
startup = output.parent / 'startup/shovey'
|
||||
startup.mkdir(parents=True, exist_ok=True)
|
||||
for name in ('title-portrait.png', 'title-landscape.png', 'logo.png'):
|
||||
shutil.copyfile(source / 'assets/shovey' / name, startup / name)
|
||||
stage_startup_art(source, output.parent)
|
||||
Image.open(source / 'assets/branding/shovey-icon.png').resize((256, 256), Image.Resampling.LANCZOS).save(output.parent / 'shovey-icon.png')
|
||||
print(('Shovey' if args.standalone_shovey else 'Arcade') + ' native build passed')
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Build the apps Arcade and its game packages declare, without copying source."""
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
from game_packages import declared_apps
|
||||
from game_resources import dependency_order, share_resources
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
@@ -37,8 +39,18 @@ def build(ziran, lock_flags):
|
||||
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 = []
|
||||
for app in declared_apps(ROOT, ziran, lock_flags):
|
||||
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")
|
||||
@@ -62,7 +74,7 @@ def build(ziran, lock_flags):
|
||||
# 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 != 'build_defines'}, indent=2) + '\n')
|
||||
{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)
|
||||
@@ -85,6 +97,22 @@ def build(ziran, lock_flags):
|
||||
# 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':
|
||||
@@ -98,7 +126,7 @@ def build(ziran, lock_flags):
|
||||
bundle = ROOT / "build/games" / (name + ".zx")
|
||||
bundle.parent.mkdir(parents=True, exist_ok=True)
|
||||
subprocess.run([
|
||||
ziran, "bundle", "--root", str(source),
|
||||
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),
|
||||
@@ -110,7 +138,13 @@ def build(ziran, lock_flags):
|
||||
"--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)
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Build Arcade's browser edition into build/web-site.
|
||||
|
||||
The page runs a collection, by default this checkout's build/node-apps/arcade.zx;
|
||||
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.
|
||||
"""
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
ZIRAN = str(ROOT / 'scripts/ziran.sh')
|
||||
|
||||
|
||||
def package(name):
|
||||
flags = [] if (ROOT / 'ziran.local.toml').exists() else ['--locked']
|
||||
return Path(subprocess.check_output([ZIRAN, 'pkg', 'path', name, *flags], cwd=ROOT, text=True).strip())
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--bundle', type=Path, default=ROOT / 'build/node-apps/arcade.zx')
|
||||
parser.add_argument('--controller-sha256', default=(ROOT / 'apps-controller.sha256').read_text().strip())
|
||||
parser.add_argument('--version', default=(ROOT / 'VERSION').read_text().strip())
|
||||
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')
|
||||
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)
|
||||
work = ROOT / 'build/web'
|
||||
work.mkdir(parents=True, exist_ok=True)
|
||||
env = {**os.environ, 'ZIRAN': str(package('ziran') / 'build/bin/ziran')}
|
||||
subprocess.run([sys.executable, str(package('entity') / 'scripts/build-web.py'),
|
||||
'--bundle', str(bundle), '--profile', str(args.profile.resolve()),
|
||||
'--output', str(work / 'runtime.html'),
|
||||
'--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)
|
||||
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')
|
||||
# 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)
|
||||
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 __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,74 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Keep Arcade's Cloudflare Pages project and arcade.waozi.xyz in place.
|
||||
|
||||
`prepare` creates the `arcade` Pages project when it is missing, before the
|
||||
first deployment. `connect` adds arcade.waozi.xyz to the project and points
|
||||
its DNS at the project. Both are safe to repeat on every deployment. They read
|
||||
CLOUDFLARE_API_TOKEN and CLOUDFLARE_ACCOUNT_ID and never print the token.
|
||||
"""
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
|
||||
PROJECT = 'arcade'
|
||||
DOMAIN = 'arcade.waozi.xyz'
|
||||
ZONE = 'waozi.xyz'
|
||||
|
||||
|
||||
def api(method, path, body=None):
|
||||
request = urllib.request.Request('https://api.cloudflare.com/client/v4' + path, method=method,
|
||||
data=None if body is None else json.dumps(body).encode(),
|
||||
headers={'Authorization': 'Bearer ' + os.environ['CLOUDFLARE_API_TOKEN'], 'Content-Type': 'application/json'})
|
||||
try:
|
||||
with urllib.request.urlopen(request, timeout=40) as response:
|
||||
return response.status, json.load(response)
|
||||
except urllib.error.HTTPError as error:
|
||||
return error.code, json.loads(error.read() or b'{}')
|
||||
|
||||
|
||||
def result(method, path, body=None):
|
||||
status, data = api(method, path, body)
|
||||
if not data.get('success'):
|
||||
raise SystemExit(f'Cloudflare {method} {path} failed ({status}): {data.get("errors")}')
|
||||
return data['result']
|
||||
|
||||
|
||||
def prepare(account):
|
||||
status, data = api('GET', f'/accounts/{account}/pages/projects/{PROJECT}')
|
||||
if data.get('success'):
|
||||
print(f'Pages project {PROJECT} exists.')
|
||||
return
|
||||
if status != 404:
|
||||
raise SystemExit(f'Could not read Pages project {PROJECT} ({status}): {data.get("errors")}')
|
||||
result('POST', f'/accounts/{account}/pages/projects', {'name': PROJECT, 'production_branch': 'master'})
|
||||
print(f'Created Pages project {PROJECT}.')
|
||||
|
||||
|
||||
def connect(account):
|
||||
project = result('GET', f'/accounts/{account}/pages/projects/{PROJECT}')
|
||||
domains = result('GET', f'/accounts/{account}/pages/projects/{PROJECT}/domains')
|
||||
if not any(domain['name'] == DOMAIN for domain in domains):
|
||||
result('POST', f'/accounts/{account}/pages/projects/{PROJECT}/domains', {'name': DOMAIN})
|
||||
print(f'Added {DOMAIN} to Pages project {PROJECT}.')
|
||||
zones = result('GET', f'/zones?name={ZONE}')
|
||||
if len(zones) != 1:
|
||||
raise SystemExit(f'Expected one {ZONE} zone, found {len(zones)}')
|
||||
zone = zones[0]['id']
|
||||
records = result('GET', f'/zones/{zone}/dns_records?name={DOMAIN}')
|
||||
if not records:
|
||||
result('POST', f'/zones/{zone}/dns_records',
|
||||
{'type': 'CNAME', 'name': DOMAIN, 'content': project['subdomain'], 'proxied': True, 'ttl': 1})
|
||||
print(f'Pointed {DOMAIN} at {project["subdomain"]}.')
|
||||
elif not (len(records) == 1 and records[0]['type'] == 'CNAME' and records[0]['content'] == project['subdomain']):
|
||||
# Never overwrite a record someone else made.
|
||||
raise SystemExit(f'{DOMAIN} already has DNS records that do not point at {project["subdomain"]}')
|
||||
print(f'{DOMAIN} serves Pages project {PROJECT}.')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if len(sys.argv) != 2 or sys.argv[1] not in {'prepare', 'connect'}:
|
||||
raise SystemExit('Usage: cloudflare-site.py prepare|connect')
|
||||
account = os.environ['CLOUDFLARE_ACCOUNT_ID']
|
||||
{'prepare': prepare, 'connect': connect}[sys.argv[1]](account)
|
||||
@@ -0,0 +1,164 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Follow the published releases of Arcade's game packages.
|
||||
|
||||
`check` records newer published game releases without changing dependencies.
|
||||
`pin` selects their exact commits in ziran.toml and asks Ziran to update each
|
||||
game and its transitive dependencies. New game imports must reach the lock;
|
||||
unrelated packages and the compiler stay pinned. The updates are recorded in
|
||||
build/game-updates.json.
|
||||
|
||||
`changelog` adds an Arcade release entry naming each updated game with the
|
||||
notes of its newest release, for update_version.sh to synchronize.
|
||||
|
||||
`art` remakes the library's small copies of game art (scripts/library-art.py)
|
||||
only when a game's art changed, so unchanged copies keep their bytes.
|
||||
"""
|
||||
import argparse
|
||||
import hashlib
|
||||
import importlib.util
|
||||
import json
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
UPDATES = ROOT / 'build/game-updates.json'
|
||||
|
||||
|
||||
def gh(*args):
|
||||
return subprocess.check_output(['gh', *args], text=True).strip()
|
||||
|
||||
|
||||
def repository(url):
|
||||
match = re.fullmatch(r'https://github\.com/([A-Za-z0-9._-]+/[A-Za-z0-9._-]+?)(\.git)?', url)
|
||||
if not match:
|
||||
raise SystemExit(f'Not a GitHub package: {url}')
|
||||
return match[1]
|
||||
|
||||
|
||||
def released_updates():
|
||||
lock = json.loads((ROOT / 'ziran.lock').read_text())
|
||||
names = json.loads((ROOT / 'games.json').read_text())['packages']
|
||||
updates = []
|
||||
for name in names:
|
||||
old_id = lock['root']['dependencies'][name]
|
||||
entry = next(item for item in lock['packages'] if item['id'] == old_id)
|
||||
repo = repository(entry['url'])
|
||||
tag = gh('release', 'view', '--repo', repo, '--json', 'tagName', '--jq', '.tagName')
|
||||
commit = gh('api', f'repos/{repo}/commits/{tag}', '--jq', '.sha')
|
||||
if not re.fullmatch(r'[0-9a-f]{40}', commit):
|
||||
raise SystemExit(f'{name}: invalid release commit')
|
||||
if commit == entry['commit']:
|
||||
continue
|
||||
# Release metadata can be recorded before the game is published.
|
||||
# The pinned source must still advance to that release's commit.
|
||||
# Never move back: the release must contain the pinned commit.
|
||||
status = gh('api', f'repos/{repo}/compare/{entry["commit"]}...{commit}', '--jq', '.status')
|
||||
if status != 'ahead':
|
||||
print(f'{name}: release {tag} is {status} of the pinned {entry["commit"][:12]}; kept')
|
||||
continue
|
||||
updates.append({'name': name, 'repository': repo, 'tag': tag, 'commit': commit})
|
||||
print(f'{name}: {repo} {tag} ({commit[:12]})')
|
||||
return updates
|
||||
|
||||
|
||||
def record_updates(updates):
|
||||
UPDATES.parent.mkdir(parents=True, exist_ok=True)
|
||||
UPDATES.write_text(json.dumps(updates, indent=2) + '\n')
|
||||
|
||||
|
||||
def pin(ziran):
|
||||
updates = released_updates()
|
||||
manifest = ROOT / 'ziran.toml'
|
||||
lock_path = ROOT / 'ziran.lock'
|
||||
original_manifest = manifest.read_bytes()
|
||||
original_lock = lock_path.read_bytes()
|
||||
try:
|
||||
for update in updates:
|
||||
name, commit = update['name'], update['commit']
|
||||
# Edit the declaration; only the package manager writes the graph.
|
||||
section = re.compile(r'(^\[dependencies\.' + re.escape(name) +
|
||||
r'\]\s*\n)([^\[]*)', re.M)
|
||||
text = manifest.read_text()
|
||||
match = section.search(text)
|
||||
if match is None:
|
||||
raise ValueError(f'{name}: missing dependency declaration')
|
||||
body, count = re.subn(r'^ref[ \t]*=[ \t]*"[^"\n]*"[ \t]*$',
|
||||
f'ref = "{commit}"', match[2], flags=re.M)
|
||||
if count != 1:
|
||||
raise ValueError(f'{name}: expected one dependency ref')
|
||||
manifest.write_text(text[:match.start(2)] + body + text[match.end(2):])
|
||||
subprocess.run([str(ziran), 'update', name], cwd=ROOT, check=True)
|
||||
lock = json.loads(lock_path.read_text())
|
||||
target = lock['root']['dependencies'][name]
|
||||
entry = next(p for p in lock['packages'] if p['id'] == target)
|
||||
if entry['commit'] != commit:
|
||||
raise ValueError(f'{name}: Ziran did not select the released commit; remove its local override')
|
||||
except BaseException:
|
||||
manifest.write_bytes(original_manifest)
|
||||
lock_path.write_bytes(original_lock)
|
||||
raise
|
||||
record_updates(updates)
|
||||
|
||||
|
||||
def newest_notes(changelog):
|
||||
"""The bullets of a changelog's newest numeric release."""
|
||||
text = changelog.read_text()
|
||||
heading = re.search(r'^## \[?(\d+\.\d+\.\d+)\]?.*$', text, re.M)
|
||||
if heading is None:
|
||||
raise SystemExit(f'{changelog} needs a numeric release entry')
|
||||
following = re.search(r'^## ', text[heading.end():], re.M)
|
||||
section = text[heading.end():heading.end() + following.start()] if following else text[heading.end():]
|
||||
notes = [line[2:].strip() for line in section.splitlines() if line.startswith('- ')]
|
||||
return heading[1], notes
|
||||
|
||||
|
||||
def changelog(ziran):
|
||||
updates = json.loads(UPDATES.read_text())
|
||||
if not updates:
|
||||
return
|
||||
lines = []
|
||||
for update in updates:
|
||||
source = Path(subprocess.check_output([ziran, 'pkg', 'path', update['name']], cwd=ROOT, text=True).strip())
|
||||
declaration = json.loads((source / 'apps.json').read_text())
|
||||
# The package's first app is the game itself; its changelog sits beside its catalog.
|
||||
manifest = source / declaration['apps'][0]['manifest']
|
||||
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'
|
||||
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')
|
||||
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}')
|
||||
|
||||
|
||||
def art():
|
||||
sys.path.insert(0, str(ROOT / 'scripts'))
|
||||
spec = importlib.util.spec_from_file_location('library_art', ROOT / 'scripts/library-art.py')
|
||||
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:
|
||||
library.main()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('command', choices=['check', 'pin', 'changelog', 'art'])
|
||||
parser.add_argument('--ziran', default=str(ROOT / 'scripts/ziran.sh'))
|
||||
args = parser.parse_args()
|
||||
if args.command == 'check':
|
||||
record_updates(released_updates())
|
||||
elif args.command == 'pin':
|
||||
pin(args.ziran)
|
||||
elif args.command == 'changelog':
|
||||
changelog(args.ziran)
|
||||
else:
|
||||
art()
|
||||
@@ -5,10 +5,11 @@ for an app the library opens from a full-screen cover, that cover's art,
|
||||
caption and action. games.json names the game packages Arcade includes.
|
||||
"""
|
||||
import json
|
||||
import re
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
|
||||
APP_KEYS = {'manifest', 'cover', 'enabled'}
|
||||
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_code', 'library_entries', 'shared_records'}
|
||||
COVER_KEYS = {'portrait', 'landscape', 'logo', 'caption', 'action'}
|
||||
|
||||
|
||||
@@ -41,9 +42,30 @@ def declared_packages(root, ziran=None, lock_flags=()):
|
||||
if not set(app) <= APP_KEYS or not set(app.get('cover', {})) <= COVER_KEYS:
|
||||
raise ValueError(f'{name}: unknown apps.json field')
|
||||
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'), enabled=app.get('enabled', True)))
|
||||
cover=app.get('cover'), requires=requires, shared_code=shared_code,
|
||||
shared_records=shared_records,
|
||||
library_entries=library_entries, enabled=app.get('enabled', True)))
|
||||
packages.append(dict(name=name, source=source, id=declaration['id'],
|
||||
title=declaration['title'], apps=apps))
|
||||
return packages
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
"""Pack additions once; signed collection links bind shared game resources."""
|
||||
import json
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
|
||||
|
||||
def dependency_order(apps):
|
||||
by_id = {app['descriptor']['id']: app for app in apps}
|
||||
visiting, ordered, complete = set(), [], set()
|
||||
|
||||
def visit(app):
|
||||
identifier = app['descriptor']['id']
|
||||
if identifier in visiting:
|
||||
raise ValueError('Cyclic game dependency')
|
||||
if identifier in complete:
|
||||
return
|
||||
visiting.add(identifier)
|
||||
for dependency in app.get('requires', []):
|
||||
if dependency not in by_id or (app['enabled'] and not by_id[dependency]['enabled']):
|
||||
raise ValueError(f'{identifier}: missing dependency {dependency}')
|
||||
visit(by_id[dependency])
|
||||
visiting.remove(identifier)
|
||||
complete.add(identifier)
|
||||
ordered.append(app)
|
||||
|
||||
for app in apps:
|
||||
visit(app)
|
||||
return ordered
|
||||
|
||||
|
||||
def shared_copies(app):
|
||||
path = app['manifest'].with_name('shared_assets.json')
|
||||
return json.loads(path.read_text())['copies'] if path.exists() else []
|
||||
|
||||
|
||||
def share_resources(app, apps, resources, staged):
|
||||
"""Alias only complete, byte-identical resources from a declared dependency.
|
||||
|
||||
Each source has already undergone its game's asset preparation. Comparing
|
||||
the actual staged bytes prevents reusing a differently cropped or edited
|
||||
picture merely because it came from the same original filename.
|
||||
"""
|
||||
requirements = app.get('requires', [])
|
||||
by_id = {item['descriptor']['id']: item for item in apps}
|
||||
links = []
|
||||
for dependency in requirements:
|
||||
original = by_id[dependency]
|
||||
if app['source'] != original['source']:
|
||||
continue
|
||||
descriptor = original['descriptor']
|
||||
prefixes = [{'from': descriptor['assets'], 'to': ''}, *shared_copies(original)]
|
||||
original_root = staged / descriptor['name'] / 'assets' / descriptor['name']
|
||||
for copy in shared_copies(app):
|
||||
for prefix in prefixes:
|
||||
try:
|
||||
relative = Path(copy['from']).relative_to(prefix['from'])
|
||||
except ValueError:
|
||||
continue
|
||||
target = resources / copy['to']
|
||||
source = original_root / prefix['to'] / relative
|
||||
if not target.exists() or not source.exists():
|
||||
continue
|
||||
if target.is_dir() != source.is_dir():
|
||||
continue
|
||||
if target.is_dir():
|
||||
files = [p for p in target.rglob('*') if p.is_file()]
|
||||
if not files or any(not (source / p.relative_to(target)).is_file() or
|
||||
p.read_bytes() != (source / p.relative_to(target)).read_bytes() for p in files):
|
||||
continue
|
||||
suffix = '/'
|
||||
else:
|
||||
if target.read_bytes() != source.read_bytes():
|
||||
continue
|
||||
suffix = ''
|
||||
links.append(dict(dependency=dependency,
|
||||
path=f'assets/{app["descriptor"]["name"]}/{Path(copy["to"]).as_posix()}' + suffix,
|
||||
source=f'assets/{descriptor["name"]}/{(Path(prefix["to"]) / relative).as_posix()}' + suffix))
|
||||
if target.is_dir():
|
||||
shutil.rmtree(target)
|
||||
else:
|
||||
target.unlink()
|
||||
break
|
||||
if len(links) > 16:
|
||||
raise ValueError('Too many shared resource links')
|
||||
return dict(dependencies=requirements, resources=links)
|
||||
@@ -0,0 +1,78 @@
|
||||
#!/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.
|
||||
Games keep their own original title artwork. Arcade downloads this small art
|
||||
bundle separately from its launcher and caches it by its content digest.
|
||||
|
||||
The copies and sources.json, which records the SHA-256 of the art each copy
|
||||
was made from, are committed. The collection build uses them as they are,
|
||||
so its bytes never depend on the local image library, and it stops when a
|
||||
game's art changes until this script makes fresh copies.
|
||||
"""
|
||||
import hashlib
|
||||
import io
|
||||
import json
|
||||
from pathlib import Path
|
||||
from PIL import Image
|
||||
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
|
||||
|
||||
|
||||
def small_copy(data, key):
|
||||
image = Image.open(io.BytesIO(data))
|
||||
image.load()
|
||||
longest = PREVIEW_LONGEST if key == 'preview' else LOGO_LONGEST if key == 'logo' else 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
|
||||
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()
|
||||
|
||||
|
||||
def art(root=ROOT):
|
||||
"""(copy name, key, source bytes) for every enabled game's library art."""
|
||||
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()
|
||||
for key in ('portrait', 'landscape', 'logo'):
|
||||
if app['cover'] and key in app['cover']:
|
||||
yield name, key, (app['source'] / app['cover'][key]).read_bytes()
|
||||
|
||||
|
||||
def main():
|
||||
LIBRARY.mkdir(parents=True, exist_ok=True)
|
||||
sources = {}
|
||||
for name, key, data 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()
|
||||
(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')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,9 @@
|
||||
/*
|
||||
X-Content-Type-Options: nosniff
|
||||
Referrer-Policy: strict-origin-when-cross-origin
|
||||
|
||||
/*.webp
|
||||
Cache-Control: public, max-age=604800
|
||||
|
||||
/*.png
|
||||
Cache-Control: public, max-age=604800
|
||||
|
After Width: | Height: | Size: 8.8 KiB |
|
After Width: | Height: | Size: 9.2 KiB |
|
After Width: | Height: | Size: 25 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><rect width="32" height="32" rx="8" fill="#181622"/><g transform="translate(4 4)" fill="none" stroke="#fff" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><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"/></g></svg>
|
||||
|
After Width: | Height: | Size: 394 B |
@@ -0,0 +1,83 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover">
|
||||
<title>Arcade</title>
|
||||
<meta name="description" content="Arcade: all of Waozi's games in one place. Pick a cover, download the game and play, free in your browser.">
|
||||
<meta name="theme-color" content="#111223">
|
||||
<link rel="canonical" href="https://arcade.waozi.xyz/">
|
||||
<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">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:url" content="https://arcade.waozi.xyz/">
|
||||
<meta property="og:title" content="Arcade">
|
||||
<meta property="og:description" content="All of Waozi's games in one place, free in your browser.">
|
||||
<meta property="og:image" content="https://arcade.waozi.xyz/og.jpg">
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<style>
|
||||
html, body { margin: 0; width: 100%; height: 100%; overflow: hidden; overscroll-behavior: none; background: #111223; color: #f4f2ff; }
|
||||
canvas { display: block; width: 100%; height: 100%; outline: none; touch-action: none; }
|
||||
#loading { position: fixed; inset: 0; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 20px; background: #111223; font: 600 16px/1.4 system-ui, sans-serif; transition: opacity .3s ease; }
|
||||
#loading.done { opacity: 0; pointer-events: none; }
|
||||
#loading svg { width: 64px; height: 64px; fill: none; stroke: currentColor; stroke-width: 1.6; stroke-linecap: round; stroke-linejoin: round; }
|
||||
#loading .track { width: min(280px, 70vw); height: 6px; border-radius: 3px; background: #ffffff26; overflow: hidden; }
|
||||
#loading .bar { width: 0; height: 100%; background: #ffd166; transition: width .2s ease; }
|
||||
#loading .failed { display: none; color: #ffb4a8; text-align: center; padding: 0 24px; }
|
||||
#loading.error .failed { display: block; }
|
||||
#loading.error .track { display: none; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<canvas id="canvas" tabindex="0"></canvas>
|
||||
<div id="loading" role="status" aria-live="polite">
|
||||
<!-- 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>
|
||||
</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.
|
||||
function watch() {
|
||||
if (window.Module && Module.profileReady) { loading.classList.add('done'); return; }
|
||||
requestAnimationFrame(watch);
|
||||
}
|
||||
window.Module = {
|
||||
canvas: document.getElementById('canvas'),
|
||||
setStatus: function (text) {
|
||||
var match = /\((\d+(?:\.\d+)?)\/(\d+)\)/.exec(text || '');
|
||||
if (match) bar.style.width = Math.min(100, 100 * match[1] / match[2]) + '%';
|
||||
},
|
||||
onAbort: failed,
|
||||
onExit: function (code) { if (code !== 0) failed(); }
|
||||
};
|
||||
// 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) {
|
||||
if (!response.ok) throw new Error(response.status);
|
||||
return response.text();
|
||||
}),
|
||||
fetch('apps.zx').then(function (response) {
|
||||
return response.ok ? response.arrayBuffer() : null;
|
||||
})
|
||||
]).then(function (loaded) {
|
||||
Module.arcadeReceipt = loaded[0];
|
||||
if (loaded[1]) {
|
||||
Module.preRun = [function () { FS.writeFile('/apps.zx', new Uint8Array(loaded[1])); }];
|
||||
}
|
||||
var script = document.createElement('script');
|
||||
script.src = 'runtime.js';
|
||||
script.onerror = failed;
|
||||
document.body.appendChild(script);
|
||||
watch();
|
||||
}).catch(failed);
|
||||
})();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"name": "Arcade",
|
||||
"short_name": "Arcade",
|
||||
"description": "All my games in one place.",
|
||||
"start_url": "/",
|
||||
"display": "standalone",
|
||||
"background_color": "#181622",
|
||||
"theme_color": "#181622",
|
||||
"icons": [
|
||||
{ "src": "/icon-192.png", "sizes": "192x192", "type": "image/png" },
|
||||
{ "src": "/icon-512.png", "sizes": "512x512", "type": "image/png" }
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 155 KiB |
@@ -19,6 +19,9 @@ ARCADE_BACK_KEY :: 4
|
||||
arcade_state: s32;
|
||||
|
||||
ArcadeStart :: () -> bool {
|
||||
// Later animation pictures load asynchronously too. Keep the last
|
||||
// complete frame visible while a new sprite is being decoded.
|
||||
RaylibCompletePictureFrames(true)
|
||||
// Android before 10 cannot name its system font; the APK carries the
|
||||
// same font as the Windows build, so text never falls back to raylib's
|
||||
// bitmap font.
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
// Arcade's library art: the games' covers, logos and previews, downloaded
|
||||
// beside the games. The Apps host only reads its assets; it never runs.
|
||||
#program_export
|
||||
Main :: () -> s32 { return 0 }
|
||||
@@ -9,12 +9,13 @@ Game :: struct {
|
||||
enabled: bool
|
||||
}
|
||||
|
||||
GameCount :: 4
|
||||
GameCount :: 5
|
||||
|
||||
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} }
|
||||
return Game.{}
|
||||
}
|
||||
@@ -0,0 +1,149 @@
|
||||
// Downloads are separate from saves. The signed collection fixes each
|
||||
// digest; a transfer is made available only after those exact bytes verify.
|
||||
#import "kryon/file_download"
|
||||
#import "kryon/app_files"
|
||||
#import "kryon/hosted_app"
|
||||
#import "apps/host"
|
||||
#import "apps/catalog"
|
||||
#import "apps/tree"
|
||||
#import "apps/protocol"
|
||||
#import "std/text_buffer"
|
||||
#import "std/vec"
|
||||
#import "std/c_string"
|
||||
#import "std/file"
|
||||
#import "platform"
|
||||
|
||||
CollectionPackage :: struct {
|
||||
digest: [65]u8
|
||||
size: s64
|
||||
bytes: string
|
||||
file: string
|
||||
transfer: FileDownload
|
||||
failed: bool
|
||||
next: *CollectionPackage
|
||||
}
|
||||
collection_packages: *CollectionPackage;
|
||||
collection_package_result: string;
|
||||
collection_package_files: *AppFiles;
|
||||
package_c :: #system_library "c";
|
||||
PackageFree :: (memory: *void) #foreign package_c "free";
|
||||
CollectionDownloadsOpen :: (files: *AppFiles) { collection_package_files = files }
|
||||
|
||||
CollectionReadPackage :: (path: string) -> string {
|
||||
file := OpenRead(path)
|
||||
if !file.valid { return "" }
|
||||
size := FileSize(file)
|
||||
unused CloseFile(file)
|
||||
if size < 1 || size > APP_HOST_BYTE_LIMIT { return "" }
|
||||
bytes, found := ReadEntireFile(path)
|
||||
if !found { AppFileFree(bytes); return "" }
|
||||
return bytes
|
||||
}
|
||||
|
||||
CollectionPackageFor :: (entry: *AppEntry) -> *CollectionPackage {
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
if TextUntilNul(package.digest[:]) == TextUntilNul(entry.sha256[:]) { return package }
|
||||
package = package.next
|
||||
}
|
||||
package = New(CollectionPackage)
|
||||
if package == null { return null }
|
||||
package.digest = entry.sha256
|
||||
package.size = entry.bytes
|
||||
name: Vec(u8)
|
||||
BuilderPrint(*name, "downloads/%.zx", TextUntilNul(package.digest[:]))
|
||||
relative := BuilderFinish(name)
|
||||
package.file = AppFilePath(collection_package_files, relative, true)
|
||||
package.bytes = CollectionReadPackage(package.file)
|
||||
AppFileFree(relative)
|
||||
if package.bytes != "" && !CollectionPackageValid(package) {
|
||||
AppFileFree(package.bytes)
|
||||
package.bytes = ""
|
||||
package.failed = true
|
||||
}
|
||||
package.next = collection_packages
|
||||
collection_packages = package
|
||||
return package
|
||||
}
|
||||
|
||||
CollectionPackageValid :: (package: *CollectionPackage) -> bool {
|
||||
return package.bytes.count > 0 && package.bytes.count <= APP_HOST_BYTE_LIMIT &&
|
||||
(package.size == 0 || package.bytes.count == package.size) &&
|
||||
AppHostBytesMatch(package.bytes, TextUntilNul(package.digest[:]))
|
||||
}
|
||||
|
||||
CollectionBundle :: (context: *void, parent: *AppNode, entry: *AppEntry) -> HostedAsset {
|
||||
if TextUntilNul(parent.identity.id[:]) != "inbe.arcade" { return HostedAsset.{} }
|
||||
package := CollectionPackageFor(entry)
|
||||
if package == null { return HostedAsset.{} }
|
||||
collection_package_result = package.bytes
|
||||
return HostedAsset.{.data = collection_package_result, .found = collection_package_result != ""}
|
||||
}
|
||||
|
||||
CollectionDownload :: (context: *void, parent: *AppNode, entry: *AppEntry, download: *AppDownload) -> bool {
|
||||
if TextUntilNul(parent.identity.id[:]) != "inbe.arcade" { return false }
|
||||
package := CollectionPackageFor(entry)
|
||||
download.bytes = entry.bytes
|
||||
if package == null { download.failed = true; return true }
|
||||
if package.bytes != "" { return false }
|
||||
download.downloading = package.transfer.status == .Downloading
|
||||
download.failed = package.failed
|
||||
download.progress = -1
|
||||
if package.transfer.total_bytes > 0 {
|
||||
download.progress = cast(s32)(package.transfer.bytes * 100 / package.transfer.total_bytes)
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionFetch :: (context: *void, account: string, parent: *AppNode,
|
||||
entry: *AppEntry, operation: s32, reply: *AppsReply) -> bool {
|
||||
if account != "local" || TextUntilNul(parent.identity.id[:]) != "inbe.arcade" { return false }
|
||||
package := CollectionPackageFor(entry)
|
||||
if package == null { return false }
|
||||
if operation != APPS_INSTALL { return false }
|
||||
// Cached installs and removals use the host's ordinary saved state.
|
||||
if package.bytes != "" { return false }
|
||||
if package.transfer.status != .Downloading {
|
||||
FileDownloadRelease(*package.transfer)
|
||||
package.failed = false
|
||||
base := EnvironmentText("ARCADE_PACKAGE_ORIGIN")
|
||||
if base == "" { base = "https://api.waozi.xyz" }
|
||||
url: Vec(u8)
|
||||
BuilderPrint(*url, "%/api/v2/packages/inbe.arcade/%.zx", base, TextUntilNul(package.digest[:]))
|
||||
address := BuilderFinish(url)
|
||||
defer { AppFileFree(address) }
|
||||
package.transfer.maximum_bytes = cast(u64)(ifx package.size > 0 then package.size else APP_HOST_BYTE_LIMIT)
|
||||
if !FileDownloadStart(*package.transfer, address, package.file) { package.failed = true }
|
||||
}
|
||||
reply.status = ifx package.failed then APPS_REJECTED else APPS_APPLIED
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionDownloadsPump :: () {
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
if package.transfer.status == .Downloading {
|
||||
status := FileDownloadPoll(*package.transfer)
|
||||
if status == .Ready {
|
||||
package.bytes = CollectionReadPackage(package.file)
|
||||
if !CollectionPackageValid(package) {
|
||||
AppFileFree(package.bytes)
|
||||
package.bytes = ""
|
||||
package.failed = true
|
||||
}
|
||||
} else if status == .Error { package.failed = true }
|
||||
}
|
||||
package = package.next
|
||||
}
|
||||
}
|
||||
|
||||
CollectionDownloadsClose :: () {
|
||||
while collection_packages != null {
|
||||
package := collection_packages
|
||||
collection_packages = package.next
|
||||
FileDownloadRelease(*package.transfer)
|
||||
AppFileFree(package.bytes)
|
||||
AppFileFree(package.file)
|
||||
PackageFree(cast(*void)package)
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,7 @@
|
||||
#import "kryon/button_widget"
|
||||
#import "kryon/button_props"
|
||||
#import "kryon/hosted_values"
|
||||
#import "kryon/hosted_app"
|
||||
#import "kryon/widget_host"
|
||||
#import "kryon/app_files"
|
||||
#import "kryon/app_protocol"
|
||||
@@ -31,16 +32,22 @@
|
||||
#import "apps/tree"
|
||||
#import "apps/catalog"
|
||||
#import "apps/protocol"
|
||||
#import "apps/appearance"
|
||||
Rules :: #import "apps/protocol";
|
||||
Node :: #import "apps/node_types";
|
||||
Codec :: #import "apps/node_codec";
|
||||
#import "platform"
|
||||
#import, file "collection_downloads.zi";
|
||||
#import "sound"
|
||||
#import "entity_host"
|
||||
#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"
|
||||
#import, file "collection_loading.zi";
|
||||
#import "shovey/shovey_theme"
|
||||
ProfileIcon :: #import "mingcute/mingcute_regular_user_4";
|
||||
DewIcon :: #import "mingcute/mingcute_filled_drop";
|
||||
@@ -76,7 +83,13 @@ collection_shared_codec: Codec.WidgetAppSharedCodec;
|
||||
collection_item_codec: Codec.WidgetAppSharedItemCodec;
|
||||
collection_invitation_codec: Codec.WidgetAppInvitationCodec;
|
||||
collection_ready: bool;
|
||||
collection_loading: CollectionLoading;
|
||||
collection_pictures_missing: bool;
|
||||
collection_leave_to_library: bool;
|
||||
// Whether games download new levels when they come out: asked once on the
|
||||
// covers and passed to the games as arcade.updates. -1 unread, 0 off, 1 on,
|
||||
// 2 not answered yet.
|
||||
collection_updates: s32 = -1;
|
||||
|
||||
CollectionTouchFirst :: () -> bool {
|
||||
#if #defined(PLATFORM_DESKTOP) {
|
||||
@@ -119,8 +132,9 @@ CollectionAllows :: (context: *void, node: *AppNode, name: string) -> bool {
|
||||
name == "AppInvitationHost" || name == "RefreshAppSharedHost" || name == "SendAppSharedHost" ||
|
||||
name == "SmoothFramesHost" || name == "AppLocaleHost" || name == "AppSoundHost" ||
|
||||
name == "tile_map.sampling" || name == "arcade.controls" || name == "arcade.sound" || name == "arcade.navigation" ||
|
||||
name == "arcade.updates" ||
|
||||
name == PUBLICATIONS_READ_SERVICE || name == ENTITY_RECORDS_SERVICE || name == ENTITY_DEW_SERVICE ||
|
||||
name == "entity.profile"
|
||||
name == "entity.profile" || name == "leaderboard"
|
||||
}
|
||||
|
||||
CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
|
||||
@@ -163,6 +177,12 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
|
||||
HostScalarValid(arguments[1], "string", cast(s32)HostString) {
|
||||
service := AppArgumentText(arguments[0])
|
||||
request := AppArgumentText(arguments[1])
|
||||
if service == "leaderboard" {
|
||||
saved := EntityLeaderboardReport("arcade", "Arcade", TextUntilNul(node.identity.id[:]),
|
||||
TextUntilNul(node.entry.title[:]), request)
|
||||
result.* = AppHostText(ifx saved then "{\"status\":\"saved\"}" else "{\"status\":\"rejected\"}")
|
||||
return 1
|
||||
}
|
||||
// Public level collections, such as a game's live campaign.
|
||||
if service == PUBLICATIONS_READ_SERVICE {
|
||||
result.* = AppHostText(PublicationsReadAnswer(request))
|
||||
@@ -206,6 +226,16 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
|
||||
result.* = AppHostText(value)
|
||||
return 1
|
||||
}
|
||||
if service == "arcade.updates" {
|
||||
if request == "get" {
|
||||
updates := CollectionUpdates()
|
||||
result.* = AppHostText(ifx updates == 1 then "on" else ifx updates == 0 then "off" else "unset")
|
||||
return 1
|
||||
}
|
||||
if (request != "set-on" && request != "set-off") || !CollectionUpdatesSet(request == "set-on") { return 0 }
|
||||
result.* = AppHostText(request[4:])
|
||||
return 1
|
||||
}
|
||||
if service != "arcade.controls" { return 0 }
|
||||
saved := CollectionRecordsFor("arcade.shovey-player")
|
||||
if saved == null { return 0 }
|
||||
@@ -258,14 +288,15 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
|
||||
}
|
||||
|
||||
CollectionAssetAllowed :: (path: string) -> bool {
|
||||
return path == "" || (collection_widget_node != null && AppHostAsset(collection_widget_node, path).found)
|
||||
return path == "" || (collection_widget_node != null && (AppHostAsset(collection_widget_node, path).found ||
|
||||
AppHostAssetPending(collection_widget_node, path)))
|
||||
}
|
||||
|
||||
CollectionAssetPath :: (path: string) -> string {
|
||||
if path == "" { return "" }
|
||||
if collection_widget_node == null { return "" }
|
||||
asset := AppHostAsset(collection_widget_node, path)
|
||||
if !asset.found { return "" }
|
||||
if !asset.found { collection_pictures_missing = true; return "" }
|
||||
relative := Join(TextUntilNul(collection_widget_node.entry.sha256[:]), path)
|
||||
defer { AppFileFree(relative) }
|
||||
cached := collection_images
|
||||
@@ -298,6 +329,27 @@ CollectionWidgets :: (context: *void, node: *AppNode, module: *u8, function: *u8
|
||||
return WidgetHostCall(context, module, function, arguments, count, result)
|
||||
}
|
||||
|
||||
// Check the same saved install state and verified download plan as Apps.
|
||||
// A cached payload or an old score alone is never installed membership.
|
||||
CollectionLeaderboardInstalled :: (game: string) -> bool {
|
||||
if !collection_ready { return false }
|
||||
for slot: cast(s64)0..collection_host.tree.nodes.count - 1 {
|
||||
parent := collection_host.tree.nodes[slot].node
|
||||
if parent == null || !parent.collection { continue }
|
||||
index := AppCatalogFind(*parent.catalog, game)
|
||||
if index < 0 { continue }
|
||||
entry := AppCatalogAt(*parent.catalog, index)
|
||||
identity := AppIdentity.{.authority = parent.identity.authority, .id = entry.id}
|
||||
state: AppState
|
||||
plan: AppInstallPlan
|
||||
if CollectionState(null, "local", *identity, *state) && state.installed &&
|
||||
AppHostInstallPlan(*collection_host, parent, entry, *plan) && plan.count == 0 {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
CollectionSave :: (context: *void, node: *AppNode) -> bool {
|
||||
saved := collection_records
|
||||
while saved != null {
|
||||
@@ -361,16 +413,33 @@ CollectionEffect :: (context: *void, account: string, locator: *AppLocator,
|
||||
return true
|
||||
}
|
||||
|
||||
// Arcade's own copy of the shared Apps controller. A collection that does not
|
||||
// pack one uses it; the Apps host accepts it only by the trusted digest.
|
||||
collection_controller: string;
|
||||
|
||||
CollectionController :: (context: *void) -> HostedAsset {
|
||||
unused context
|
||||
controller: HostedAsset
|
||||
controller.data = collection_controller
|
||||
controller.found = collection_controller.count > 0
|
||||
return controller
|
||||
}
|
||||
|
||||
CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
|
||||
data: string, locale: string) -> bool {
|
||||
if collection_ready { return false }
|
||||
leaderboard_installed = CollectionLeaderboardInstalled
|
||||
collection_directory = data
|
||||
collection_resource_root = Join(data, "resources")
|
||||
opened := AppFilesOpen(*collection_resources, collection_resource_root)
|
||||
if !opened { Report("Arcade: cannot open the private resources folder"); return false }
|
||||
CollectionDownloadsOpen(*collection_resources)
|
||||
platform := AppPlatform.{.allows = CollectionAllows, .call = CollectionCall,
|
||||
.widgets = CollectionWidgets, .save = CollectionSave, .state = CollectionState,
|
||||
.effect = CollectionEffect}
|
||||
.effect = CollectionEffect,
|
||||
.bundle = CollectionBundle, .download = CollectionDownload, .fetch = CollectionFetch,
|
||||
// Covers show only the art; the download dialog names the size.
|
||||
.controller = CollectionController, .presentation = AppPresentation.{.cover_grid = true, .hide_sizes = true}}
|
||||
collection_ready = AppHostStart(*collection_host, bundle, "arcade.local", "inbe.arcade",
|
||||
"arcade", digest, "local", platform, harness_digest, locale)
|
||||
if !collection_ready { Report("Arcade: the shared Apps host refused the collection") }
|
||||
@@ -378,6 +447,11 @@ CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
|
||||
}
|
||||
|
||||
CollectionOpenFiles :: (directory: string, data: string) -> bool {
|
||||
// The installed controller beside the collection; kept while Arcade runs.
|
||||
controller_path := Join(directory, "apps.zx")
|
||||
controller, controller_found := ReadEntireFile(controller_path)
|
||||
AppFileFree(controller_path)
|
||||
if controller_found { collection_controller = controller } else { AppFileFree(controller) }
|
||||
bundle_path := Join(directory, "arcade.zx")
|
||||
metadata_path := Join(directory, "arcade.json")
|
||||
defer { AppFileFree(bundle_path); AppFileFree(metadata_path) }
|
||||
@@ -421,6 +495,7 @@ CollectionOpenShovey :: (directory: string, data: string) -> bool {
|
||||
|
||||
CollectionOpenShoveyBytes :: (bytes: string, metadata: string, data: string) -> bool {
|
||||
if collection_ready { return false }
|
||||
leaderboard_installed = CollectionLeaderboardInstalled
|
||||
id: [128]u8
|
||||
digest: [65]u8
|
||||
harness: [65]u8
|
||||
@@ -449,6 +524,7 @@ CollectionBack :: () -> bool {
|
||||
}
|
||||
|
||||
CollectionCollect :: () {
|
||||
CollectionDownloadsPump()
|
||||
if entity_ready { EntityPump() }
|
||||
PublicationsReadPump()
|
||||
AppHostCollect(*collection_host)
|
||||
@@ -461,6 +537,8 @@ CollectionClose :: () -> bool {
|
||||
if !EntityClose() { return false }
|
||||
if collection_ready && !AppHostStop(*collection_host) { return false }
|
||||
collection_ready = false
|
||||
collection_loading = .{}
|
||||
CollectionDownloadsClose()
|
||||
CollectionCollect()
|
||||
VecFree(collection_frame_paths)
|
||||
while collection_images != null {
|
||||
@@ -482,12 +560,29 @@ CollectionClose :: () -> bool {
|
||||
AppFilesClose(*collection_resources)
|
||||
AppFileFree(collection_resource_root)
|
||||
collection_resource_root = ""
|
||||
AppFileFree(collection_controller)
|
||||
collection_controller = ""
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionPending :: (request: s64) -> bool {
|
||||
for index: cast(s64)0..collection_host.tree.pending.count - 1 {
|
||||
pending := collection_host.tree.pending[index]
|
||||
if pending.reply.request == request { return !pending.complete }
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
CollectionOpenGame :: (id: string) -> bool {
|
||||
root := AppTreeNode(*collection_host.tree, collection_host.tree.active)
|
||||
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 {
|
||||
unused CopyCString(id, collection_host.platform.presentation.download_id[:])
|
||||
collection_host.platform.presentation.download_request += 1
|
||||
return true
|
||||
}
|
||||
request: AppsRequest
|
||||
request.operation = APPS_OPEN
|
||||
if !CopyCString(id, request.id[:]) { return false }
|
||||
@@ -497,6 +592,12 @@ CollectionOpenGame :: (id: string) -> bool {
|
||||
return false
|
||||
}
|
||||
if !AppTreeDrain(*collection_host.tree) { Report("Arcade: the apps host stopped while starting "); Report(id); Report("\n"); return false }
|
||||
// Games that share code are verified in the background; wait for it.
|
||||
started := MonotonicMilliseconds()
|
||||
while CollectionPending(queued.request) && MonotonicMilliseconds() - started < 60000 {
|
||||
unused SleepMilliseconds(5)
|
||||
if !AppTreeDrain(*collection_host.tree) { Report("Arcade: the apps host stopped while starting "); Report(id); Report("\n"); return false }
|
||||
}
|
||||
for index: cast(s64)0..collection_host.tree.pending.count - 1 {
|
||||
reply := collection_host.tree.pending[index].reply
|
||||
if reply.request == queued.request && reply.status == APPS_REJECTED {
|
||||
@@ -516,18 +617,81 @@ CollectionOpenGame :: (id: string) -> bool {
|
||||
collection_typed: [1024]u8;
|
||||
collection_pasted: [16384]u8;
|
||||
|
||||
// The answer kept with the other game settings. Shovey Classic asked in its
|
||||
// first level before, and its answer counts until the covers ask.
|
||||
CollectionUpdates :: () -> s32 {
|
||||
if collection_updates >= 0 { return collection_updates }
|
||||
collection_updates = 2
|
||||
ids: [2]string = .["arcade.shovey-player", "arcade.shovey"]
|
||||
for id: ids {
|
||||
saved := CollectionRecordsFor(id)
|
||||
if saved == null { continue }
|
||||
AppFileFree(saved.text)
|
||||
saved.text = AppFileRead(*saved.files, "level-updates")
|
||||
if saved.text == "on" || saved.text == "off" {
|
||||
collection_updates = ifx saved.text == "on" then 1 else 0
|
||||
break
|
||||
}
|
||||
}
|
||||
return collection_updates
|
||||
}
|
||||
|
||||
CollectionUpdatesSet :: (on: bool) -> bool {
|
||||
saved := CollectionRecordsFor("arcade.shovey-player")
|
||||
if saved == null || !AppFileWrite(*saved.files, "level-updates", ifx on then "on" else "off") { return false }
|
||||
collection_updates = ifx on then 1 else 0
|
||||
return true
|
||||
}
|
||||
|
||||
// Asked once over the covers, before a game opens; nothing behind it takes
|
||||
// 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,
|
||||
.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},
|
||||
.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,
|
||||
.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}})
|
||||
button_width := (width - 48.0 - 12.0) / 2.0
|
||||
if Button(session, ButtonProps.{.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",
|
||||
.bounds = Rectangle.{x + 36.0 + button_width, y + 136.0, button_width, 44.0},
|
||||
.tone = ButtonTone.ButtonToneAccent}) != 0 {
|
||||
unused CollectionUpdatesSet(true)
|
||||
}
|
||||
}
|
||||
|
||||
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) }
|
||||
runtime := AppHostActiveRuntime(*collection_host)
|
||||
if runtime == null { Report("Arcade: no app is running\n"); return false }
|
||||
opening := !runtime.node.collection && (!collection_loading.shown ||
|
||||
collection_loading.slot != collection_host.tree.active.slot ||
|
||||
collection_loading.generation != collection_host.tree.active.generation)
|
||||
if opening { key = 0 }
|
||||
nested := runtime.node.parent.generation != 0 && !runtime.node.collection
|
||||
// An app opened from its cover fills the screen with its own navigation.
|
||||
// Other apps get a bar with Back and their title; the library and that
|
||||
// bar keep Profile at the top right.
|
||||
covered := runtime.node.entry.cover.portrait[0] != 0
|
||||
collection_toolbar_visible = !covered
|
||||
// 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
|
||||
now := cast(float64)MonotonicMilliseconds() / 1000.0
|
||||
runtime.app.session = session
|
||||
@@ -555,6 +719,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
.scale = 1.0, .font = 16, .now = now}
|
||||
}
|
||||
WidgetHostBegin(session, CollectionAssetAllowed, CollectionAssetPath)
|
||||
collection_pictures_missing = false
|
||||
drawn := AppHostRun(*collection_host, APP_FRAME)
|
||||
WidgetHostEnd()
|
||||
if !drawn {
|
||||
@@ -566,6 +731,33 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
unused AppHostBack(*collection_host)
|
||||
return true
|
||||
}
|
||||
if opening {
|
||||
pictures_ready := !collection_pictures_missing
|
||||
// Query every path, including those first requested by this frame's
|
||||
// TileMap. Android decodes them asynchronously on its render thread.
|
||||
for path: collection_frame_paths {
|
||||
if AssetWidth(path) < 0 { pictures_ready = false }
|
||||
}
|
||||
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,
|
||||
.bounds = viewport, .invisible = true})
|
||||
LoadingIndicator(session, LoadingIndicatorProps.{.key = cast(u64)49402,
|
||||
.bounds = viewport, .now = now, .scale = 1.5})
|
||||
return true
|
||||
}
|
||||
} else if runtime.node.collection {
|
||||
collection_loading = .{}
|
||||
}
|
||||
if asking {
|
||||
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
|
||||
CollectionUpdatesQuestion(session, viewport)
|
||||
unused WidgetPaletteRestore(session)
|
||||
return true
|
||||
}
|
||||
if nested && !covered {
|
||||
title_bytes: Vec(u8)
|
||||
BuilderPrint(*title_bytes, "%", TextUntilNul(runtime.node.entry.title[:]))
|
||||
@@ -587,8 +779,8 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
|
||||
CollectionToolbar :: (session: Session, viewport: Rectangle) {
|
||||
if !entity_ready || !collection_toolbar_visible { return }
|
||||
if entity_shovey { unused WidgetPaletteUse(session, ShoveyPalette()) }
|
||||
defer { if entity_shovey { unused WidgetPaletteRestore(session) } }
|
||||
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() 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[:])
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
// A newly opened game stays covered until two complete picture frames have
|
||||
// composed. Images can be requested after the first apparently ready frame.
|
||||
CollectionLoading :: struct {
|
||||
generation: s64
|
||||
slot: s64
|
||||
ready_frame: bool
|
||||
shown: bool
|
||||
}
|
||||
|
||||
CollectionNeedsCover :: (state: *CollectionLoading, slot: s64, generation: s64,
|
||||
pictures_ready: bool) -> bool {
|
||||
if state.slot != slot || state.generation != generation {
|
||||
state.* = CollectionLoading.{.slot = slot, .generation = generation}
|
||||
return true
|
||||
}
|
||||
if state.shown { return false }
|
||||
if !pictures_ready { state.ready_frame = false; return true }
|
||||
if !state.ready_frame { state.ready_frame = true; return true }
|
||||
state.shown = true
|
||||
return false
|
||||
}
|
||||
@@ -12,11 +12,15 @@
|
||||
#import "entity_host"
|
||||
#import "entity/model"
|
||||
#import "kryon/carousel"
|
||||
#import "apps/appearance"
|
||||
#import "kryon/widget_palette"
|
||||
|
||||
sdl :: #system_library "SDL2";
|
||||
SetTitle :: (window: *void, title: *u8) #foreign sdl "SDL_SetWindowTitle";
|
||||
|
||||
DrawStartup :: (session: Session, directory: string) -> bool {
|
||||
// First show small RGB/RGBA previews. The collection replaces them with its
|
||||
// original artwork when ready, using the same layout and coloured logo.
|
||||
DrawStartup :: (session: Session, directory: string, standalone: bool = true) -> bool {
|
||||
if !PollDesktop() || WindowTakeCloseRequestHost() { return false }
|
||||
BeginDesktopFrame()
|
||||
viewport := DesktopViewport()
|
||||
@@ -25,7 +29,15 @@ DrawStartup :: (session: Session, directory: string) -> bool {
|
||||
logo := Join(directory, "startup/shovey/logo.png")
|
||||
defer { EntityFree(art); EntityFree(logo) }
|
||||
if BeginFrame(session, cast(u64)1, viewport) != FrameStatus.FrameOk { return false }
|
||||
unused CarouselArtwork(session, viewport, cast(u64)48000, art, logo, "Shovey")
|
||||
if standalone {
|
||||
unused 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 WidgetPaletteRestore(session)
|
||||
}
|
||||
if EndFrame(session) != FrameStatus.FrameOk { return false }
|
||||
ok := EndDesktopFrame()
|
||||
TestDriverFrame(session)
|
||||
@@ -127,7 +139,7 @@ main :: (argc: s32, argv: **u8) -> s32 {
|
||||
Report(": no private data directory\n")
|
||||
return 1
|
||||
}
|
||||
if !OpenDesktopSized(480, 820) || !WindowInterceptCloseHost(true) {
|
||||
if !OpenDesktopSized(ifx standalone then 480 else 1000, 820) || !WindowInterceptCloseHost(true) {
|
||||
CloseDesktop()
|
||||
return 1
|
||||
}
|
||||
@@ -138,7 +150,7 @@ main :: (argc: s32, argv: **u8) -> s32 {
|
||||
session := SessionOpen()
|
||||
if !SessionValid(session) { return 1 }
|
||||
defer { SessionClose(session) }
|
||||
if standalone && !DrawStartup(session, directory) { return 0 }
|
||||
if !DrawStartup(session, directory, standalone) { return 0 }
|
||||
// Both open on their library's covers, or straight into a named game.
|
||||
opened := ifx standalone then CollectionOpenShovey(directory, data) else CollectionOpenFiles(directory, data)
|
||||
if opened && standalone && !DrawStartup(session, directory) { unused CollectionClose(); return 0 }
|
||||
|
||||
@@ -14,11 +14,15 @@
|
||||
#import "platform"
|
||||
#import "shovey/shovey_theme"
|
||||
#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"
|
||||
#import "kryon/tree"
|
||||
|
||||
entity_bundle: string;
|
||||
entity_ready: bool;
|
||||
@@ -39,6 +43,9 @@ EntityShoveyTokens :: () {
|
||||
|
||||
EntityOpen :: (bytes: string, data: string, shovey: bool = false) -> bool {
|
||||
entity_shovey = shovey
|
||||
#if #defined(GOOGLE_PLAY) {
|
||||
EntityHostAllowFunding(false)
|
||||
}
|
||||
if shovey { EntityShoveyTokens() }
|
||||
root := Join(data, "entity")
|
||||
defer { EntityFree(root) }
|
||||
@@ -81,19 +88,23 @@ EntityBack :: () -> bool {
|
||||
}
|
||||
|
||||
EntityFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers: s32) -> bool {
|
||||
if entity_shovey { unused WidgetPaletteUse(session, ShoveyPalette()) }
|
||||
defer { if entity_shovey { unused WidgetPaletteRestore(session) } }
|
||||
Box(session, BoxProps.{.key = cast(u64)49000, .bounds = viewport,
|
||||
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
|
||||
defer { unused WidgetPaletteRestore(session) }
|
||||
Box(session, BoxProps.{.key = cast(u64)49010, .bounds = viewport,
|
||||
.fill = StyleTokenColorOr("canvas", Color.{239, 246, 244, 255})})
|
||||
bounds := Rectangle.{viewport.x, viewport.y + 56.0, viewport.width, viewport.height - 56.0}
|
||||
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,
|
||||
.title = "Profile", .width = cast(s32)width, .height = cast(s32)height, .scale = 1.0,
|
||||
.has_right_action = true, .right_label = "Back"})
|
||||
if modal.dismissed || modal.right_clicked { unused EntityBack() }
|
||||
if !modal.opened { return true }
|
||||
input := TextFieldInputFor(key, modifiers, TypedTextTake(session, entity_typed[:]))
|
||||
if !EntityHostFrame(session, bounds, key, modifiers, input, entity_shovey) { return false }
|
||||
Text(session, TextProps.{.key = cast(u64)49002, .text = "Profile", .font = 20,
|
||||
.bounds = Rectangle.{viewport.x + 100.0, viewport.y + 12.0, viewport.width - 220.0, 36.0}})
|
||||
if Button(session, ButtonProps.{.key = cast(u64)49001, .id = 49001, .label = "Back",
|
||||
.bounds = Rectangle.{viewport.x + 8.0, viewport.y + 6.0, 76.0, 44.0}}) != 0 {
|
||||
unused EntityBack()
|
||||
}
|
||||
ok := EntityHostFrame(session, modal.layout.content, key, modifiers, input, true)
|
||||
unused End(session)
|
||||
if !ok { return false }
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
@@ -48,6 +48,11 @@ DataDirectory :: () -> string {
|
||||
BuilderPrint(*result, "%", private)
|
||||
return BuilderFinish(result)
|
||||
}
|
||||
// The browser keeps saves and downloaded games in the page's persistent
|
||||
// storage, which Kryon mounts at /kryon-apps.
|
||||
#if #defined(PLATFORM_WEB) {
|
||||
return Join("/kryon-apps", "arcade")
|
||||
}
|
||||
exact := EnvironmentText("ARCADE_DATA")
|
||||
if exact != "" { return exact }
|
||||
#if #defined(_WIN32) {
|
||||
|
||||
@@ -10,8 +10,8 @@ SoundMuted :: () -> bool { return sound_muted }
|
||||
|
||||
SoundSetMuted :: (muted: bool) { sound_muted = muted }
|
||||
|
||||
#if #defined(ANDROID_BUILD) {
|
||||
// Android has no SDL audio; games stay silent there and run on.
|
||||
#if #defined(ANDROID_BUILD) || #defined(PLATFORM_WEB) {
|
||||
// Android and the browser have no SDL audio; games stay silent there and run on.
|
||||
SoundPlay :: (bytes: string) -> bool {
|
||||
unused bytes
|
||||
return false
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
// 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.
|
||||
using Canvas :: #import "kryon/Canvas";
|
||||
#import "kryon/bundle_storage_web"
|
||||
#import "kryon/app_files"
|
||||
#import "kryon/session"
|
||||
#import "kryon/geometry"
|
||||
#import "kryon/tree"
|
||||
#import "kryon/tree_input"
|
||||
#import "kryon/Frame"
|
||||
#import "kryon/ScrollDevice"
|
||||
#import "kryon/key_input"
|
||||
#import "kryon/TestDriver"
|
||||
#import "kryon/page_core"
|
||||
#import "std/file"
|
||||
#import "std/web"
|
||||
#import "std/byte_text_linux"
|
||||
#import "platform"
|
||||
#import "collection_host"
|
||||
#import "entity_host"
|
||||
|
||||
arcade_receipt: [4096]u8;
|
||||
|
||||
// The page passes the collection's build receipt (its digest and trusted
|
||||
// Apps controller) as Module.arcadeReceipt, beside the preloaded /app.zx.
|
||||
ArcadeReceipt :: () -> string {
|
||||
handle := WebAsObject(WebGet(WebGetObject(WebGlobal, WebName("Module")), WebName("arcadeReceipt")))
|
||||
if handle == 0 { return "" }
|
||||
length := WebCopyString(handle, arcade_receipt[:])
|
||||
if length <= 0 || length >= cast(s32)arcade_receipt.count { return "" }
|
||||
return TextFromBytes(arcade_receipt[:length])
|
||||
}
|
||||
|
||||
ArcadeFrame :: (session: Session) -> bool {
|
||||
BeginCanvasFrame()
|
||||
viewport := CanvasViewport()
|
||||
modifiers := CanvasModifiers()
|
||||
KeyboardModifiersSend(session, modifiers)
|
||||
key := CanvasPressedKey()
|
||||
if key == 256 && CollectionBack() { key = 0 }
|
||||
KeyboardSend(session, key)
|
||||
point := CanvasTypedCodepoint()
|
||||
while point != 0 { unused TypedCodepointSend(session, point); point = CanvasTypedCodepoint() }
|
||||
pointer := PollPointer()
|
||||
TreePointerUpdate(session, pointer)
|
||||
TreeSecondaryPointerUpdate(session, PollSecondaryPointer())
|
||||
wheel := CanvasWheelMove()
|
||||
PointerWheelSend(session, pointer.x, pointer.y, wheel)
|
||||
BeginScrollFrame(session, Vector2.{pointer.x, pointer.y}, pointer.pressed,
|
||||
pointer.down, pointer.released, wheel, PageNow() / 1000.0)
|
||||
if BeginFrame(session, cast(u64)1, viewport) != FrameStatus.FrameOk { return false }
|
||||
if !CollectionFrame(session, viewport, key, modifiers) {
|
||||
TreeCancel(session)
|
||||
return false
|
||||
}
|
||||
if EndFrame(session) != FrameStatus.FrameOk { return false }
|
||||
TestDriverFrame(session)
|
||||
CanvasCursor(session)
|
||||
ok := EndCanvasFrame()
|
||||
CollectionCollect()
|
||||
return ok
|
||||
}
|
||||
|
||||
#program_export
|
||||
main :: () -> s32 {
|
||||
if !OpenCanvas() { return 1 }
|
||||
defer CloseCanvas()
|
||||
if !BundleStorageOpen() { return 1 }
|
||||
while !BundleStorageReady() && !BundleStorageFailed() { WebSleep(10) }
|
||||
if !BundleStorageReady() { return 1 }
|
||||
data := DataDirectory()
|
||||
// The page preloads Arcade's published collection; the Profile is embedded.
|
||||
bytes, found := ReadEntireFile("/app.zx")
|
||||
profile, profile_found := ReadEntireFile("/entity.zx")
|
||||
defer { AppFileFree(bytes) }
|
||||
receipt := ArcadeReceipt()
|
||||
// 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 }
|
||||
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)
|
||||
// Saves reach the browser's storage about once a second.
|
||||
if PageNow() - saved >= 1000.0 {
|
||||
unused BundleStorageSync(false)
|
||||
saved = PageNow()
|
||||
}
|
||||
WebEnd(scope)
|
||||
}
|
||||
unused CollectionClose()
|
||||
unused BundleStorageSync(false)
|
||||
return ifx ok then 0 else 1
|
||||
}
|
||||
@@ -1,4 +1,11 @@
|
||||
"""Resume one shared progress fixture on the USB Moto in an isolated APK."""
|
||||
"""Verify completion-only progress on the USB Moto in an isolated APK.
|
||||
|
||||
The default full case covers real swipe motion, device-local board persistence,
|
||||
read-only account progress across movement/restart, earned completion and logout
|
||||
isolation. Startup/account cases are diagnostics, not substitutes for the full
|
||||
case. Supply the exact approved campaign and an offline throwaway account folder;
|
||||
never supply owner keys. Existing verification-profile files are preserved.
|
||||
"""
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
@@ -12,19 +19,45 @@ import time
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--apk', type=Path, required=True)
|
||||
parser.add_argument('--breeze', type=Path, required=True)
|
||||
parser.add_argument('--campaign', type=Path, required=True)
|
||||
parser.add_argument('--test-account', type=Path, required=True)
|
||||
parser.add_argument('--output', type=Path)
|
||||
parser.add_argument('--case', choices=('all', 'startup', 'account'), default='all')
|
||||
args = parser.parse_args()
|
||||
sys.path.insert(0, str(args.breeze.resolve() / 'tests'))
|
||||
import android_library_device as transport
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_cover_question(driver):
|
||||
"""Standalone Arcade and Shovey ask once on their covers whether games
|
||||
download new levels; tests keep the levels they ship with. The question
|
||||
shows in the covers' first frame."""
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
transport.OUTPUT = root / 'backup/shared-progress-moto'
|
||||
transport.OUTPUT = args.output or root / 'backup/shared-progress-moto'
|
||||
transport.PACKAGE = 'xyz.waozi.shovey.verification'
|
||||
transport.ACTIVITY = transport.PACKAGE + '/xyz.waozi.arcade.ArcadeActivity'
|
||||
transport.TRANSFER = '/data/local/tmp/shovey-progress-test'
|
||||
transport.OUTPUT.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
class Phone(transport.Device):
|
||||
def owns_foreground(self):
|
||||
# Test-driver file input does not count as Android user activity.
|
||||
# Wake only the USB test device; keep its timeout setting intact.
|
||||
if time.monotonic() - getattr(self, '_last_wake', 0) > 10:
|
||||
self.shell('input', 'keyevent', 'KEYCODE_WAKEUP')
|
||||
self._last_wake = time.monotonic()
|
||||
super().owns_foreground()
|
||||
|
||||
def start(self):
|
||||
self.shell('input', 'keyevent', 'KEYCODE_WAKEUP')
|
||||
self.shell('wm', 'dismiss-keyguard', check=False)
|
||||
result = self.shell('am', 'start', '-W', '-n', transport.ACTIVITY)
|
||||
assert 'Error:' not in result, result
|
||||
self.owns_foreground()
|
||||
@@ -60,7 +93,7 @@ foreground = phone.foreground()
|
||||
assert ' xyz.waozi.shovey/' not in foreground, 'The regular Shovey app is foreground'
|
||||
phone.stop()
|
||||
phone.adb('install', '-r', '-t', apk, timeout=180)
|
||||
phone.state = dict(originating_chat='-1000000002', task='codex-projects-library-bookshelf',
|
||||
phone.state = dict(originating_chat='361338016', task='78530008ff5f508081150dec7522f477464f',
|
||||
foreground_before=foreground, apk_sha256=hashlib.sha256(apk.read_bytes()).hexdigest(),
|
||||
isolated=True, preserved=False)
|
||||
phone.save()
|
||||
@@ -70,34 +103,190 @@ try:
|
||||
phone.state['preserved'] = True
|
||||
phone.save()
|
||||
identifier = 'fd65a3d7ac3d5ceb2d4d96cc5224a740'
|
||||
records = 'files/entity/records/local'
|
||||
game = records + '/game-progress/' + identifier + '.json'
|
||||
phone.private('mkdir', '-p', 'files/kryon-test-driver', records + '/game-progress')
|
||||
phone.private('touch', 'files/.progress-test')
|
||||
stamp = int(time.time())
|
||||
phone.write('state', 'game-progress\nsince 0\n', records + '/state')
|
||||
phone.write('game-progress.index', f'{identifier} {stamp} {stamp * 1000} -- entity.game-progress.v1\n', records + '/game-progress.index')
|
||||
phone.write('campaign.json', json.dumps(dict(game='shovey.classic', unlocked=40,
|
||||
completed='1' * 39, state='', updated_at=stamp)), game)
|
||||
for attempt in ('first', 'restart'):
|
||||
local_campaign = None
|
||||
route = json.loads(args.campaign.read_text())['levels'][0]['solution']
|
||||
timings = []
|
||||
|
||||
def seed(unlocked, completed, account=False):
|
||||
phone.stop()
|
||||
assert phone.exists('files/.progress-test') or not phone.exists('files')
|
||||
if phone.exists('files'):
|
||||
phone.private('rm', '-rf', 'files')
|
||||
phone.private('mkdir', '-p', 'files/kryon-test-driver', 'files/entity')
|
||||
phone.private('touch', 'files/.progress-test')
|
||||
owner = 'local'
|
||||
if account:
|
||||
profile = json.loads((args.test_account / 'entity.json').read_text())
|
||||
owner = profile['owner_id']
|
||||
for name in ('account.key', 'entity.json'):
|
||||
phone.put_private(args.test_account / name, 'files/entity/' + name)
|
||||
records = 'files/entity/records/' + owner
|
||||
phone.private('mkdir', '-p', records + '/game-progress')
|
||||
stamp = int(time.time())
|
||||
phone.write('state', 'game-progress\nsince 0\n', records + '/state')
|
||||
phone.write('game-progress.index', f'{identifier} {stamp} {stamp * 1000} -- entity.game-progress.v1\n', records + '/game-progress.index')
|
||||
game = records + '/game-progress/' + identifier + '.json'
|
||||
phone.write('campaign.json', json.dumps(dict(game='shovey.classic', unlocked=unlocked,
|
||||
completed=completed, updated_at=stamp)), game)
|
||||
return game
|
||||
|
||||
def enter(level):
|
||||
phone.start()
|
||||
driver = transport.AndroidDriver(phone)
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button', timeout=60)
|
||||
deadline = time.monotonic() + 60
|
||||
while not driver.find(contains='Level 40 / ', role='text'):
|
||||
if driver.find(label='Download new levels when they come out?', role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
assert time.monotonic() < deadline, driver.text()
|
||||
driver.wait_idle(frames=5)
|
||||
record = json.loads(phone.private('cat', game))
|
||||
assert record['unlocked'] == 40 and record['completed'] == '1' * 39, record
|
||||
assert record['state'].startswith('M1'), record
|
||||
assert not phone.exists('files/games/arcade.shovey/records/campaign'), 'Duplicate wrapper campaign'
|
||||
assert len(phone.private('ls', records + '/game-progress').splitlines()) == 1
|
||||
phone.capture('level-40-' + attempt)
|
||||
driver.wait(contains=f'Level {level} / ', role='text', timeout=60)
|
||||
if driver.find(label='How do you want to move?', role='text'):
|
||||
driver.press(label='Swipe and tap', role='button')
|
||||
driver.wait(label='Restart', role='button')
|
||||
return driver
|
||||
|
||||
def campaign_path():
|
||||
paths = phone.private('find', 'files/games', '-name', 'local.campaign').splitlines()
|
||||
assert len(paths) == 1, paths
|
||||
return paths[0]
|
||||
|
||||
def player(driver):
|
||||
node = driver.wait(label='Shovey', role='image')
|
||||
return tuple(node[field] for field in ('x', 'y', 'width'))
|
||||
|
||||
def step(driver, direction):
|
||||
before = phone.private('cat', campaign_path())
|
||||
driver.key(('left', 'up', 'right', 'down')[int(direction)])
|
||||
# Input is handled by the real frame and commits its local campaign.
|
||||
deadline = time.monotonic() + 10
|
||||
while phone.private('cat', campaign_path()) == before:
|
||||
assert time.monotonic() < deadline, 'Direction did not update the device-local campaign'
|
||||
time.sleep(.05)
|
||||
|
||||
if args.case in ('all', 'startup'):
|
||||
game = seed(40, '1' * 39)
|
||||
driver = enter(40)
|
||||
provider_before = phone.private('cat', game)
|
||||
local_campaign = campaign_path()
|
||||
first_local = phone.private('cat', local_campaign)
|
||||
phone.capture('level-40-initial')
|
||||
# Android's actual input path, independently of the widget driver.
|
||||
before = player(driver)
|
||||
x, y, cell = before
|
||||
start = time.monotonic()
|
||||
phone.shell('input', 'swipe', round(x + cell / 2), round(y + cell / 2),
|
||||
round(x + cell / 2 - cell * 2), round(y + cell / 2), 150)
|
||||
deadline = time.monotonic() + 10
|
||||
while player(driver) == before:
|
||||
assert time.monotonic() < deadline, 'Real Android swipe did not move the player'
|
||||
timings.append(dict(input='Android swipe left', observed_ms=round((time.monotonic()-start)*1000, 1)))
|
||||
assert phone.private('cat', local_campaign) != first_local
|
||||
assert phone.private('cat', game) == provider_before, 'Movement modified the account progress record'
|
||||
saved = phone.private('cat', local_campaign)
|
||||
position = player(driver)
|
||||
phone.capture('level-40-moved')
|
||||
# The app's own frame metrics retain recent frame times; no global reset.
|
||||
layers = phone.shell('dumpsys', 'SurfaceFlinger', '--list')
|
||||
owned = [line for line in layers.splitlines() if transport.PACKAGE in line]
|
||||
for index, layer in enumerate(owned):
|
||||
(transport.OUTPUT / f'frame-latency-{index}.txt').write_text(phone.shell('dumpsys', 'SurfaceFlinger', '--latency', layer))
|
||||
phone.stop()
|
||||
phone.state['result'] = 'passed'
|
||||
driver = enter(40)
|
||||
assert phone.private('cat', local_campaign) == saved, 'Cold restart changed the saved board'
|
||||
assert player(driver) == position, 'Cold restart changed the player position'
|
||||
after_restart = phone.private('cat', game)
|
||||
(transport.OUTPUT / 'provider-before-restart.json').write_text(provider_before + '\n')
|
||||
(transport.OUTPUT / 'provider-after-restart.json').write_text(after_restart + '\n')
|
||||
assert after_restart == provider_before, 'Cold restart rewrote identical earned account progress'
|
||||
restarted = json.loads(after_restart)
|
||||
assert restarted['unlocked'] == 40 and restarted['completed'].startswith('1' * 39), restarted
|
||||
assert 'state' not in restarted
|
||||
phone.state['level40_restart_record'] = restarted
|
||||
phone.save()
|
||||
phone.capture('level-40-restarted')
|
||||
|
||||
print('Level40 real swipe/local save/cold restart passed', flush=True)
|
||||
if args.case == 'all':
|
||||
game = seed(1, '')
|
||||
driver = enter(1)
|
||||
provider_before = phone.private('cat', game)
|
||||
for direction in route[:-1]:
|
||||
step(driver, direction)
|
||||
assert phone.private('cat', game) == provider_before, 'Active puzzle wrote account progress'
|
||||
step(driver, route[-1])
|
||||
deadline = time.monotonic() + 30
|
||||
while True:
|
||||
record = json.loads(phone.private('cat', game))
|
||||
if record['unlocked'] == 2 and record['completed'].startswith('1'):
|
||||
break
|
||||
assert time.monotonic() < deadline, record
|
||||
assert 'state' not in record, 'Account record contains player state'
|
||||
phone.state['completion_record'] = record
|
||||
phone.save()
|
||||
phone.stop()
|
||||
driver = enter(2)
|
||||
assert json.loads(phone.private('cat', game))['unlocked'] == 2
|
||||
phone.capture('completion-restarted')
|
||||
print('Completion-only unlock and restart passed', flush=True)
|
||||
|
||||
continued = None
|
||||
if args.case in ('all', 'account'):
|
||||
# Start as an entirely artificial account, with a different local owner.
|
||||
# No owner key, app or profile is read or altered.
|
||||
game = seed(40, '', account=True)
|
||||
driver = enter(40)
|
||||
driver.press(label='Levels', role='button')
|
||||
driver.press(key=33001)
|
||||
driver.wait(contains='Level 1 / ', role='text')
|
||||
step(driver, route[0])
|
||||
before_logout = player(driver)
|
||||
(transport.OUTPUT / 'old-owner-active-campaign.txt').write_text(phone.private('cat', campaign_path()))
|
||||
old_account = phone.private('cat', game)
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Play', role='button')
|
||||
driver.press(label='Profile', role='button')
|
||||
if not driver.find(label='Log out', role='button', visible=True):
|
||||
driver.press(label='Account', role='button')
|
||||
driver.press(label='Log out', role='button')
|
||||
driver.press(key=807)
|
||||
driver.wait(label='Not signed in', role='text', timeout=30)
|
||||
for depth in range(8):
|
||||
if driver.find(label='Play', role='button', visible=True):
|
||||
break
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Play', role='button')
|
||||
driver.press(label='Play', role='button')
|
||||
driver.wait(contains='Level 1 / ', role='text')
|
||||
continued = player(driver) == before_logout
|
||||
assert not phone.exists('files/entity/account.key'), 'Logout did not finish'
|
||||
phone.state['account_switch_kept_active_board'] = continued
|
||||
local_owner_record = 'files/entity/records/local/game-progress/' + identifier + '.json'
|
||||
if phone.exists(local_owner_record):
|
||||
text = phone.private('cat', local_owner_record)
|
||||
(transport.OUTPUT / 'new-owner-before-completion.json').write_text(text + '\n')
|
||||
phone.state['new_owner_before_completion'] = json.loads(text)
|
||||
phone.save()
|
||||
for direction in (route[1:] if continued else route):
|
||||
step(driver, direction)
|
||||
# Owner isolation is independent of whether the host retained the
|
||||
# device-local board or reopened it. Neither path may publish old unlocks.
|
||||
deadline = time.monotonic() + 30
|
||||
while not (driver.find(contains='Level 1 / ', role='text') or
|
||||
driver.find(contains='Level 2 / ', role='text')):
|
||||
assert time.monotonic() < deadline, driver.text()
|
||||
phone.state['account_switch_final_header'] = [node['label'] for node in driver.find(key=20001)]
|
||||
assert phone.private('cat', game) == old_account, 'Signed-out account was modified'
|
||||
new_record = 'files/entity/records/local/game-progress/' + identifier + '.json'
|
||||
if phone.exists(new_record):
|
||||
record = json.loads(phone.private('cat', new_record))
|
||||
(transport.OUTPUT / 'new-owner-completion.json').write_text(json.dumps(record, indent=2) + '\n')
|
||||
phone.state['account_switch_new_record'] = record
|
||||
phone.state['account_switch_kept_active_board'] = continued
|
||||
phone.save()
|
||||
assert record['unlocked'] <= 2 and 'state' not in record, 'Old account progress leaked into new owner: ' + json.dumps(record)
|
||||
phone.state.update(result='passed', case=args.case,
|
||||
movement_saved_locally=args.case in ('all', 'startup'),
|
||||
provider_unchanged_during_moves=args.case in ('all', 'startup'),
|
||||
completion_only=args.case == 'all', cold_restart=args.case in ('all', 'startup'), account_switch=args.case in ('all', 'account'),
|
||||
account_switch_kept_active_board=continued, motion_observations=timings,
|
||||
timing_limitation='ADB-to-widget observation includes transport/poll latency; SurfaceFlinger samples saved separately, no before/after baseline')
|
||||
phone.save()
|
||||
print('Moto standalone Shovey resumes level 40 from one canonical provider record, keeps completion marks and survives a cold restart')
|
||||
print('USB Moto local test passed: ' + args.case)
|
||||
finally:
|
||||
phone.restore()
|
||||
@@ -1,5 +1,6 @@
|
||||
"""A local dependency override must never select the trusted controller's source."""
|
||||
import importlib.util
|
||||
import json
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
import unittest
|
||||
@@ -15,8 +16,17 @@ class ControllerSourceTests(unittest.TestCase):
|
||||
def test_local_overrides_do_not_reach_locked_resolution(self):
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
root = Path(directory)
|
||||
(root / 'ziran.toml').write_text('committed manifest')
|
||||
(root / 'ziran.lock').write_text('committed lock')
|
||||
manifest = ('[package]\nname = "Arcade"\n'
|
||||
'[toolchain]\ngit = "https://github.com/ziranlang/ziran.git"\nref = "master"\n'
|
||||
'[dependencies.apps]\ngit = "https://github.com/waozixyz/apps.git"\nref = "master"\n'
|
||||
'[dependencies.wurm]\ngit = "https://github.com/waozixyz/wurm.git"\nref = "master"\n')
|
||||
(root / 'ziran.toml').write_text(manifest)
|
||||
lock = dict(root=dict(name='Arcade', dependencies=dict(apps='launcher', wurm='game')),
|
||||
toolchain=dict(commit='pinned-compiler'), packages=[
|
||||
dict(id='launcher', commit='pinned-launcher', dependencies=dict(kryon='ui')),
|
||||
dict(id='ui', commit='pinned-ui', dependencies={}),
|
||||
dict(id='game', commit='unpublished-game', dependencies={})])
|
||||
(root / 'ziran.lock').write_text(json.dumps(lock))
|
||||
(root / 'ziran.local.toml').write_text('unreviewed local dependency')
|
||||
package = root / 'cached-apps'
|
||||
output = root / 'output'
|
||||
@@ -25,8 +35,11 @@ class ControllerSourceTests(unittest.TestCase):
|
||||
def resolve(command, *, cwd, text):
|
||||
self.assertEqual(command, ['ziran', 'pkg', 'path', 'apps', '--locked'])
|
||||
self.assertTrue(text)
|
||||
self.assertEqual((cwd / 'ziran.toml').read_text(), 'committed manifest')
|
||||
self.assertEqual((cwd / 'ziran.lock').read_text(), 'committed lock')
|
||||
self.assertNotIn('dependencies.wurm', (cwd / 'ziran.toml').read_text())
|
||||
selected = json.loads((cwd / 'ziran.lock').read_text())
|
||||
self.assertEqual(selected['root']['dependencies'], {'apps': 'launcher'})
|
||||
self.assertEqual(selected['packages'], lock['packages'][:2])
|
||||
self.assertEqual(selected['toolchain'], lock['toolchain'])
|
||||
self.assertEqual({p.name for p in cwd.iterdir()}, {'ziran.toml', 'ziran.lock'})
|
||||
contexts.append(cwd)
|
||||
return str(package) + '\n'
|
||||
@@ -38,6 +51,8 @@ class ControllerSourceTests(unittest.TestCase):
|
||||
[builder.sys.executable, str(package / 'scripts/build-ui.py'),
|
||||
'--output', str(output)], cwd=root, check=True)
|
||||
self.assertFalse(contexts[0].exists())
|
||||
self.assertEqual((root / 'ziran.toml').read_text(), manifest)
|
||||
self.assertEqual(json.loads((root / 'ziran.lock').read_text()), lock)
|
||||
self.assertEqual((root / 'ziran.local.toml').read_text(), 'unreviewed local dependency')
|
||||
|
||||
|
||||
|
||||
@@ -34,13 +34,13 @@ original = (ROOT / 'build/games/chess.zx').read_bytes()
|
||||
container = (ROOT / 'build/arcade.zx').read_bytes()
|
||||
metadata = json.loads((ROOT / 'build/arcade.json').read_text())
|
||||
assert original not in container, 'Disabled Chess must not remain in the published collection'
|
||||
assert {child['id'] for child in metadata['children']} == {'arcade.shovey', 'arcade.shovey-editor'}
|
||||
assert {child['id'] for child in metadata['children']} == {'arcade.shovey', 'arcade.shovey-editor', 'xyz.waozi.wurm'}
|
||||
for child in metadata['children']:
|
||||
name = child['expected_id']
|
||||
exact = (ROOT / f'build/games/{name}.zx').read_bytes()
|
||||
assert container.count(exact) == 1, 'A game must be packed once without a nested chooser'
|
||||
assert exact not in container, 'Arcade must carry no prepackaged game bytes'
|
||||
assert hashlib.sha256(exact).hexdigest() == child['sha256']
|
||||
assert child['cover']['portrait'] and child['cover']['landscape'] and child['cover']['logo']
|
||||
assert child['cover']['portrait'] and child['cover']['landscape']
|
||||
refused = subprocess.run([str(ROOT / 'build/arcade'), '--app', 'chess'], env=env, capture_output=True, timeout=10)
|
||||
assert refused.returncode == 1 and b'unknown game' in refused.stderr
|
||||
print('Game identities, direct collection leaves, full cover resources and disabled Chess passed')
|
||||
@@ -0,0 +1,21 @@
|
||||
#import, file "../src/collection_loading.zi";
|
||||
|
||||
#program_export
|
||||
Check :: () -> s32 {
|
||||
state: CollectionLoading
|
||||
if !CollectionNeedsCover(*state, 1, 1, true) { return 1 }
|
||||
if !CollectionNeedsCover(*state, 1, 1, true) { return 2 }
|
||||
// A later request invalidates the apparently ready frame.
|
||||
if !CollectionNeedsCover(*state, 1, 1, false) { return 3 }
|
||||
if !CollectionNeedsCover(*state, 1, 1, false) { return 4 }
|
||||
if !CollectionNeedsCover(*state, 1, 1, true) { return 5 }
|
||||
if CollectionNeedsCover(*state, 1, 1, true) { return 6 }
|
||||
// Gameplay never returns to its opening cover for an animation sprite.
|
||||
if CollectionNeedsCover(*state, 1, 1, false) { return 7 }
|
||||
// A new game or a reopened slot gets its own loading stage.
|
||||
if !CollectionNeedsCover(*state, 2, 1, true) { return 8 }
|
||||
if !CollectionNeedsCover(*state, 2, 1, true) { return 9 }
|
||||
if CollectionNeedsCover(*state, 2, 1, true) { return 10 }
|
||||
if !CollectionNeedsCover(*state, 2, 2, true) { return 11 }
|
||||
return 42
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
|
||||
cd "$root"
|
||||
mkdir -p build/collection-loading-test
|
||||
./scripts/ziran.sh bundle --project --root "$root" \
|
||||
--entry collection_loading_behavior:Check \
|
||||
-o build/collection-loading-test/test.zx tests/collection_loading_behavior.zi
|
||||
test "$(./scripts/ziran.sh run build/collection-loading-test/test.zx)" = 42
|
||||
echo 'Local collection loading test: late image requests, consecutive ready frames and navigation'
|
||||
@@ -1,6 +1,7 @@
|
||||
"""Exercise packaging from the actual registered game builds, preserving bytes."""
|
||||
import hashlib
|
||||
import importlib.util
|
||||
import io
|
||||
import json
|
||||
from pathlib import Path
|
||||
import shlex
|
||||
@@ -8,12 +9,17 @@ import shutil
|
||||
import tempfile
|
||||
import unittest
|
||||
import sys
|
||||
import tarfile
|
||||
from PIL import Image
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "scripts"))
|
||||
spec = importlib.util.spec_from_file_location("build_collection", ROOT / "scripts/build-collection.py")
|
||||
builder = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(builder)
|
||||
art_spec = importlib.util.spec_from_file_location("library_art", ROOT / "scripts/library-art.py")
|
||||
artist = importlib.util.module_from_spec(art_spec)
|
||||
art_spec.loader.exec_module(artist)
|
||||
|
||||
|
||||
class CollectionTests(unittest.TestCase):
|
||||
@@ -37,6 +43,7 @@ class CollectionTests(unittest.TestCase):
|
||||
shutil.copytree(ROOT / "build/games", self.root / "build/games")
|
||||
(self.root / "assets/arcade").mkdir(parents=True)
|
||||
shutil.copyfile(ROOT / "assets/arcade/sidebar.shape", self.root / "assets/arcade/sidebar.shape")
|
||||
shutil.copytree(ROOT / "assets/arcade/library", self.root / "assets/arcade/library")
|
||||
# Only a native VM identity gate can trust a controller. This fixture
|
||||
# tests packing and its exact-content requirement, not that handshake.
|
||||
self.controller = self.root / "controller.zx"
|
||||
@@ -56,11 +63,12 @@ class CollectionTests(unittest.TestCase):
|
||||
# The ledger also versions Arcade itself, which is not one of its games.
|
||||
ledger = json.loads((ROOT / "apps/versions.json").read_text())["node_apps"]
|
||||
self.assertEqual({c["id"] for c in catalog["children"]},
|
||||
{"arcade.shovey", "arcade.shovey-editor"})
|
||||
{"arcade.shovey", "arcade.shovey-editor", "xyz.waozi.wurm"})
|
||||
# Each leaf keeps the cover its own package declares.
|
||||
self.assertEqual([c["cover"]["caption"] for c in catalog["children"]], ["Classic", "Editor"])
|
||||
self.assertEqual([c["cover"].get("caption", "") for c in catalog["children"]], ["Classic", "Editor", ""])
|
||||
self.assertEqual([(p["name"], p["id"], p["children"]) for p in packages],
|
||||
[("shovey", "arcade.shovey-player", ["arcade.shovey", "arcade.shovey-editor"])])
|
||||
[("shovey", "arcade.shovey-player", ["arcade.shovey", "arcade.shovey-editor"]),
|
||||
("wurm", "xyz.waozi.wurm-player", ["xyz.waozi.wurm"])])
|
||||
for child in catalog["children"]:
|
||||
name = child["expected_id"]
|
||||
packed = self.output / child["bundle"]
|
||||
@@ -68,10 +76,70 @@ class CollectionTests(unittest.TestCase):
|
||||
self.assertEqual(builder.digest(packed), child["sha256"])
|
||||
self.assertEqual(child["version"], ledger[name]["version"])
|
||||
self.assertEqual(child["protocol"], "node/2")
|
||||
# The library packs its own small copy of each game's art.
|
||||
self.assertEqual((self.output / child["preview"]).read_bytes(),
|
||||
(ROOT / f"build/games/{name}-preview.png").read_bytes())
|
||||
(ROOT / f"assets/arcade/library/{name}-preview.png").read_bytes())
|
||||
for key, path in child["cover"].items():
|
||||
if key in ("portrait", "landscape", "logo"):
|
||||
self.assertEqual((self.output / path).read_bytes(),
|
||||
(ROOT / f"assets/arcade/library/{name}-{key}.png").read_bytes())
|
||||
self.assertEqual((self.output / catalog["harness"]).read_bytes(), self.controller.read_bytes())
|
||||
|
||||
def test_changed_game_art_needs_fresh_library_copies(self):
|
||||
sources = self.root / "assets/arcade/library/sources.json"
|
||||
value = json.loads(sources.read_text())
|
||||
value["wurm-portrait"]["source_sha256"] = "0" * 64
|
||||
sources.write_text(json.dumps(value))
|
||||
with self.assertRaisesRegex(ValueError, "wurm-portrait art changed"):
|
||||
self.stage()
|
||||
|
||||
def test_every_library_cover_uses_a_bounded_thumbnail(self):
|
||||
catalog, packages = builder.stage(self.root, self.controller, self.controller_digest, self.output)
|
||||
children = {child['id']: child for child in catalog['children']}
|
||||
for package in packages:
|
||||
for app in package['apps']:
|
||||
if not app['enabled'] or not app['cover']:
|
||||
continue
|
||||
child = children[app['descriptor']['id']]
|
||||
for key in ('portrait', 'landscape', 'logo'):
|
||||
if key not in app['cover']:
|
||||
continue
|
||||
original = (app['source'] / app['cover'][key]).read_bytes()
|
||||
with self.subTest(app=child['id'], image=key):
|
||||
with Image.open(io.BytesIO(original)) as source:
|
||||
with Image.open(self.output / child['cover'][key]) as thumbnail:
|
||||
limit = 512 if key == 'logo' else 640
|
||||
self.assertLessEqual(max(thumbnail.size), limit)
|
||||
self.assertLessEqual(thumbnail.width, source.width)
|
||||
self.assertLessEqual(thumbnail.height, source.height)
|
||||
self.assertAlmostEqual(thumbnail.width / thumbnail.height,
|
||||
source.width / source.height, delta=0.01)
|
||||
self.assertIn(thumbnail.mode, ('RGB', 'RGBA'))
|
||||
|
||||
def test_editor_download_reuses_verified_shovey_assets(self):
|
||||
catalog = self.stage()
|
||||
children = {child['id']: child for child in catalog['children']}
|
||||
editor = children['arcade.shovey-editor']
|
||||
original = children['arcade.shovey']
|
||||
self.assertEqual(editor['dependencies'], [original['id']])
|
||||
self.assertTrue(editor['resources'])
|
||||
self.assertLess(editor['bytes'], original['bytes'])
|
||||
for link in editor['resources']:
|
||||
self.assertEqual(link['dependency'], original['id'])
|
||||
self.assertTrue(link['path'].startswith('assets/shovey-editor/'))
|
||||
self.assertTrue(link['source'].startswith('assets/shovey/'))
|
||||
|
||||
def test_changed_dependency_metadata_preserves_previous_stage(self):
|
||||
self.stage()
|
||||
previous = (self.output / 'assets/apps/catalog.json').read_bytes()
|
||||
path = self.root / 'build/games/shovey-editor-resources.json'
|
||||
shared = json.loads(path.read_text())
|
||||
shared['dependencies'] = []
|
||||
path.write_text(json.dumps(shared))
|
||||
with self.assertRaisesRegex(ValueError, 'dependencies differ'):
|
||||
self.stage()
|
||||
self.assertEqual((self.output / 'assets/apps/catalog.json').read_bytes(), previous)
|
||||
|
||||
def test_changed_controller_preserves_previous_stage(self):
|
||||
self.stage()
|
||||
previous = (self.output / "assets/apps/catalog.json").read_bytes()
|
||||
@@ -80,6 +148,79 @@ class CollectionTests(unittest.TestCase):
|
||||
self.stage()
|
||||
self.assertEqual((self.output / "assets/apps/catalog.json").read_bytes(), previous)
|
||||
|
||||
def test_arcade_downloads_preserve_catalog_and_standalone_payloads(self):
|
||||
catalog = self.stage()
|
||||
small = self.root / "small"
|
||||
games = self.root / "arcade.games"
|
||||
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
|
||||
art = self.root / "art"
|
||||
self.assertEqual((small / "assets/apps/catalog.json").read_bytes(),
|
||||
(self.output / "assets/apps/catalog.json").read_bytes())
|
||||
# The published launcher packs neither the host's controller nor art.
|
||||
self.assertFalse((small / catalog["harness"]).exists())
|
||||
self.assertTrue((self.output / catalog["harness"]).is_file(), "Standalone players keep the controller")
|
||||
for child in catalog["children"]:
|
||||
full = self.output / child["bundle"]
|
||||
self.assertTrue(full.is_file(), "Standalone players retain the game")
|
||||
self.assertFalse((small / child["bundle"]).exists())
|
||||
self.assertEqual((games / (child["sha256"] + ".zx")).read_bytes(), full.read_bytes())
|
||||
pictures = [child["preview"]] + [child["cover"][key] for key in child["cover"].keys() & {"portrait", "landscape", "logo"}]
|
||||
for relative in pictures:
|
||||
self.assertFalse((small / relative).exists())
|
||||
self.assertEqual((art / relative).read_bytes(), (self.output / relative).read_bytes())
|
||||
packed = sum(path.stat().st_size for path in small.rglob("*") if path.is_file())
|
||||
self.assertLess(packed, 1024 * 1024, "Arcade itself stays under one megabyte")
|
||||
|
||||
def test_art_bundle_is_published_and_named_by_the_catalog(self):
|
||||
catalog = self.stage()
|
||||
small = self.root / "small"
|
||||
games = self.root / "arcade.games"
|
||||
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
|
||||
art_bundle = self.root / "art.zx"
|
||||
art_bundle.write_bytes(b"ZX\0\0art fixture")
|
||||
art = builder.add_art(small, games, art_bundle)
|
||||
self.assertEqual(art, dict(sha256=builder.digest(art_bundle), bytes=art_bundle.stat().st_size))
|
||||
self.assertEqual((games / (art["sha256"] + ".zx")).read_bytes(), art_bundle.read_bytes())
|
||||
self.assertEqual(json.loads((small / "assets/apps/catalog.json").read_text())["art"], art)
|
||||
|
||||
def test_changed_download_preserves_previous_outputs(self):
|
||||
catalog = self.stage()
|
||||
small = self.root / "small"
|
||||
games = self.root / "arcade.games"
|
||||
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
|
||||
(self.output / catalog["children"][0]["bundle"]).write_bytes(b"changed game")
|
||||
with self.assertRaisesRegex(ValueError, "declared digest"):
|
||||
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
|
||||
self.assertTrue((small / "assets/apps/catalog.json").exists())
|
||||
self.assertTrue((games / (catalog["children"][0]["sha256"] + ".zx")).exists())
|
||||
|
||||
def test_download_archive_contains_exact_hash_named_games(self):
|
||||
catalog = self.stage()
|
||||
small = self.root / "small"
|
||||
games = self.root / "arcade.games"
|
||||
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
|
||||
archive = self.root / "arcade.games.tar"
|
||||
builder.archive_downloads(games, archive)
|
||||
with tarfile.open(archive) as content:
|
||||
self.assertEqual(set(content.getnames()), {child["sha256"] + ".zx" for child in catalog["children"]})
|
||||
for member in content:
|
||||
self.assertTrue(member.isfile())
|
||||
self.assertEqual(member.mtime, 0)
|
||||
self.assertEqual(content.extractfile(member).read(), (games / member.name).read_bytes())
|
||||
|
||||
def test_removed_download_does_not_leave_stale_payload(self):
|
||||
catalog = self.stage()
|
||||
small = self.root / "small"
|
||||
games = self.root / "arcade.games"
|
||||
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
|
||||
catalog["children"] = []
|
||||
# Build a fresh full stage as a real removed registration does.
|
||||
(self.root / "games.json").write_text(json.dumps({"packages": []}))
|
||||
catalog = self.stage()
|
||||
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
|
||||
self.assertEqual(list(games.iterdir()), [])
|
||||
self.assertFalse((small / "assets/arcade/games/shovey.zx").exists())
|
||||
|
||||
def test_invalid_controller_digest_rejected(self):
|
||||
with self.assertRaisesRegex(ValueError, "exact trusted"):
|
||||
builder.stage(self.root, self.controller, "", self.output)
|
||||
@@ -119,5 +260,42 @@ class CollectionTests(unittest.TestCase):
|
||||
self.assertFalse(self.output.exists())
|
||||
|
||||
|
||||
class LibraryThumbnailTests(unittest.TestCase):
|
||||
def test_cover_keeps_full_colour_at_thumbnail_resolution(self):
|
||||
source = Image.new('RGB', (900, 1200))
|
||||
source.putdata([(x % 256, y % 256, (x + y) % 256)
|
||||
for y in range(1200) for x in range(900)])
|
||||
data = io.BytesIO()
|
||||
source.save(data, 'PNG')
|
||||
with Image.open(io.BytesIO(artist.small_copy(data.getvalue(), 'portrait'))) as thumbnail:
|
||||
self.assertEqual(thumbnail.size, (480, 640))
|
||||
self.assertEqual(thumbnail.mode, 'RGB')
|
||||
self.assertIsNone(thumbnail.getcolors(256))
|
||||
|
||||
def test_logo_retains_transparency(self):
|
||||
source = Image.new('RGBA', (1200, 400), (45, 155, 90, 0))
|
||||
source.paste((200, 35, 100, 255), (100, 50, 1100, 350))
|
||||
data = io.BytesIO()
|
||||
source.save(data, 'PNG')
|
||||
with Image.open(io.BytesIO(artist.small_copy(data.getvalue(), 'logo'))) as thumbnail:
|
||||
self.assertEqual(thumbnail.size, (512, 171))
|
||||
self.assertEqual(thumbnail.mode, 'RGBA')
|
||||
self.assertEqual(thumbnail.getpixel((0, 0))[3], 0)
|
||||
self.assertEqual(thumbnail.getpixel((256, 85))[3], 255)
|
||||
|
||||
def test_small_covers_are_neither_enlarged_nor_reencoded(self):
|
||||
source = Image.new('RGB', (120, 180), (25, 50, 75))
|
||||
data = io.BytesIO()
|
||||
source.save(data, 'PNG')
|
||||
self.assertEqual(artist.small_copy(data.getvalue(), 'portrait'), data.getvalue())
|
||||
|
||||
def test_thin_logos_keep_at_least_one_pixel(self):
|
||||
source = Image.new('RGBA', (4096, 1), (25, 50, 75, 255))
|
||||
data = io.BytesIO()
|
||||
source.save(data, 'PNG')
|
||||
with Image.open(io.BytesIO(artist.small_copy(data.getvalue(), 'logo'))) as thumbnail:
|
||||
self.assertEqual(thumbnail.size, (512, 1))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -1,6 +1,9 @@
|
||||
"""Exercise the real shared library and both unchanged games privately."""
|
||||
import argparse
|
||||
import contextlib
|
||||
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||
import threading
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
@@ -14,6 +17,14 @@ from PIL import Image
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_library_question(driver):
|
||||
"""Keep the test's bundled levels when the library asks about updates."""
|
||||
driver.wait(label='Shovey', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
|
||||
|
||||
|
||||
def answer_level_updates(driver, timeout=20):
|
||||
"""An installed Shovey first asks once whether to download new levels;
|
||||
@@ -29,6 +40,41 @@ def answer_level_updates(driver, timeout=20):
|
||||
return
|
||||
time.sleep(0.05)
|
||||
|
||||
@contextlib.contextmanager
|
||||
def package_server(root):
|
||||
metadata = json.loads((root / 'build/arcade.json').read_text())
|
||||
by_digest = {entry['sha256']: entry for entry in metadata['children']}
|
||||
state = {'requests': [], 'corrupt_wurm': False, 'corrupt_shovey': False, 'offline': False}
|
||||
class Handler(BaseHTTPRequestHandler):
|
||||
def log_message(self, *args):
|
||||
pass
|
||||
def do_GET(self):
|
||||
digest = self.path.removeprefix('/api/v2/packages/inbe.arcade/').removesuffix('.zx')
|
||||
state['requests'].append(digest)
|
||||
# Every published file: the games and the library art.
|
||||
published = root / 'build/node-apps/arcade.games' / (digest + '.zx')
|
||||
if state['offline'] or not published.is_file():
|
||||
self.send_error(503)
|
||||
return
|
||||
entry = by_digest.get(digest, {})
|
||||
data = published.read_bytes()
|
||||
if (state['corrupt_wurm'] and entry.get('expected_id') == 'wurm') or (state['corrupt_shovey'] and entry.get('expected_id') == 'shovey'):
|
||||
data = data[:-1] + bytes([data[-1] ^ 1])
|
||||
self.send_response(200)
|
||||
self.send_header('Content-Length', str(len(data)))
|
||||
self.end_headers()
|
||||
self.wfile.write(data)
|
||||
server = HTTPServer(('127.0.0.1', 0), Handler)
|
||||
thread = threading.Thread(target=server.serve_forever, daemon=True)
|
||||
thread.start()
|
||||
try:
|
||||
yield 'http://127.0.0.1:' + str(server.server_port), state
|
||||
finally:
|
||||
server.shutdown()
|
||||
thread.join(timeout=5)
|
||||
server.server_close()
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--binary", type=Path, required=True)
|
||||
@@ -37,6 +83,13 @@ def main():
|
||||
assert int(os.environ["DISPLAY"].split(":")[-1].split(".")[0]) >= 400
|
||||
assert os.environ["YUE_DESKTOP_RECOVERY"] == "0"
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
entries = json.loads((root / 'build/arcade.json').read_text())['children']
|
||||
by_name = {entry['expected_id']: entry for entry in entries}
|
||||
# The library art downloads with Arcade; games only after consent.
|
||||
games = {entry['sha256'] for entry in entries}
|
||||
def size_text(size):
|
||||
return f"{(size * 10 + 500000) // 1000000 / 10:.1f} MB"
|
||||
sizes = {name: size_text(entry['bytes']) for name, entry in by_name.items()}
|
||||
output = root / "build/collection-ui-test"
|
||||
# The Classic heading counts its levels, which Shovey's level file lists.
|
||||
shovey = Path(subprocess.check_output([str(root / "scripts/ziran.sh"), "pkg", "path", "shovey"], text=True).strip())
|
||||
@@ -52,7 +105,8 @@ def main():
|
||||
with log_path.open("w") as log:
|
||||
child = subprocess.Popen([str(args.binary.resolve()), *arguments], cwd=root,
|
||||
env=os.environ | driver.environment() |
|
||||
{"ARCADE_DATA": str(profile), "LANG": "en_US.UTF-8"},
|
||||
{"ARCADE_DATA": str(profile), "ENTITY_DATA": str(profile / "entity"),
|
||||
"LANG": "en_US.UTF-8", "ARCADE_PACKAGE_ORIGIN": origin},
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
@@ -77,49 +131,114 @@ def main():
|
||||
assert int(subprocess.check_output(["xdotool", "getwindowpid", window], text=True, timeout=10)) == child.pid
|
||||
subprocess.run(["import", "-window", window, str(output / (name + ".png"))], check=True, timeout=10)
|
||||
|
||||
def cover(child, name):
|
||||
def grid(child, name, phone=False):
|
||||
driver.wait_idle(frames=20)
|
||||
assert not driver.find(label="Arcade", role="text"), "Library must have no heading"
|
||||
driver.wait(label="Arcade", role="text")
|
||||
assert not driver.find(label="Chess"), "Chess is temporarily disabled"
|
||||
images = driver.find(role="image", visible=True)
|
||||
screen = driver.tree()[0]
|
||||
assert max(n["visible_width"] * n["visible_height"] for n in images) >= screen["width"] * screen["height"] * .95
|
||||
assert not driver.find(label="Monkey"), "Monkey does not belong in Arcade"
|
||||
assert not driver.find(label="Next", role="button"), "Arcade must open on its app grid"
|
||||
classic_card = driver.wait(label="Shovey", role="button")
|
||||
editor_card = driver.wait(label="Shovey Editor", role="button")
|
||||
assert classic_card['y'] == editor_card['y'], "Apps must share a grid row"
|
||||
assert classic_card['x'] != editor_card['x']
|
||||
if phone:
|
||||
# Phones show small covers, two or three a row.
|
||||
wurm_card = driver.wait(label='Apfelwurm', role='button')
|
||||
assert wurm_card['y'] == classic_card['y'], 'A phone row holds all three covers'
|
||||
assert 100 <= classic_card['width'] < 200, 'Phone covers must be small cards'
|
||||
else:
|
||||
assert classic_card['width'] >= 200 and classic_card['height'] >= 350
|
||||
assert not driver.find(label='Play', role='button')
|
||||
assert not driver.find(label='Open', role='button')
|
||||
for label in ('Shovey', 'Shovey Editor', 'Apfelwurm'):
|
||||
assert not driver.find(label=label, role='text'), 'Title artwork must not repeat its name underneath'
|
||||
driver.wait(label='Apfelwurm', role='button', visible=False)
|
||||
smallest = (100, 140) if phone else (180, 200)
|
||||
covers = [node for node in driver.find(role='image', visible=True)
|
||||
if node['width'] >= smallest[0] and node['height'] >= smallest[1]]
|
||||
assert len(covers) >= 2, "Apps must use large title-screen artwork"
|
||||
capture(child, name)
|
||||
with Image.open(output / (name + ".png")) as image:
|
||||
assert len(image.convert("RGB").getcolors(1000000) or []) > 1000, "Cover artwork was not painted"
|
||||
assert len(image.convert("RGB").getcolors(1000000) or []) > 100, "App icons were not painted"
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix="profile-", dir=output) as temporary:
|
||||
def primary_download(label='Download'):
|
||||
driver.wait(label=label, role='button')
|
||||
actions = driver.find(label=label, role='button', visible=True)
|
||||
action = max(actions, key=lambda node: node['width'])
|
||||
driver.press(key=action['key'], role='button')
|
||||
|
||||
with package_server(root) as (origin, server), tempfile.TemporaryDirectory(prefix="profile-", dir=output) as temporary:
|
||||
profile = Path(temporary)
|
||||
dependency_profile = profile / 'editor-first'
|
||||
with application(dependency_profile, 'editor-dependencies') as child:
|
||||
answer_library_question(driver)
|
||||
driver.press(label='Shovey Editor', role='button')
|
||||
driver.wait(label='Shovey (required) · ' + sizes['shovey'], role='text')
|
||||
driver.wait(label='Shovey Editor · ' + sizes['shovey-editor'], role='text')
|
||||
total = size_text(by_name['shovey']['bytes'] + by_name['shovey-editor']['bytes'])
|
||||
driver.wait(label='Download size: ' + total, role='text')
|
||||
capture(child, 'editor-download-plan')
|
||||
driver.press(label='Cancel', role='button')
|
||||
assert not games & set(server['requests']), 'Dependency consent must precede every download'
|
||||
driver.press(label='Shovey Editor', role='button')
|
||||
server['corrupt_shovey'] = True
|
||||
primary_download()
|
||||
driver.wait(label='Try again', role='button', timeout=60)
|
||||
assert not driver.find(label='New level', role='text'), 'An editor must not open with a corrupt dependency'
|
||||
server['corrupt_shovey'] = False
|
||||
primary_download('Try again')
|
||||
driver.wait(label='New level', role='text', timeout=60)
|
||||
capture(child, 'editor-shared-assets')
|
||||
assert server['requests'].count(by_name['shovey']['sha256']) == 2
|
||||
assert server['requests'].count(by_name['shovey-editor']['sha256']) == 1
|
||||
assert len([digest for digest in server['requests'] if digest in games]) == 3, 'Retry must reuse the already downloaded editor'
|
||||
assert by_name['shovey-editor']['bytes'] < by_name['shovey']['bytes'], 'The editor must carry only its additions'
|
||||
server['requests'].clear()
|
||||
# Disabling an entry must leave a person's older Chess save untouched.
|
||||
chess = profile / "games/inbe.chess/records/computer"
|
||||
chess.parent.mkdir(parents=True)
|
||||
chess.write_bytes(b"existing private Chess save")
|
||||
# Classic keeps its progress in the shared account record.
|
||||
record = profile / "entity/records/local/game-progress/fd65a3d7ac3d5ceb2d4d96cc5224a740.json"
|
||||
# Active play stays on this device; account sync shares completions.
|
||||
record = profile / "games/arcade.shovey/records/local.campaign"
|
||||
|
||||
def progress(data):
|
||||
# Unlocks, completion marks and the board in play.
|
||||
value = json.loads(data)
|
||||
assert value["game"] == "shovey.classic"
|
||||
return value["unlocked"], value["completed"], value["state"][10:42]
|
||||
value = data.decode()
|
||||
assert value[:2] in ("C2", "C3", "C4", "C5")
|
||||
start = value.index("P")
|
||||
state = value[start:]
|
||||
assert state[:2] in ("P1", "P2", "P3")
|
||||
return value[:start], state[:32]
|
||||
|
||||
with application(profile, "carousel") as child:
|
||||
driver.wait(label="Play", role="button")
|
||||
cover(child, "classic-portrait")
|
||||
driver.press(label="Next", role="button")
|
||||
driver.wait(label="Open", role="button")
|
||||
driver.wait(label="Editor", role="text")
|
||||
cover(child, "editor-portrait")
|
||||
driver.press(label="Previous", role="button")
|
||||
driver.key("right")
|
||||
driver.wait(label="Open", role="button")
|
||||
driver.key("left")
|
||||
driver.wait(label="Play", role="button")
|
||||
driver.drag((350, 400), (100, 400))
|
||||
driver.wait(label="Open", role="button")
|
||||
driver.pointer(240, 400, wheel=1)
|
||||
driver.wait(label="Play", role="button")
|
||||
driver.key("enter")
|
||||
with application(profile, "grid") as child:
|
||||
driver.wait(label="Shovey", role="button")
|
||||
answer_library_question(driver)
|
||||
window = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)], text=True).splitlines()[0]
|
||||
subprocess.run(['xdotool', 'windowsize', window, '480', '820'], check=True)
|
||||
grid(child, "apps-portrait", phone=True)
|
||||
assert not games & set(server['requests']), "Covers must not predownload games"
|
||||
# Covers show only the art; the download dialog names the size.
|
||||
cover_sizes = dict(sizes, **{'shovey-editor': size_text(by_name['shovey']['bytes'] + by_name['shovey-editor']['bytes'])})
|
||||
for text in cover_sizes.values():
|
||||
assert not driver.find(label=text, role='text'), "Covers must not show download sizes"
|
||||
driver.press(label='Profile', role='button')
|
||||
driver.wait(label='Account', role='text')
|
||||
capture(child, 'arcade-profile')
|
||||
driver.press(label='Leaderboard', role='button')
|
||||
driver.wait(label='Leaderboard', role='text')
|
||||
driver.wait(label='No leaderboard data yet.', role='text')
|
||||
capture(child, 'leaderboard-empty')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Account', role='text')
|
||||
driver.press(label="Back", role="button")
|
||||
driver.wait(label='Shovey', role='button')
|
||||
assert not [path for path in (profile / 'resources/downloads').glob('*.zx') if path.stem in games]
|
||||
driver.press(label="Shovey", role="button")
|
||||
driver.wait(label='Cancel', role='button')
|
||||
driver.press(label='Cancel', role='button')
|
||||
assert not games & set(server['requests']), 'Cancel must download nothing'
|
||||
driver.press(label="Shovey", role="button")
|
||||
primary_download()
|
||||
driver.wait(label=f"Level 1 / {classic}")
|
||||
answer_level_updates(driver)
|
||||
driver.wait(label="How do you want to move?", role="text")
|
||||
@@ -127,35 +246,96 @@ def main():
|
||||
driver.wait_gone(label="How do you want to move?", role="text")
|
||||
assert not driver.find(label="Play", role="button"), "Arcade must skip the second title screen"
|
||||
assert len(driver.find(label="Back", role="button", visible=True)) == 1
|
||||
driver.press(label="Levels", role="button")
|
||||
driver.wait(label="Continue", role="button")
|
||||
back = driver.wait(label="Back", role="button", visible=True)
|
||||
assert back['width'] >= 100 and back['height'] >= 48
|
||||
scroll = driver.wait(role="scroll")
|
||||
driver.pointer(*UiDriver.center(scroll), wheel=-200)
|
||||
driver.wait_idle(frames=20)
|
||||
assert driver.find(label="Back", role="button", visible=True)[0]['y'] == back['y']
|
||||
driver.press(label="Back", role="button")
|
||||
driver.wait(label="Restart", role="button")
|
||||
driver.press(label="Levels", role="button")
|
||||
driver.wait(label="Continue", role="button")
|
||||
driver.key("escape")
|
||||
driver.wait(label="Restart", role="button")
|
||||
capture(child, "classic-playing")
|
||||
for direction in ("left", "right", "up", "down"):
|
||||
driver.key(direction)
|
||||
driver.wait_idle(frames=5)
|
||||
saved = wait(lambda: record.read_bytes() if record.exists() else None, "Classic did not save")
|
||||
driver.press(label="Back", role="button")
|
||||
driver.wait(label="Play", role="button")
|
||||
driver.press(label="Next", role="button")
|
||||
driver.press(label="Open", role="button")
|
||||
driver.wait(label="Explore", role="button")
|
||||
driver.wait(label="Shovey Editor", role="button")
|
||||
driver.press(label='Profile', role='button')
|
||||
driver.press(label='Leaderboard', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
assert not driver.find(label='Apfelwurm', role='button'), 'An undownloaded game has a board'
|
||||
assert not driver.find(label='Shovey Editor', role='button'), 'An unranked editor has a board'
|
||||
capture(child, 'leaderboard-installed')
|
||||
state = profile / 'resources/state/arcade.shovey.json'
|
||||
state.parent.mkdir(parents=True, exist_ok=True)
|
||||
state.write_text('{"v":1,"installed":0,"favorite":0}')
|
||||
driver.wait(label='No leaderboard data yet.', role='text')
|
||||
assert not driver.find(label='Shovey', role='button'), 'A retained score kept an uninstalled board visible'
|
||||
state.write_text('{"v":1,"installed":1,"favorite":0}')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Account', role='text')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Shovey Editor', role='button')
|
||||
assert not driver.find(label=sizes["shovey"], role="text"), "Installed games must omit their download size"
|
||||
driver.press(label="Shovey Editor", role="button")
|
||||
driver.wait(label='Download size: ' + sizes['shovey-editor'], role='text')
|
||||
primary_download()
|
||||
assert server['requests'].count(by_name['shovey']['sha256']) == 1, 'Installed dependencies must not download again'
|
||||
# The editor opens on a blank board.
|
||||
driver.wait(label="New level", role="text")
|
||||
driver.press(label="Levels", role="button")
|
||||
driver.wait(label="Story levels", role="text")
|
||||
back = driver.wait(label="Back", role="button", visible=True)
|
||||
assert back['width'] >= 100 and back['height'] >= 48
|
||||
driver.press(label="Back", role="button")
|
||||
driver.wait(label="New level", role="text")
|
||||
capture(child, "editor-open")
|
||||
driver.key("escape")
|
||||
driver.wait(label="Open", role="button")
|
||||
# Keep the selected editor when returning from its screen.
|
||||
driver.wait(label="Editor", role="text")
|
||||
driver.wait(label="Shovey Editor", role="button")
|
||||
window = subprocess.check_output(["xdotool", "search", "--onlyvisible", "--pid", str(child.pid)], text=True).splitlines()[0]
|
||||
subprocess.run(["xdotool", "windowsize", window, "900", "540"], check=True)
|
||||
cover(child, "editor-landscape")
|
||||
driver.press(label="Previous", role="button")
|
||||
driver.wait(label="Play", role="button")
|
||||
cover(child, "classic-landscape")
|
||||
grid(child, "apps-landscape")
|
||||
server['corrupt_wurm'] = True
|
||||
driver.press(label='Apfelwurm', role='button')
|
||||
primary_download()
|
||||
driver.wait(label='Try again', role='button', timeout=60)
|
||||
assert not driver.find(label='Pause', role='button'), 'Unverified bytes must never run'
|
||||
server['corrupt_wurm'] = False
|
||||
primary_download('Try again')
|
||||
# The cover is its title: Apfelwurm asks once how to move, then plays.
|
||||
driver.wait(label='How do you want to move?', role='text', timeout=60)
|
||||
driver.press(label='Swipe', role='button')
|
||||
driver.wait(label='Pause', role='button')
|
||||
capture(child, 'wurm-playing')
|
||||
driver.press(label='Pause', role='button')
|
||||
driver.wait(label='Resume', role='button')
|
||||
driver.press(label='Back to title', role='button')
|
||||
driver.wait(label='Play', role='button')
|
||||
capture(child, 'wurm-title')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
for entry in json.loads((root / 'build/arcade.json').read_text())['children']:
|
||||
path = profile / 'resources/downloads' / (entry['sha256'] + '.zx')
|
||||
assert hashlib.sha256(path.read_bytes()).hexdigest() == entry['sha256']
|
||||
requested = list(server['requests'])
|
||||
server['offline'] = True
|
||||
with application(profile, "restore", "--app", "arcade.shovey"):
|
||||
driver.wait(label=f"Level 1 / {classic}")
|
||||
assert progress(record.read_bytes()) == progress(saved), "Classic progress changed on restart"
|
||||
assert server['requests'] == requested, 'A cached game must reopen offline without downloading'
|
||||
assert chess.read_bytes() == b"existing private Chess save"
|
||||
assert not (profile / "inbe.db").exists()
|
||||
refused = subprocess.run([str(args.binary.resolve()), "--app", "chess"], env=os.environ | {"ARCADE_DATA": str(profile)}, capture_output=True, timeout=10)
|
||||
assert refused.returncode == 1 and b"unknown game" in refused.stderr
|
||||
print("Arcade: full covers, arrows/swipe/wheel/Enter, direct play/editor, Back, rotation and retained saves passed")
|
||||
print("Arcade: rounded covers, download consent/cancel, digest failure/retry, Shovey and Apfelwurm play, Back, rotation, offline reopen and retained saves passed")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
"""Dependencies reuse only the exact prepared assets they declare."""
|
||||
import json
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / 'scripts'))
|
||||
from game_resources import dependency_order, share_resources
|
||||
from game_packages import declared_apps
|
||||
|
||||
|
||||
class GameResourcesTest(unittest.TestCase):
|
||||
def test_shared_code_requires_explicit_dependencies_and_valid_library_entries(self):
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
root = Path(directory)
|
||||
(root / 'games.json').write_text(json.dumps({'packages': []}))
|
||||
(root / 'catalog.json').write_text(json.dumps({'id': 'editor', 'name': 'editor'}))
|
||||
app = {'manifest': 'catalog.json', 'requires': ['game'], 'shared_code': True,
|
||||
'library_entries': ['engine:Step'], 'shared_records': ['local.campaign']}
|
||||
|
||||
def declare(value):
|
||||
(root / 'apps.json').write_text(json.dumps(
|
||||
{'id': 'fixture', 'title': 'Fixture', 'apps': [value]}))
|
||||
return declared_apps(root)[0]
|
||||
|
||||
parsed = declare(app)
|
||||
self.assertTrue(parsed['shared_code'])
|
||||
self.assertEqual(parsed['library_entries'], ['engine:Step'])
|
||||
self.assertEqual(parsed['shared_records'], ['local.campaign'])
|
||||
for invalid in [app | {'requires': []}, app | {'shared_code': 1},
|
||||
app | {'library_entries': ['engine:../Step']},
|
||||
app | {'library_entries': ['engine:Step', 'engine:Step']},
|
||||
app | {'shared_records': ['../campaign']},
|
||||
app | {'shared_records': ['local.campaign', 'local.campaign']},
|
||||
app | {'shared_records': ['..']}, app | {'shared_records': 'campaign'}]:
|
||||
with self.subTest(invalid=invalid), self.assertRaises(ValueError):
|
||||
declare(invalid)
|
||||
|
||||
def test_dependency_order_rejects_missing_disabled_and_cyclic_games(self):
|
||||
base = dict(enabled=True, descriptor=dict(id='game'), requires=[])
|
||||
editor = dict(enabled=True, descriptor=dict(id='editor'), requires=['game'])
|
||||
self.assertEqual(dependency_order([editor, base]), [base, editor])
|
||||
for candidates in [[editor], [editor, base | dict(enabled=False)],
|
||||
[editor, base | dict(requires=['editor'])]]:
|
||||
with self.assertRaises(ValueError):
|
||||
dependency_order(candidates)
|
||||
|
||||
def test_shared_bytes_are_removed_and_changed_bytes_remain_private(self):
|
||||
with tempfile.TemporaryDirectory() as folder:
|
||||
root = Path(folder)
|
||||
manifest = root / 'editor/catalog.json'
|
||||
manifest.parent.mkdir()
|
||||
manifest.with_name('shared_assets.json').write_text(json.dumps(dict(copies=[
|
||||
dict(**{'from': 'assets/game/sprites'}, to='classic/sprites'),
|
||||
dict(**{'from': 'assets/game/sound.ogg'}, to='classic/sound.ogg')])))
|
||||
base = dict(source=root, manifest=root / 'catalog.json',
|
||||
descriptor=dict(id='game', name='game', assets='assets/game'))
|
||||
editor = dict(source=root, manifest=manifest, requires=['game'],
|
||||
descriptor=dict(id='editor', name='editor'))
|
||||
original = root / 'staged/game/assets/game'
|
||||
(original / 'sprites').mkdir(parents=True)
|
||||
(original / 'sprites/player.png').write_bytes(b'original image')
|
||||
(original / 'sound.ogg').write_bytes(b'original audio')
|
||||
resources = root / 'editor-assets'
|
||||
(resources / 'classic/sprites').mkdir(parents=True)
|
||||
(resources / 'classic/sprites/player.png').write_bytes(b'original image')
|
||||
(resources / 'classic/sound.ogg').write_bytes(b'changed editor audio')
|
||||
result = share_resources(editor, [base, editor], resources, root / 'staged')
|
||||
self.assertEqual(result, dict(dependencies=['game'], resources=[dict(
|
||||
dependency='game', path='assets/editor/classic/sprites/', source='assets/game/sprites/')]))
|
||||
self.assertFalse((resources / 'classic/sprites').exists())
|
||||
self.assertEqual((resources / 'classic/sound.ogg').read_bytes(), b'changed editor audio')
|
||||
self.assertEqual((original / 'sprites/player.png').read_bytes(), b'original image')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main(verbosity=2)
|
||||
@@ -0,0 +1,109 @@
|
||||
"""Released games must bring new dependency edges without moving backwards."""
|
||||
import importlib.util
|
||||
import json
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tempfile
|
||||
import tomllib
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
spec = importlib.util.spec_from_file_location('follow_game_releases', ROOT / 'scripts/follow-game-releases.py')
|
||||
follower = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(follower)
|
||||
|
||||
|
||||
class GameUpdates(unittest.TestCase):
|
||||
def follow(self, comparison, same_commit=False, failure=False, wrong_commit=False):
|
||||
with tempfile.TemporaryDirectory(prefix='arcade-release-metadata-') as temporary:
|
||||
root = Path(temporary)
|
||||
(root / 'apps').mkdir()
|
||||
old = '1' * 40
|
||||
new = old if same_commit else '2' * 40
|
||||
lock = {'format': 1, 'toolchain': {'commit': 'compiler'},
|
||||
'root': {'dependencies': {'wurm': 'old', 'other': 'unrelated'}},
|
||||
'packages': [{'id': 'old', 'name': 'Apfelwurm',
|
||||
'url': 'https://github.com/waozixyz/wurm.git',
|
||||
'commit': old, 'ref': 'master', 'dependencies': {}},
|
||||
{'id': 'unrelated', 'commit': 'unchanged', 'dependencies': {}}]}
|
||||
original_lock = json.dumps(lock)
|
||||
(root / 'ziran.lock').write_text(original_lock)
|
||||
original_manifest = ('[package]\nname = "Arcade"\n\n[dependencies.wurm]\n'
|
||||
'git = "https://github.com/waozixyz/wurm.git"\nref = "master"\n\n'
|
||||
'[dependencies.other]\nref = "stable"\n')
|
||||
(root / 'ziran.toml').write_text(original_manifest)
|
||||
(root / 'games.json').write_text(json.dumps({'packages': ['wurm']}))
|
||||
# Release metadata may name a release before its source is pinned.
|
||||
(root / 'apps/versions.json').write_text(json.dumps({'node_apps': {'wurm': {'version': '0.2.0'}}}))
|
||||
|
||||
def gh(*arguments):
|
||||
if arguments[0] == 'release':
|
||||
return 'v0.2.0'
|
||||
return comparison if '/compare/' in arguments[1] else new
|
||||
|
||||
def resolve(command, **kwargs):
|
||||
self.assertEqual(command, ['verified-ziran', 'update', 'wurm'])
|
||||
self.assertEqual(kwargs, {'cwd': root, 'check': True})
|
||||
self.assertIn(f'ref = "{new}"', (root / 'ziran.toml').read_text())
|
||||
declaration = tomllib.loads((root / 'ziran.toml').read_text())
|
||||
self.assertEqual(declaration['dependencies']['wurm']['ref'], new)
|
||||
self.assertEqual(declaration['dependencies']['other']['ref'], 'stable')
|
||||
if failure:
|
||||
(root / 'ziran.lock').write_text('partial resolver output')
|
||||
raise subprocess.CalledProcessError(1, command)
|
||||
# A package-manager result with a newly introduced Entity import.
|
||||
# The follower must retain this graph verbatim, rather than
|
||||
# replacing the game id while preserving its old empty edges.
|
||||
lock['root']['dependencies']['wurm'] = 'released'
|
||||
lock['packages'][0].update(id='released', commit=old if wrong_commit else new,
|
||||
ref=new, dependencies={'entity': 'accounts'})
|
||||
lock['packages'].append({'id': 'accounts', 'commit': 'new-entity', 'dependencies': {}})
|
||||
(root / 'ziran.lock').write_text(json.dumps(lock))
|
||||
|
||||
updates = root / 'updates.json'
|
||||
with patch.object(follower, 'ROOT', root), patch.object(follower, 'UPDATES', updates), \
|
||||
patch.object(follower, 'gh', gh), patch.object(follower.subprocess, 'run', side_effect=resolve) as run:
|
||||
# Discovery must not require a compiler or modify either input.
|
||||
follower.record_updates(follower.released_updates())
|
||||
self.assertEqual((root / 'ziran.lock').read_text(), original_lock)
|
||||
self.assertEqual((root / 'ziran.toml').read_text(), original_manifest)
|
||||
run.assert_not_called()
|
||||
if failure or wrong_commit:
|
||||
with self.assertRaises((subprocess.CalledProcessError, ValueError)):
|
||||
follower.pin('verified-ziran')
|
||||
self.assertEqual((root / 'ziran.lock').read_text(), original_lock)
|
||||
self.assertEqual((root / 'ziran.toml').read_text(), original_manifest)
|
||||
else:
|
||||
follower.pin('verified-ziran')
|
||||
calls = run.call_count
|
||||
return json.loads((root / 'ziran.lock').read_text()), json.loads(updates.read_text()), old, new, calls
|
||||
|
||||
def test_new_release_refreshes_transitive_graph(self):
|
||||
lock, updates, old, new, calls = self.follow('ahead')
|
||||
self.assertEqual(lock['packages'][0]['commit'], new)
|
||||
self.assertEqual(lock['root']['dependencies']['wurm'], lock['packages'][0]['id'])
|
||||
self.assertEqual(lock['packages'][0]['dependencies'], {'entity': 'accounts'})
|
||||
self.assertEqual(lock['packages'][1]['commit'], 'unchanged')
|
||||
self.assertEqual(lock['toolchain']['commit'], 'compiler')
|
||||
self.assertEqual((len(updates), calls), (1, 1))
|
||||
|
||||
def test_same_source_is_unchanged(self):
|
||||
lock, updates, old, new, calls = self.follow('identical', same_commit=True)
|
||||
self.assertEqual(lock['packages'][0]['commit'], old)
|
||||
self.assertEqual((updates, calls), ([], 0))
|
||||
|
||||
def test_older_release_never_moves_the_pin_back(self):
|
||||
lock, updates, old, new, calls = self.follow('behind')
|
||||
self.assertEqual(lock['packages'][0]['commit'], old)
|
||||
self.assertEqual((updates, calls), ([], 0))
|
||||
|
||||
def test_failed_resolution_restores_manifest_and_lock(self):
|
||||
self.follow('ahead', failure=True)
|
||||
|
||||
def test_local_override_cannot_publish_wrong_game(self):
|
||||
self.follow('ahead', wrong_commit=True)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -4,6 +4,7 @@ import importlib.util
|
||||
import json
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import shutil
|
||||
import tempfile
|
||||
|
||||
from cryptography.hazmat.primitives import serialization
|
||||
@@ -69,4 +70,34 @@ with tempfile.TemporaryDirectory(prefix='arcade-publisher-') as directory:
|
||||
else:
|
||||
raise AssertionError('Publisher accepted a renamed signed game identity')
|
||||
|
||||
print('Arcade ledger: existing signature, node receiver, idempotence, rollback and stable identity passed')
|
||||
# Arcade's catalog and exact separately downloaded games use the same
|
||||
# signed release and existing node importer.
|
||||
node_bundles = work / 'node-apps'
|
||||
shutil.copytree(ROOT / 'build/node-apps', node_bundles)
|
||||
ledger.write_text(json.dumps(json.loads((ROOT / 'apps/versions.json').read_text())))
|
||||
arcade = publisher.stage_node_app(store, 'arcade', private, 'test-key', pins,
|
||||
ledger_path=ledger, bundle_directory=node_bundles)
|
||||
lookups = publisher.game_lookups(store / 'inbe.arcade', arcade)
|
||||
expected = {path.stem for path in (node_bundles / 'arcade.games').glob('*.zx')}
|
||||
assert {value['artifacts'][0]['sha256'] for value in lookups} == expected
|
||||
for lookup in lookups:
|
||||
key.public_key().verify(bytes.fromhex(lookup['signature']), publisher.signing_message(lookup))
|
||||
entries = {str(path.relative_to(store)): path.read_bytes()
|
||||
for path in (store / 'inbe.arcade').rglob('*')
|
||||
if path.is_file() and path.name not in ('.publish.lock', 'history-v2.json')}
|
||||
publisher.import_node_app(entries, remote, json.loads(pins.read_text()), 'inbe.arcade')
|
||||
for digest in expected:
|
||||
assert (remote / 'inbe.arcade' / (digest + '.zx')).read_bytes() == \
|
||||
(node_bundles / 'arcade.games' / (digest + '.zx')).read_bytes()
|
||||
changed = next((node_bundles / 'arcade.games').glob('*.zx'))
|
||||
changed.write_bytes(b'ZX\0\0changed bytes')
|
||||
try:
|
||||
publisher.stage_node_app(store, 'arcade', private, 'test-key', pins,
|
||||
ledger_path=ledger, bundle_directory=node_bundles)
|
||||
except ValueError:
|
||||
pass
|
||||
else:
|
||||
raise AssertionError('Publisher accepted game bytes that differ from their digest')
|
||||
assert json.loads((store / 'inbe.arcade/latest-v2.json').read_bytes()) == arcade
|
||||
|
||||
print('Arcade ledger: signatures, separate game downloads, node receiver, immutable bytes, rollback and stable identity passed')
|
||||
@@ -18,6 +18,18 @@ assert os.environ['YUE_DESKTOP_RECOVERY'] == '0'
|
||||
sys.path.insert(0, str(args.breeze / 'tests'))
|
||||
from ui_driver import UiDriver
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_cover_question(driver):
|
||||
"""Standalone Arcade and Shovey ask once on their covers whether games
|
||||
download new levels; tests keep the levels they ship with. The question
|
||||
shows in the covers' first frame."""
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
output = root / 'build/shared-progress-ui-test'
|
||||
output.mkdir(parents=True, exist_ok=True)
|
||||
@@ -42,6 +54,7 @@ with tempfile.TemporaryDirectory(prefix='shovey-account-progress-') as directory
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, output / (attempt + '.log'))
|
||||
try:
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
end = time.monotonic() + 30
|
||||
while True:
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
"""The real Shovey host opens its account provider from the hidden chest."""
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
from PIL import Image
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 400
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--binary', type=Path, required=True)
|
||||
parser.add_argument('--campaign', type=Path, required=True)
|
||||
args = parser.parse_args()
|
||||
sys.path.insert(0, str(ROOT.parent / 'breeze/tests'))
|
||||
from ui_driver import UiDriver
|
||||
output = ROOT / 'build/scratch/chest-account-ui'
|
||||
output.mkdir(parents=True, exist_ok=True)
|
||||
with tempfile.TemporaryDirectory(dir=output, prefix='profile-') as temporary:
|
||||
profile = Path(temporary)
|
||||
records = profile / 'games/arcade.shovey/records'
|
||||
records.mkdir(parents=True)
|
||||
records.joinpath('local.campaign').write_text(args.campaign.read_text().splitlines()[0])
|
||||
settings = profile / 'games/arcade.shovey-player/records'
|
||||
settings.mkdir(parents=True)
|
||||
settings.joinpath('controls').write_text('off')
|
||||
settings.joinpath('updates').write_text('off')
|
||||
driver = UiDriver(profile / 'driver')
|
||||
env = os.environ | driver.environment() | dict(ARCADE_DATA=str(profile), XDG_DATA_HOME=str(profile / 'xdg'),
|
||||
YUE_DESKTOP_RECOVERY='0', SDL_AUDIODRIVER='dummy', LANG='en_US.UTF-8')
|
||||
for key in ('WAYLAND_DISPLAY', 'DBUS_SESSION_BUS_ADDRESS', 'SESSION_MANAGER', 'GDK_DISPLAY'):
|
||||
env.pop(key, None)
|
||||
with (output / 'game.log').open('w') as log:
|
||||
child = subprocess.Popen([str(args.binary.resolve()), '--app', 'shovey'], env=env,
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, output / 'game.log')
|
||||
try:
|
||||
driver.wait(label='Restart', role='button', timeout=60)
|
||||
window = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)], text=True).split()[0]
|
||||
subprocess.run(['xdotool', 'windowsize', window, '1280', '800'], check=True)
|
||||
time.sleep(.5)
|
||||
driver.key('down')
|
||||
driver.wait(contains='29a', role='text')
|
||||
time.sleep(.75)
|
||||
driver.press(label='Levels', role='button')
|
||||
driver.wait(label='Continue', role='button')
|
||||
labels = [node.get('label', '') for node in driver.tree()]
|
||||
assert '29' in labels and '30' in labels
|
||||
assert not any(re.fullmatch(r'[0-9]+[ab]', label) for label in labels), labels
|
||||
driver.press(label='Continue', role='button')
|
||||
for key in ('down', 'right', *(['down'] * 6)):
|
||||
driver.key(key)
|
||||
time.sleep(.18)
|
||||
driver.wait(label='Connect account', role='button')
|
||||
campaign_before = records.joinpath('local.campaign').read_bytes()
|
||||
driver.press(label='Connect account', role='button')
|
||||
driver.wait(label='Create account', role='button')
|
||||
driver.wait(label='Import key', role='button')
|
||||
driver.wait(label='Link from another device', role='button')
|
||||
tree = driver.tree()
|
||||
assert not any('offline preview' in node.get('label', '').lower() for node in tree)
|
||||
subprocess.run(['import', '-window', window, str(output / 'account-modal.png')], check=True)
|
||||
with Image.open(output / 'account-modal.png') as image:
|
||||
pixel = image.convert('RGB').getpixel((372, 52))
|
||||
assert max(pixel) < 130, f'The account modal ignored the dark game palette: {pixel}'
|
||||
driver.key('down')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Connect account', role='button')
|
||||
driver.wait(contains='29a', role='text')
|
||||
assert records.joinpath('local.campaign').read_bytes() == campaign_before
|
||||
assert not list(profile.rglob('account.key')), 'This test created an account'
|
||||
(output / 'result.json').write_text(json.dumps(dict(actual_host=True, real_beach_entry=True,
|
||||
normal_account_provider=True, signin_actions=['Create account', 'Import key', 'Link from another device'],
|
||||
palette_sample=pixel, game_restored=True, account_created=False, live_claim=False), indent=2) + '\n')
|
||||
print('Actual Shovey: beach29 -> hidden29a -> chest -> normal themed account modal; sign-in choices present; game restored; no account created')
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.terminate()
|
||||
child.wait(timeout=15)
|
||||
@@ -16,6 +16,16 @@ import time
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_cover_question(driver):
|
||||
"""Standalone Arcade and Shovey ask once on their covers whether games
|
||||
download new levels; tests keep the levels they ship with. The question
|
||||
shows in the covers' first frame."""
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
|
||||
|
||||
|
||||
def answer_level_updates(driver, timeout=20):
|
||||
"""An installed Shovey first asks once whether to download new levels;
|
||||
@@ -80,6 +90,7 @@ def main():
|
||||
covers = driver.find(role='image', visible=True)
|
||||
assert any(image['y'] == 0 and image['height'] == height for image in covers), covers
|
||||
# Play opens the level directly, with the game's own header.
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
driver.wait(label='Restart', role='button')
|
||||
answer_level_updates(driver)
|
||||
@@ -112,6 +123,7 @@ def main():
|
||||
driver.wait(label='Restart', role='button')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Play', role='button')
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
driver.press(label='Levels', role='button')
|
||||
assert driver.wait(label='Back', role='button')['y'] < 16
|
||||
|
||||
@@ -12,6 +12,16 @@ import time
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_cover_question(driver):
|
||||
"""Standalone Arcade and Shovey ask once on their covers whether games
|
||||
download new levels; tests keep the levels they ship with. The question
|
||||
shows in the covers' first frame."""
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
|
||||
|
||||
|
||||
def answer_level_updates(driver, timeout=20):
|
||||
"""An installed Shovey first asks once whether to download new levels;
|
||||
@@ -60,6 +70,7 @@ def main():
|
||||
'LANG': 'en_US.UTF-8'}, stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
# The first level asks how to move before its bar takes input.
|
||||
answer_level_updates(driver)
|
||||
|
||||
@@ -15,6 +15,16 @@ import time
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_cover_question(driver):
|
||||
"""Standalone Arcade and Shovey ask once on their covers whether games
|
||||
download new levels; tests keep the levels they ship with. The question
|
||||
shows in the covers' first frame."""
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
|
||||
|
||||
|
||||
def answer_level_updates(driver, timeout=20):
|
||||
"""An installed Shovey first asks once whether to download new levels;
|
||||
@@ -87,11 +97,13 @@ def main():
|
||||
def campaign_progress(data):
|
||||
# Animals keep wandering while the window rotates. Campaign unlocks,
|
||||
# completion marks, player state and board identity must stay intact.
|
||||
record = json.loads(data)
|
||||
state = record['state']
|
||||
assert record['game'] == 'shovey.classic' and state[:2] == 'M1'
|
||||
assert state[10:12] in ('P1', 'P2', 'P3')
|
||||
return (record['unlocked'], record['completed'], state[10:42]), state[2:10]
|
||||
text = data.decode()
|
||||
assert text[:2] in ('C1', 'C2', 'C3', 'C4', 'C5')
|
||||
header, marks = (6, 1000) if text[:2] == 'C5' else (4, 175)
|
||||
state = text[header + marks:]
|
||||
assert state[:2] in ('P1', 'P2', 'P3')
|
||||
assert set(text[header:header + marks]) <= {'0', '1'}
|
||||
return (int(text[2:header], 16), text[header:header + marks], state[:32]), text[-8:]
|
||||
|
||||
def swipe_beside_board_until_saved(record):
|
||||
"""A swipe on the game screen moves Shovey even where the board is not."""
|
||||
@@ -196,9 +208,14 @@ def main():
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix='profile-', dir=output) as temporary:
|
||||
profile = Path(temporary)
|
||||
classic = profile / 'entity/records/local/game-progress/fd65a3d7ac3d5ceb2d4d96cc5224a740.json'
|
||||
classic = profile / 'games/arcade.shovey/records/local.campaign'
|
||||
account_progress = profile / 'entity/records/local/game-progress/fd65a3d7ac3d5ceb2d4d96cc5224a740.json'
|
||||
with application(profile, 'play') as child:
|
||||
assert not driver.find(label='Arcade', role='text')
|
||||
# The covers ask once whether games download new levels.
|
||||
driver.wait(label=LEVEL_UPDATES, role='text')
|
||||
answer_cover_question(driver)
|
||||
assert (profile / 'games/arcade.shovey-player/records/level-updates').read_text() == 'off'
|
||||
driver.press(label='Play', role='button')
|
||||
wait_level_one(driver, classic_levels)
|
||||
# The first level asks how to move: swipe and tap, or the pad.
|
||||
@@ -213,6 +230,9 @@ def main():
|
||||
resize_owned_window(child, 480, 820)
|
||||
driver.press(label='Swipe and tap')
|
||||
driver.wait_gone(label='How do you want to move?', role='text')
|
||||
driver.wait(label='Got it', role='button')
|
||||
driver.press(label='Got it', role='button')
|
||||
driver.wait_gone(label='Got it', role='button')
|
||||
assert (profile / 'games/arcade.shovey-player/records/controls').read_text() == 'off'
|
||||
assert not driver.find(label='Continue', role='button'), 'Classic must open straight on a level'
|
||||
assert driver.find(label='Shovey', role='image', visible=True), 'Shovey must be drawn as a picture'
|
||||
@@ -237,6 +257,7 @@ def main():
|
||||
assert not driver.find(label='Continue', role='button', visible=True)
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Play', role='button')
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
wait_level_one(driver, classic_levels)
|
||||
move_until_saved(classic)
|
||||
@@ -282,14 +303,20 @@ def main():
|
||||
assert all(abs(board[field] - swipe_boards[960, 600][field]) <= 1 for field in ('x', 'y', 'width', 'height'))
|
||||
swipe_in_visible_direction()
|
||||
classic_saved = campaign_progress(classic.read_bytes())
|
||||
assert not account_progress.exists(), 'Movement wrote an account progress record'
|
||||
assert len(driver.find(label='Back', role='button', visible=True)) == 1, 'Shovey needs one clear Back action'
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Play', role='button')
|
||||
driver.press(label='Next', role='button')
|
||||
driver.press(label='Open', role='button')
|
||||
driver.wait(label='Explore', role='button')
|
||||
driver.press(label='Classic', role='button')
|
||||
# The editor opens on a blank board; Levels loads a story level.
|
||||
driver.wait(label='New level', role='text')
|
||||
driver.press(label='Levels', role='button')
|
||||
driver.wait(label='Story levels', role='text')
|
||||
# Island stays unavailable in the editor until it is offered for sale.
|
||||
assert not driver.find(label='Island', role='button'), 'The editor offers Island'
|
||||
# Only levels Classic has unlocked can be a starting point.
|
||||
assert driver.find(label='Play Classic to unlock this level.', role='button'), 'Locked story levels can be edited'
|
||||
driver.press(label='1', role='button')
|
||||
driver.wait(label='Play', role='button')
|
||||
# Editing follows the device, including portrait screens whose
|
||||
@@ -299,6 +326,7 @@ def main():
|
||||
board = driver.find(key=200000, visible=True)[0]
|
||||
aspect = 5 / 3 if width > height else 3 / 5
|
||||
assert abs(board['width'] / board['height'] - aspect) < .01, ('editor paint orientation', width, height, board)
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
driver.wait(label='Testing', role='text')
|
||||
for width, height in ((390, 844), (844, 390), (480, 820)):
|
||||
@@ -307,23 +335,24 @@ def main():
|
||||
aspect = 5 / 3 if width > height else 3 / 5
|
||||
assert abs(board['width'] / board['height'] - aspect) < .01, ('editor play orientation', width, height, board)
|
||||
swipe_in_visible_direction(board_key=200000)
|
||||
# Island stays unavailable in the editor until it is offered for sale.
|
||||
# Escape returns from testing to the board, then leaves the editor.
|
||||
driver.key('escape')
|
||||
driver.wait(label='Levels', role='button')
|
||||
driver.key('escape')
|
||||
driver.key('escape')
|
||||
driver.wait(label='Classic', role='button')
|
||||
assert not driver.find(label='Island', role='button'), 'The editor offers Island'
|
||||
driver.wait(label='Open', role='button')
|
||||
with application(profile, 'restore'):
|
||||
driver.press(label='Next', role='button')
|
||||
driver.press(label='Open', role='button')
|
||||
driver.wait(label='Explore', role='button')
|
||||
# Escape returns to the editor's cover, which stays selected.
|
||||
driver.wait(label='New level', role='text')
|
||||
# Escape on the board returns to the editor's cover, which stays selected.
|
||||
driver.key('escape')
|
||||
driver.wait(label='Open', role='button')
|
||||
driver.press(label='Previous', role='button')
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
wait_level_one(driver, classic_levels)
|
||||
assert campaign_progress(classic.read_bytes()) == classic_saved
|
||||
assert not account_progress.exists(), 'Restart published an unfinished board'
|
||||
print('Standalone Shovey: portrait/landscape boards, swipe directions, the floating movement pad, rotation saves, covers and independent saves passed')
|
||||
|
||||
|
||||
|
||||
@@ -16,6 +16,16 @@ import time
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_cover_question(driver):
|
||||
"""Standalone Arcade and Shovey ask once on their covers whether games
|
||||
download new levels; tests keep the levels they ship with. The question
|
||||
shows in the covers' first frame."""
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
|
||||
|
||||
|
||||
def answer_level_updates(driver, timeout=20):
|
||||
"""An installed Shovey first asks once whether to download new levels;
|
||||
@@ -96,31 +106,41 @@ def main():
|
||||
time.sleep(.05)
|
||||
raise AssertionError(f'No move was saved to {record}')
|
||||
|
||||
classic = profile / 'games/arcade.shovey/records/campaign'
|
||||
# Movement and unfinished boards stay in the game's device-only record.
|
||||
classic = profile / 'games/arcade.shovey/records/local.campaign'
|
||||
account_progress = profile / 'entity/records/local/game-progress/fd65a3d7ac3d5ceb2d4d96cc5224a740.json'
|
||||
with application('play'):
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
wait_level_one(driver, classic_levels)
|
||||
# The first level asks how to move; until then it takes every key.
|
||||
answer_level_updates(driver)
|
||||
driver.press(label='Swipe and tap')
|
||||
driver.wait_gone(label='How do you want to move?', role='text')
|
||||
# Entering play saves the untouched campaign.
|
||||
driver.wait(label='Got it', role='button')
|
||||
driver.press(label='Got it', role='button')
|
||||
driver.wait_gone(label='Got it', role='button')
|
||||
# Entering play may save the untouched campaign; a fresh profile may
|
||||
# have no record until the first move.
|
||||
deadline = time.monotonic() + 10
|
||||
while not classic.exists() and time.monotonic() < deadline:
|
||||
time.sleep(.05)
|
||||
fresh = classic.read_bytes()
|
||||
fresh = classic.read_bytes() if classic.exists() else b''
|
||||
driver.press(label='Mute', role='button')
|
||||
driver.wait(label='Unmute', role='button')
|
||||
assert (profile / 'games/arcade.shovey-player/records/sound').read_text() == 'muted'
|
||||
driver.press(label='Unmute', role='button')
|
||||
driver.wait(label='Mute', role='button')
|
||||
assert move_until_saved(classic) != fresh
|
||||
assert not account_progress.exists(), 'Movement wrote an account progress record'
|
||||
driver.key('escape')
|
||||
driver.wait(label='Play', role='button')
|
||||
with application('restart'):
|
||||
answer_cover_question(driver)
|
||||
driver.press(label='Play', role='button')
|
||||
wait_level_one(driver, classic_levels)
|
||||
assert classic.read_bytes() != fresh, 'The move was lost across a restart'
|
||||
assert not account_progress.exists(), 'Restart published an unfinished board'
|
||||
print('Windows Shovey under Wine: title, Classic, sound, saved move, Back and restart passed')
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
"""Startup previews keep full colour and alpha while the originals stay intact."""
|
||||
import importlib.util
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
from PIL import Image
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
spec = importlib.util.spec_from_file_location('build_desktop', ROOT / 'scripts/build-desktop.py')
|
||||
desktop = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(desktop)
|
||||
|
||||
|
||||
class StartupArtTests(unittest.TestCase):
|
||||
def test_previews_keep_colour_alpha_and_aspect_ratio(self):
|
||||
work = ROOT / 'build/scratch'
|
||||
work.mkdir(parents=True, exist_ok=True)
|
||||
with tempfile.TemporaryDirectory(prefix='startup-art-', dir=work) as temporary:
|
||||
root = Path(temporary)
|
||||
source = root / 'source/assets/shovey'
|
||||
source.mkdir(parents=True)
|
||||
# A continuous RGB gradient needs more than a 256-colour palette.
|
||||
gradient = Image.new('RGB', (900, 1200))
|
||||
gradient.putdata([(x % 256, y % 256, (x + y) % 256)
|
||||
for y in range(1200) for x in range(900)])
|
||||
gradient.save(source / 'title-portrait.png')
|
||||
gradient.transpose(Image.Transpose.ROTATE_90).save(source / 'title-landscape.png')
|
||||
logo = gradient.resize((1200, 400)).convert('RGBA')
|
||||
alpha = Image.new('L', logo.size, 0)
|
||||
alpha.paste(255, (100, 50, 1100, 350))
|
||||
logo.putalpha(alpha)
|
||||
logo.save(source / 'logo.png')
|
||||
originals = {path.name: path.read_bytes() for path in source.iterdir()}
|
||||
output = root / 'output'
|
||||
desktop.stage_startup_art(root / 'source', output)
|
||||
expected = {'title-portrait.png': (480, 640),
|
||||
'title-landscape.png': (640, 480), 'logo.png': (512, 171)}
|
||||
for name, size in expected.items():
|
||||
with self.subTest(image=name), Image.open(output / 'startup/shovey' / name) as preview:
|
||||
self.assertEqual(preview.size, size)
|
||||
self.assertEqual(preview.mode, 'RGBA' if name == 'logo.png' else 'RGB')
|
||||
self.assertIsNone(preview.getcolors(256), 'Title previews must not use a 256-colour palette')
|
||||
if name == 'logo.png':
|
||||
self.assertEqual(preview.getpixel((0, 0))[3], 0)
|
||||
self.assertEqual(preview.getpixel((256, 85))[3], 255)
|
||||
self.assertEqual((source / name).read_bytes(), originals[name])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -0,0 +1,77 @@
|
||||
"""Verify coloured startup previews, original covers and title transitions privately."""
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
from PIL import Image
|
||||
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--binary', type=Path, required=True)
|
||||
parser.add_argument('--driver-source', type=Path, required=True)
|
||||
args = parser.parse_args()
|
||||
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 400
|
||||
assert os.environ['YUE_DESKTOP_RECOVERY'] == '0'
|
||||
sys.path.insert(0, str(args.driver_source / 'tests'))
|
||||
from ui_driver import UiDriver
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
output = root / 'build/scratch/title-progressive/ui'
|
||||
output.mkdir(parents=True, exist_ok=True)
|
||||
binary = args.binary.resolve()
|
||||
driver = UiDriver(output / 'driver')
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix='profile-', dir=output) as temporary:
|
||||
profile = Path(temporary)
|
||||
records = profile / 'games/arcade.shovey-player/records'
|
||||
records.mkdir(parents=True)
|
||||
(records / 'level-updates').write_text('off')
|
||||
log_path = output / 'game.log'
|
||||
with log_path.open('w') as log:
|
||||
child = subprocess.Popen([str(binary)], cwd=binary.parent,
|
||||
env=os.environ | driver.environment() |
|
||||
{'ARCADE_DATA': str(profile), 'ENTITY_DATA': str(profile / 'entity'),
|
||||
'LANG': 'en_US.UTF-8', 'SDL_AUDIODRIVER': 'dummy'},
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
startup = driver.tree()
|
||||
assert driver.last['frame'] <= 3, 'Preview must precede collection loading'
|
||||
images = [node for node in startup if node['kind'] == 'image' and node['label'] == 'Shovey']
|
||||
assert len(images) == 2, 'Startup must show the artwork and coloured logo together'
|
||||
for node in images:
|
||||
assert 'startup/shovey/' in node['detail']
|
||||
with Image.open(node['detail']) as picture:
|
||||
assert picture.mode in ('RGB', 'RGBA'), 'Startup art must retain full colour'
|
||||
assert max(picture.size) <= 640, 'Startup must use a small preview'
|
||||
(output / 'startup-tree.json').write_text(json.dumps(driver.last, indent=2) + '\n')
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
full = [node for node in driver.tree() if node['kind'] == 'image' and
|
||||
'arcade/covers/shovey-' in node.get('detail', '')]
|
||||
assert len(full) >= 2
|
||||
assert any(max(Image.open(node['detail']).size) >= 1200 for node in full), \
|
||||
'Ready cover must replace the preview with the original artwork'
|
||||
windows = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)], text=True).split()
|
||||
assert len(windows) == 1
|
||||
window = windows[0]
|
||||
assert subprocess.check_output(['xdotool', 'getwindowpid', window], text=True).strip() == str(child.pid)
|
||||
subprocess.run(['xdotool', 'windowmove', window, '0', '0'], check=True)
|
||||
subprocess.run(['import', '-window', window, str(output / 'classic-ready.png')], check=True)
|
||||
driver.key('right')
|
||||
subprocess.run(['import', '-window', window, str(output / 'logo-fading.png')], check=True)
|
||||
driver.wait(label='Editor', role='text')
|
||||
driver.wait(label='Open', role='button')
|
||||
driver.wait_idle(frames=5)
|
||||
subprocess.run(['import', '-window', window, str(output / 'editor-ready.png')], check=True)
|
||||
driver.key('left')
|
||||
driver.wait(label='Classic', role='text')
|
||||
driver.wait(label='Play', role='button')
|
||||
assert child.poll() is None
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.terminate()
|
||||
child.wait(timeout=10)
|
||||
print('Local title UI test: full-colour previews precede original covers; Classic/Editor transitions work')
|
||||
@@ -0,0 +1,85 @@
|
||||
// Open Arcade's browser edition in a private headless browser and require
|
||||
// its library to draw without a failed frame. Usage: node tests/web_site_test.mjs SITE_DIR
|
||||
import { spawn } from 'node:child_process';
|
||||
import { createServer } from 'node:http';
|
||||
import { access, mkdtemp, readFile, rm } from 'node:fs/promises';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { extname, join, normalize } from 'node:path';
|
||||
import { setTimeout as delay } from 'node:timers/promises';
|
||||
|
||||
const site = process.argv[2];
|
||||
if (!site) throw new Error('Usage: node tests/web_site_test.mjs SITE_DIR');
|
||||
const types = { '.html': 'text/html', '.js': 'text/javascript', '.wasm': 'application/wasm', '.json': 'application/json',
|
||||
'.svg': 'image/svg+xml', '.png': 'image/png', '.jpg': 'image/jpeg', '.webmanifest': 'application/manifest+json' };
|
||||
const server = createServer(async (request, response) => {
|
||||
const path = normalize(decodeURIComponent(new URL(request.url, 'http://x').pathname)).replace(/^\/+/, '') || 'index.html';
|
||||
try {
|
||||
const body = await readFile(join(site, path));
|
||||
response.writeHead(200, { 'Content-Type': types[extname(path)] || 'application/octet-stream' });
|
||||
response.end(body);
|
||||
} catch { response.writeHead(404); response.end(); }
|
||||
});
|
||||
await new Promise(resolve => server.listen(0, '127.0.0.1', resolve));
|
||||
const profile = await mkdtemp(join(process.env.TMPDIR || tmpdir(), 'arcade-web-'));
|
||||
const env = { ...process.env };
|
||||
for (const key of ['DISPLAY', 'WAYLAND_DISPLAY', 'XAUTHORITY', 'DBUS_SESSION_BUS_ADDRESS']) delete env[key];
|
||||
const browser = spawn(process.env.CHROMIUM || 'chromium', ['--headless=new', '--no-sandbox', '--use-gl=swiftshader',
|
||||
'--enable-unsafe-swiftshader', '--no-first-run', '--remote-debugging-port=0', `--user-data-dir=${profile}`, 'about:blank'],
|
||||
{ env, detached: true, stdio: 'ignore' });
|
||||
let socket, sequence = 0;
|
||||
const pending = new Map(), console_lines = [];
|
||||
const command = (method, params = {}) => new Promise((resolve, reject) => {
|
||||
const id = ++sequence; pending.set(id, { resolve, reject }); socket.send(JSON.stringify({ id, method, params }));
|
||||
});
|
||||
let failure = '';
|
||||
try {
|
||||
const started = Date.now();
|
||||
while (true) {
|
||||
try { await access(join(profile, 'DevToolsActivePort')); break; } catch {}
|
||||
if (Date.now() - started > 15000) throw new Error('the browser did not start');
|
||||
await delay(50);
|
||||
}
|
||||
const port = (await readFile(join(profile, 'DevToolsActivePort'), 'utf8')).split('\n')[0];
|
||||
const targets = await (await fetch(`http://127.0.0.1:${port}/json/list`)).json();
|
||||
socket = new WebSocket(targets.find(target => target.type === 'page').webSocketDebuggerUrl);
|
||||
await new Promise((resolve, reject) => { socket.onopen = resolve; socket.onerror = reject; });
|
||||
socket.onmessage = event => {
|
||||
const message = JSON.parse(event.data);
|
||||
if (message.method === 'Runtime.consoleAPICalled')
|
||||
console_lines.push(message.params.args.map(arg => arg.value ?? arg.description ?? '').join(' '));
|
||||
const request = pending.get(message.id);
|
||||
if (!request) return;
|
||||
pending.delete(message.id);
|
||||
message.error ? request.reject(new Error(JSON.stringify(message.error))) : request.resolve(message.result);
|
||||
};
|
||||
await command('Runtime.enable'); await command('Page.enable');
|
||||
await command('Emulation.setDeviceMetricsOverride', { width: 1280, height: 800, deviceScaleFactor: 1, mobile: false });
|
||||
await command('Page.navigate', { url: `http://127.0.0.1:${server.address().port}/` });
|
||||
let ready = false;
|
||||
const deadline = Date.now() + 60000;
|
||||
while (!ready && Date.now() < deadline) {
|
||||
// The page may still be loading; it answers once its status element exists.
|
||||
const state = await command('Runtime.evaluate', {
|
||||
expression: 'JSON.stringify({ready: !!(window.Module && Module.profileReady), error: !!document.getElementById("loading")?.classList.contains("error")})',
|
||||
returnByValue: true });
|
||||
if (typeof state.result?.value !== 'string') { await delay(250); continue; }
|
||||
const value = JSON.parse(state.result.value);
|
||||
if (value.error) { failure = 'the page reported that Arcade could not start'; break; }
|
||||
ready = value.ready;
|
||||
if (!ready) await delay(250);
|
||||
}
|
||||
if (!ready && !failure) failure = 'the library never became ready';
|
||||
// Let the library draw several frames before judging them.
|
||||
await delay(3000);
|
||||
const failed = console_lines.find(line => /frame failed|portable execution failed/.test(line));
|
||||
if (!failure && failed) failure = failed;
|
||||
} finally {
|
||||
try { process.kill(-browser.pid, 'SIGTERM'); } catch {}
|
||||
server.close();
|
||||
await rm(profile, { recursive: true, force: true }).catch(() => {});
|
||||
}
|
||||
if (failure) {
|
||||
console.error(console_lines.slice(-20).join('\n'));
|
||||
throw new Error(failure);
|
||||
}
|
||||
console.log('Arcade opened its library in the browser');
|
||||
@@ -19,71 +19,62 @@
|
||||
"url": "https://github.com/ziranlang/qrcode.git"
|
||||
},
|
||||
{
|
||||
"commit": "27c5c91c66f03ebb8841106defe62ac3476bd575",
|
||||
"dependencies": {"daochi_client": "pf64f159dfdbd5ee5", "kryon": "p681e883c26cf5268", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
|
||||
"id": "p14d320fce2d41ffd",
|
||||
"name": "Entity",
|
||||
"commit": "818916db6cbd42034bf869899feb75be8829d42e",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p3127065409ca96f6"},
|
||||
"id": "p15331309f570593d",
|
||||
"name": "Apps",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "d74348c2e288ac55740461f7e106cda365b4db4a",
|
||||
"dependencies": {"apps": "p15331309f570593d", "crypto": "pc23fbf455e97614d", "curl": "p1ca0e8d3c19dbe4c", "daochi_client": "p9972fcdd2d5ba999", "entity": "p52862c0351d05875", "game2d": "pf2f54c7603f6e861", "kryon": "p3127065409ca96f6", "kss": "p1b13dda539ed2a39", "liboqs": "pe6e1a0c8fb76aa60", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p9079dde0fcc11248", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "p1d80baafaa5fa18a"},
|
||||
"id": "p183b01bccc6424e7",
|
||||
"name": "Inbe",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/inbe.git"
|
||||
},
|
||||
{
|
||||
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
|
||||
"dependencies": {"kryon": "p681e883c26cf5268"},
|
||||
"dependencies": {"kryon": "p3127065409ca96f6"},
|
||||
"id": "p1b13dda539ed2a39",
|
||||
"name": "Kss",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kss.git"
|
||||
},
|
||||
{
|
||||
"commit": "bad2caaa84ef3eae61e40c99bf572d2b060d0ca2",
|
||||
"dependencies": {"kryon": "p681e883c26cf5268"},
|
||||
"id": "p20eb23d3e6db3711",
|
||||
"name": "Game2D",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/game2d.git"
|
||||
},
|
||||
{
|
||||
"commit": "1f3e5e763dbee918ae8f8c44b84bb98f8d0fa2d6",
|
||||
"commit": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
|
||||
"dependencies": {},
|
||||
"id": "p219661bf4be659ed",
|
||||
"name": "sqlite",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/sqlite/sqlite.git"
|
||||
},
|
||||
{
|
||||
"commit": "eb2b201a2da3bfc6fefd7ff2d8e476e3cb9e5bcb",
|
||||
"dependencies": {},
|
||||
"id": "p2f75403ea4cb61e4",
|
||||
"id": "p1ca0e8d3c19dbe4c",
|
||||
"name": "curl",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/curl/curl.git"
|
||||
},
|
||||
{
|
||||
"commit": "03c45f9461d9ace179ac6bf0f97fd5176a712f8c",
|
||||
"dependencies": {"crypto": "pf039d7a776333200", "kryon": "p681e883c26cf5268"},
|
||||
"id": "p3c73796b4662b488",
|
||||
"name": "Apps",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "2f6f1f57d7de742ef7ebc01159c2315acf793d5b",
|
||||
"dependencies": {"apps": "p3c73796b4662b488", "crypto": "pf039d7a776333200", "curl": "p2f75403ea4cb61e4", "daochi_client": "pf64f159dfdbd5ee5", "game2d": "p20eb23d3e6db3711", "kryon": "p681e883c26cf5268", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pe8e21a1f2b5ff52c", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "self": "pa4da0de6c3c44e61", "sqlite": "p219661bf4be659ed"},
|
||||
"id": "p48228a6b7e2920d3",
|
||||
"name": "Inbe",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/inbe.git"
|
||||
},
|
||||
{
|
||||
"commit": "e1f480f382d9443c4412133b55948374c77a5c21",
|
||||
"commit": "5d1ee888094efc63d1fb25a58af93478b103d441",
|
||||
"dependencies": {},
|
||||
"id": "p4b0a50b49959e674",
|
||||
"name": "liboqs",
|
||||
"ref": "main",
|
||||
"id": "p1d80baafaa5fa18a",
|
||||
"name": "sqlite",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/open-quantum-safe/liboqs.git"
|
||||
"url": "https://github.com/sqlite/sqlite.git"
|
||||
},
|
||||
{
|
||||
"commit": "0931212f92d5f1a3f8b1be80abab7a9695bda50e",
|
||||
"dependencies": {"raylib": "p5a77c9c35110e925"},
|
||||
"id": "p3127065409ca96f6",
|
||||
"name": "kryon",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "ca637d08b0d6b54ab6bb56bbfd9a25d7fb70f56c",
|
||||
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "p3127065409ca96f6", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
|
||||
"id": "p52862c0351d05875",
|
||||
"name": "Entity",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
@@ -94,17 +85,9 @@
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/raylib.git"
|
||||
},
|
||||
{
|
||||
"commit": "fed12f5029e025b585b4efc6234a67a4a90a5700",
|
||||
"dependencies": {"raylib": "p5a77c9c35110e925"},
|
||||
"id": "p681e883c26cf5268",
|
||||
"name": "kryon",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
|
||||
"dependencies": {"liboqs": "p4b0a50b49959e674"},
|
||||
"dependencies": {"liboqs": "pe6e1a0c8fb76aa60"},
|
||||
"id": "p7098ac9cd92f7e5f",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
@@ -120,20 +103,37 @@
|
||||
"url": "https://github.com/LoupVaillant/Monocypher.git"
|
||||
},
|
||||
{
|
||||
"commit": "357a71d1ee2c7c9526c2af18793ea8628c505034",
|
||||
"dependencies": {"daochi_client": "pf64f159dfdbd5ee5", "kryon": "p681e883c26cf5268", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
|
||||
"id": "pa4da0de6c3c44e61",
|
||||
"name": "Self",
|
||||
"commit": "8b81994303400255ddb0ee2da49044dbaef4397f",
|
||||
"dependencies": {},
|
||||
"id": "p9079dde0fcc11248",
|
||||
"name": "practices",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/self.git"
|
||||
"source": true,
|
||||
"url": "https://github.com/waozixyz/practices.git"
|
||||
},
|
||||
{
|
||||
"commit": "4f74d938be40d7f46784352797ba50214e36bd4a",
|
||||
"dependencies": {"apps": "p3c73796b4662b488", "entity": "p14d320fce2d41ffd", "kryon": "p681e883c26cf5268", "mingcute": "pe1027b9d16704793"},
|
||||
"id": "pc134c215e10d2f6a",
|
||||
"name": "Shovey",
|
||||
"commit": "25d9f649c43a8de44a5fea602d2835e33e6ca999",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
|
||||
"id": "p9972fcdd2d5ba999",
|
||||
"name": "DaochiClient",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
"url": "https://github.com/ziranlang/daochi-client.git"
|
||||
},
|
||||
{
|
||||
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
|
||||
"dependencies": {"kryon": "p3127065409ca96f6"},
|
||||
"id": "pab5377a2950368a2",
|
||||
"name": "plot",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/plot.git"
|
||||
},
|
||||
{
|
||||
"commit": "944826f70779a6b6cd53f6b06a75b36f4d8a2558",
|
||||
"dependencies": {},
|
||||
"id": "pc23fbf455e97614d",
|
||||
"name": "crypto",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/crypto.git"
|
||||
},
|
||||
{
|
||||
"commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0",
|
||||
@@ -144,36 +144,45 @@
|
||||
"url": "https://github.com/kryonlabs/mingcute.git"
|
||||
},
|
||||
{
|
||||
"commit": "4b0e25bd2df86b54a8f5af3db48282bd41daab1a",
|
||||
"dependencies": {"kryon": "p681e883c26cf5268"},
|
||||
"id": "pe8e21a1f2b5ff52c",
|
||||
"name": "plot",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/plot.git"
|
||||
},
|
||||
{
|
||||
"commit": "08bbad051379813d0fd1c3bb7bb6814f3491da75",
|
||||
"commit": "c98cd0cff056978d63b18fad8d013d58bacd9b5d",
|
||||
"dependencies": {},
|
||||
"id": "pf039d7a776333200",
|
||||
"name": "crypto",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/crypto.git"
|
||||
"id": "pe6e1a0c8fb76aa60",
|
||||
"name": "liboqs",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/open-quantum-safe/liboqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "9f824c4eac1ce04df727f8e7a08d2992a8ca45a4",
|
||||
"dependencies": {"oqs": "p7098ac9cd92f7e5f"},
|
||||
"id": "pf64f159dfdbd5ee5",
|
||||
"name": "DaochiClient",
|
||||
"commit": "3cead1f21720258c0acffa84c8625579d68c3a9e",
|
||||
"dependencies": {"apps": "p15331309f570593d", "entity": "p52862c0351d05875", "kryon": "p3127065409ca96f6", "mingcute": "pe1027b9d16704793"},
|
||||
"id": "peafb3c123b12e97a",
|
||||
"name": "Apfelwurm",
|
||||
"ref": "3cead1f21720258c0acffa84c8625579d68c3a9e",
|
||||
"url": "https://github.com/waozixyz/wurm.git"
|
||||
},
|
||||
{
|
||||
"commit": "cee04692f3461dcb098833472f071c434980debb",
|
||||
"dependencies": {"kryon": "p3127065409ca96f6"},
|
||||
"id": "pf2f54c7603f6e861",
|
||||
"name": "Game2D",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/daochi-client.git"
|
||||
"url": "https://github.com/kryonlabs/game2d.git"
|
||||
},
|
||||
{
|
||||
"commit": "82bf0955674c8afc6f6b85df86e59c46cfbe43ee",
|
||||
"dependencies": {"apps": "p15331309f570593d", "entity": "p52862c0351d05875", "kryon": "p3127065409ca96f6", "mingcute": "pe1027b9d16704793"},
|
||||
"id": "pf5159eeee3cf1d66",
|
||||
"name": "Shovey",
|
||||
"ref": "82bf0955674c8afc6f6b85df86e59c46cfbe43ee",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"dependencies": {"apps": "p3c73796b4662b488", "entity": "p14d320fce2d41ffd", "inbe": "p48228a6b7e2920d3", "kryon": "p681e883c26cf5268", "mingcute": "pe1027b9d16704793", "shovey": "pc134c215e10d2f6a"},
|
||||
"dependencies": {"apps": "p15331309f570593d", "entity": "p52862c0351d05875", "inbe": "p183b01bccc6424e7", "kryon": "p3127065409ca96f6", "mingcute": "pe1027b9d16704793", "shovey": "pf5159eeee3cf1d66", "wurm": "peafb3c123b12e97a"},
|
||||
"name": "Arcade"
|
||||
},
|
||||
"toolchain": {
|
||||
"commit": "3b54282ca1d0b494130263e28ce5df6fb7ff75e2",
|
||||
"commit": "5efa24f818485cf265bdd5c066a4e2150175ac0e",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/ziran.git"
|
||||
}
|
||||
|
||||
@@ -36,10 +36,10 @@ git = "https://github.com/waozixyz/apps.git"
|
||||
# Use the shared controller reviewed with the supported collection host.
|
||||
ref = "master"
|
||||
|
||||
# Shovey's editions and editor are games Arcade installs by default.
|
||||
# Shovey's editions and editor are available as separate downloads.
|
||||
[dependencies.shovey]
|
||||
git = "https://github.com/waozixyz/shovey.git"
|
||||
ref = "master"
|
||||
ref = "82bf0955674c8afc6f6b85df86e59c46cfbe43ee"
|
||||
|
||||
# Compatibility tooling runs Inner Breeze's host checks; releases check its publisher pins.
|
||||
[dependencies.inbe]
|
||||
@@ -53,3 +53,7 @@ ref = "master"
|
||||
[dependencies.mingcute]
|
||||
git = "https://github.com/kryonlabs/mingcute.git"
|
||||
ref = "master"
|
||||
|
||||
[dependencies.wurm]
|
||||
git = "https://github.com/waozixyz/wurm.git"
|
||||
ref = "3cead1f21720258c0acffa84c8625579d68c3a9e"
|
||||