Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91f79bdda7 | ||
|
|
4192ea74c9 | ||
|
|
720f352f8e | ||
|
|
068f3312ff | ||
|
|
cb84f07471 | ||
|
|
8d8d909913 | ||
|
|
83a75f938f | ||
|
|
178791301f | ||
|
|
5268b9513b | ||
|
|
7b65b8a0ea |
No files matched your search
@@ -1,5 +1,5 @@
|
||||
name: Export locked games
|
||||
description: Build portable exports in their owning repositories before Arcade imports them.
|
||||
description: Prepare game-owned exports, downloading Wurm's compiled release unchanged.
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
@@ -34,10 +34,16 @@ runs:
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
from pathlib import Path
|
||||
for name in ('shovey', 'wurm', 'choano'):
|
||||
for name in ('shovey', 'choano'):
|
||||
(Path('..') / name / 'ziran.local.toml').write_text('[overrides]\nziran = "../../ziranlang/ziran"\n')
|
||||
Path('ziran.local.toml').write_text('[overrides]\nziran = "../../ziranlang/ziran"\nshovey = "../shovey"\nwurm = "../wurm"\nchoano = "../choano"\n')
|
||||
PY
|
||||
(cd ../shovey && make levels landscape && python3 scripts/player.py collection --web)
|
||||
(cd ../wurm && python3 tools/build_portable.py)
|
||||
(cd ../choano && make portable)
|
||||
- name: Download the pinned Wurm portable release
|
||||
shell: bash
|
||||
working-directory: waozixyz/arcade
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
WURM_COMMIT: ${{ steps.games.outputs.wurm }}
|
||||
run: python3 scripts/fetch-wurm-export.py --source ../wurm --commit "$WURM_COMMIT"
|
||||
@@ -36,6 +36,7 @@ jobs:
|
||||
run: |
|
||||
python3 tests/game_updates_test.py
|
||||
python3 tests/catalog_versions_test.py
|
||||
python3 tests/wurm_export_test.py
|
||||
- name: Find newer game releases
|
||||
id: updates
|
||||
env:
|
||||
@@ -62,7 +63,7 @@ jobs:
|
||||
- name: Install build dependencies
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
working-directory: .
|
||||
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential python3-pil python3-cryptography
|
||||
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential python3-pil python3-numpy python3-cryptography
|
||||
- name: Build the locked toolchain and pin game dependencies
|
||||
id: pin
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
@@ -99,10 +100,12 @@ jobs:
|
||||
python3 scripts/follow-game-releases.py art
|
||||
echo "version=$(cat catalog/VERSION)" >> "$GITHUB_OUTPUT"
|
||||
head -12 catalog/CHANGELOG.md
|
||||
- name: Prepare game-owned exports
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
uses: ./waozixyz/arcade/.github/actions/game-exports
|
||||
- name: Build and check the collection
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
run: |
|
||||
make -C ../shovey levels landscape
|
||||
make collection
|
||||
python3 tests/collection_test.py
|
||||
python3 tests/publisher_test.py
|
||||
|
||||
@@ -3,7 +3,9 @@ name: Website
|
||||
# https://arcade.waozi.xyz runs Arcade in the browser: the latest published
|
||||
# arcade.zx, the same one Inner Breeze downloads, with Arcade's own host
|
||||
# compiled to WebAssembly. Every push to master and every Arcade release,
|
||||
# manual or automatic, rebuilds and publishes it.
|
||||
# manual or automatic, rebuilds and publishes it. The host builds from the
|
||||
# source and toolchain that release was tagged at: master may already lock a
|
||||
# newer program format the published arcade.zx does not carry yet.
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
@@ -34,6 +36,18 @@ jobs:
|
||||
path: waozixyz/arcade
|
||||
ref: master
|
||||
fetch-depth: 0
|
||||
- name: Check out the published Arcade's source
|
||||
id: published
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
tag=$(gh release list --repo waozixyz/arcade --limit 50 --json tagName,isDraft \
|
||||
-q '[.[] | select(.isDraft | not) | .tagName | select(startswith("node-arcade-"))][0]')
|
||||
test -n "$tag"
|
||||
git fetch --force origin "refs/tags/$tag:refs/tags/$tag"
|
||||
git checkout --detach "refs/tags/$tag"
|
||||
echo "tag=$tag" >> "$GITHUB_OUTPUT"
|
||||
echo "version=${tag#node-arcade-}" >> "$GITHUB_OUTPUT"
|
||||
- name: Read the locked toolchain
|
||||
id: toolchain
|
||||
run: |
|
||||
@@ -60,18 +74,13 @@ jobs:
|
||||
printf '[overrides]\nziran = "../../ziranlang/ziran"\n' > ziran.local.toml
|
||||
../../ziranlang/ziran/build/bin/ziran fetch
|
||||
- name: Download the published Arcade
|
||||
id: published
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
tag=$(gh release list --repo waozixyz/arcade --limit 50 --json tagName,isDraft \
|
||||
-q '[.[] | select(.isDraft | not) | .tagName | select(startswith("node-arcade-"))][0]')
|
||||
test -n "$tag"
|
||||
mkdir -p build/published
|
||||
# Its game archive holds the library art the site serves itself.
|
||||
gh release download "$tag" --repo waozixyz/arcade --pattern arcade.zx \
|
||||
--pattern arcade.games.tar --dir build/published
|
||||
echo "version=${tag#node-arcade-}" >> "$GITHUB_OUTPUT"
|
||||
gh release download '${{ steps.published.outputs.tag }}' --repo waozixyz/arcade \
|
||||
--pattern arcade.zx --pattern arcade.games.tar --dir build/published
|
||||
- name: Build the browser edition
|
||||
run: |
|
||||
python3 tests/web_library_art_test.py
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
# Arcade changelog
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
- Runs games built for the latest Inner Breeze.
|
||||
|
||||
## 0.7.120
|
||||
|
||||
- Library covers show their original painted artwork again.
|
||||
- Landscape uses the same cover carousel as portrait, on a scenic background.
|
||||
- Clicking or tapping a cover beside the centre selects it; the centre cover starts the game.
|
||||
- Missing games download on their cover with a progress bar while you keep browsing.
|
||||
- Updating Arcade no longer brings back an older saved library with the wrong artwork.
|
||||
- Shovey opens its proper title with the daily chest, profile and swipeable covers.
|
||||
|
||||
## 0.7.119
|
||||
|
||||
- Browse an artwork-led console shelf in portrait or landscape, with painted profile and Dew controls.
|
||||
|
||||
@@ -38,6 +38,7 @@ collection: games $(APPS_BUNDLE)
|
||||
.PHONY: game-artifacts-test
|
||||
game-artifacts-test:
|
||||
python3 tests/game_artifacts_test.py
|
||||
python3 tests/wurm_export_test.py
|
||||
|
||||
collection-test:
|
||||
python3 tests/collection_test.py
|
||||
@@ -67,6 +68,7 @@ run: all
|
||||
test: all
|
||||
python3 tests/catalog_versions_test.py
|
||||
python3 tests/game_artifacts_test.py
|
||||
python3 tests/wurm_export_test.py
|
||||
python3 tests/game_host_compatibility_test.py
|
||||
python3 tests/collection_notifications_test.py
|
||||
python3 tests/game_module_paths_test.py
|
||||
|
||||
@@ -23,7 +23,7 @@ their whole board; locked puzzles keep their lock until earned.
|
||||
|
||||
The published Arcade carries only its catalog, well under one megabyte. Its host supplies the shared Apps controller (Inner Breeze its own, standalone Arcade the `apps.zx` installed beside it), and the covers and previews download once as one separate art bundle. Library previews stay at 256 pixels. Real gameplay screenshots supply landscape heroes up to 1600 pixels and portrait covers up to 1080 pixels on the longest side, encoded as quality-80 WebP. The complete separate art bundle has a 2 MiB budget for the current games. Full-size originals stay in their game repositories. The verified art bundle stays cached across restarts and is replaced when its content changes. The art lives in `assets/arcade/library/` (`python3 scripts/library-art.py` refreshes it when a game's art changes; the build stops until it does). Inner Breeze needs host interface 35 for it. Each game
|
||||
downloads when opened, with its existing identity and saved progress. This
|
||||
catalog requires Inner Breeze host API 41. Downloaded games work offline;
|
||||
catalog requires Inner Breeze host API 43. Downloaded games work offline;
|
||||
standalone Shovey keeps its complete offline collection. Apfelwurm comes from
|
||||
its own package, with the same game identity and private editor records.
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
73a743af3f79fd5fc07df0ffd494c7d9bedf03f271401e2a0fe695cdc3c74eb7
|
||||
72fcca7bdf1264c77e44a45c30d6d5dd32c137b5ab985d4335941aef4c0ab148
|
||||
@@ -1,5 +1,9 @@
|
||||
# Chess changelog
|
||||
|
||||
## [1.2.2] - 2026-11-07
|
||||
|
||||
- Runs in the latest Inner Breeze and Arcade.
|
||||
|
||||
## [1.2.1] - 2026-10-29
|
||||
|
||||
- Runs in Inner Breeze 2.1.61's smaller app format.
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"kind": "game",
|
||||
"contract_version": 1,
|
||||
"module_api": 2,
|
||||
"host_api": 41,
|
||||
"host_api": 43,
|
||||
"save_schema": 1,
|
||||
"harnesses": ["arcade", "inbe"],
|
||||
"entry": "chess:Main",
|
||||
|
||||
@@ -1,56 +1,56 @@
|
||||
{
|
||||
"host_api": 42,
|
||||
"oldest_host_api": 41,
|
||||
"host_api": 43,
|
||||
"oldest_host_api": 43,
|
||||
"module_api": 2,
|
||||
"node_apps": {
|
||||
"chess": {
|
||||
"id": "inbe.chess",
|
||||
"title": "Chess",
|
||||
"version": "1.2.1",
|
||||
"sequence": 6,
|
||||
"host_api": 41
|
||||
"version": "1.2.2",
|
||||
"sequence": 7,
|
||||
"host_api": 43
|
||||
},
|
||||
"choano": {
|
||||
"id": "xyz.waozi.choano",
|
||||
"title": "Choano",
|
||||
"version": "0.1.8",
|
||||
"sequence": 3,
|
||||
"host_api": 41
|
||||
"version": "0.1.9",
|
||||
"sequence": 4,
|
||||
"host_api": 43
|
||||
},
|
||||
"shovey": {
|
||||
"id": "arcade.shovey",
|
||||
"title": "Shovey",
|
||||
"version": "0.6.164",
|
||||
"sequence": 171,
|
||||
"host_api": 42
|
||||
"version": "0.6.169",
|
||||
"sequence": 175,
|
||||
"host_api": 43
|
||||
},
|
||||
"shovey-editor": {
|
||||
"id": "arcade.shovey-editor",
|
||||
"title": "Shovey Editor",
|
||||
"version": "0.2.147",
|
||||
"sequence": 149,
|
||||
"host_api": 41
|
||||
"version": "0.2.149",
|
||||
"sequence": 151,
|
||||
"host_api": 43
|
||||
},
|
||||
"arcade": {
|
||||
"id": "inbe.arcade",
|
||||
"title": "Arcade",
|
||||
"version": "0.7.119",
|
||||
"sequence": 198,
|
||||
"host_api": 41
|
||||
"version": "0.7.124",
|
||||
"sequence": 203,
|
||||
"host_api": 43
|
||||
},
|
||||
"wurm": {
|
||||
"id": "xyz.waozi.wurm",
|
||||
"title": "Apfelwurm",
|
||||
"version": "0.2.29",
|
||||
"sequence": 24,
|
||||
"host_api": 42
|
||||
"version": "0.2.33",
|
||||
"sequence": 27,
|
||||
"host_api": 43
|
||||
},
|
||||
"wurm-editor": {
|
||||
"id": "xyz.waozi.wurm-editor",
|
||||
"title": "Apfelwurm Editor",
|
||||
"version": "0.1.1",
|
||||
"sequence": 2,
|
||||
"host_api": 41
|
||||
"version": "0.1.2",
|
||||
"sequence": 3,
|
||||
"host_api": 43
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 203 KiB After Width: | Height: | Size: 109 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 126 KiB After Width: | Height: | Size: 78 KiB |
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"choano-landscape": {
|
||||
"source_sha256": "ffe548ab4b32d1eb45c539cca77c211fdf38edb19c7e3adafb8e6791d3d57a2a",
|
||||
"crop_top": 76
|
||||
"source_sha256": "1ca6e31c1062a7cca41bace4cf1bb221291988aea4a1dd61271899c2f5f28307",
|
||||
"crop_top": 0
|
||||
},
|
||||
"choano-portrait": {
|
||||
"source_sha256": "225b44f3de4f201220a581850c87ed402e9659d5d56a70fcbdd5bf7d24a65329",
|
||||
"crop_top": 76
|
||||
"source_sha256": "47b07722c474a67ee4a06b7644a3aff211503674391e363c17eb06a34ce60d6c",
|
||||
"crop_top": 0
|
||||
},
|
||||
"choano-preview": {
|
||||
"source_sha256": "1ca6e31c1062a7cca41bace4cf1bb221291988aea4a1dd61271899c2f5f28307",
|
||||
@@ -36,12 +36,16 @@
|
||||
"crop_top": 0
|
||||
},
|
||||
"shovey-landscape": {
|
||||
"source_sha256": "50ff90599ea10dda9f85f4f6b3a6b6bf10a37bc8ef77c2533fa2a476e0ce2e06",
|
||||
"crop_top": 52
|
||||
"source_sha256": "40c01eb8300e4c5db52b2d75373e17cdaf7f68140c33c0a225613fc174660747",
|
||||
"crop_top": 0
|
||||
},
|
||||
"shovey-logo": {
|
||||
"source_sha256": "e47781aa3328f68077589f95d813e9c2e6fff10ebd62a9d003773bb2c2f7a092",
|
||||
"crop_top": 0
|
||||
},
|
||||
"shovey-portrait": {
|
||||
"source_sha256": "c34a5b87b23471abe9d7cd472b8b353a88d7c50adc840da988cfd1af49a0446a",
|
||||
"crop_top": 52
|
||||
"source_sha256": "ddcbf989eab5971157d8cdc73494ed03660bb4c7a7679543248f45be260777e3",
|
||||
"crop_top": 0
|
||||
},
|
||||
"shovey-preview": {
|
||||
"source_sha256": "96db251f36835c76cd03cd0104a6e1b5096e4c442d410960457edcd8e2377a38",
|
||||
@@ -60,12 +64,12 @@
|
||||
"crop_top": 0
|
||||
},
|
||||
"wurm-landscape": {
|
||||
"source_sha256": "7bcfd9b73064886560bf2e72fb310fe6c69c345aa400f50b8f5b533384c33085",
|
||||
"crop_top": 72
|
||||
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30",
|
||||
"crop_top": 0
|
||||
},
|
||||
"wurm-portrait": {
|
||||
"source_sha256": "e6f814fca6d53ab8c4112a3b98809815c7a019d66bb793a55d5725ebdeecf0cf",
|
||||
"crop_top": 72
|
||||
"source_sha256": "e8962c969f554567d598eb0b54db5836f7f1ed7462619463040c6cc2887a5a47",
|
||||
"crop_top": 0
|
||||
},
|
||||
"wurm-preview": {
|
||||
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30",
|
||||
|
||||
|
Before Width: | Height: | Size: 131 KiB After Width: | Height: | Size: 236 KiB |
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 217 KiB |
@@ -1,5 +1,41 @@
|
||||
# Arcade catalog changelog
|
||||
|
||||
## 0.7.124
|
||||
|
||||
- Apfelwurm 0.2.33: Runs in the latest Inner Breeze and Arcade.
|
||||
- Choano 0.1.9: Runs in the latest Inner Breeze and Arcade.
|
||||
- Choano 0.1.9: Supply genuine gameplay screenshots and a self-identifying portable bundle for Arcade’s console library.
|
||||
- Choano 0.1.9: Keep the Profile title bar clear of the camera and status bar on Android.
|
||||
- Choano 0.1.9: Let the Android app reach the network, so online sign-in, backups and Friends work.
|
||||
- Choano 0.1.9: Keep the account key out of Android system backups, which have no passphrase.
|
||||
- Choano 0.1.9: Use Entity's reviewed account authorization and the shared game navigation modules.
|
||||
- Choano 0.1.9: On Android, Continue as can use the account from another signed-in Waozi app, once you approve it there.
|
||||
- Choano 0.1.9: Continue as no longer crashes the other app when it was closed.
|
||||
|
||||
## 0.7.123
|
||||
|
||||
- Arcade and its games run in the latest Inner Breeze: Shovey 0.6.169, Apfelwurm 0.2.33 and Choano 0.1.9.
|
||||
|
||||
## 0.7.122
|
||||
|
||||
- Shovey 0.6.168: Play the first 30 Island levels with working downloads and a working Play button.
|
||||
- Shovey 0.6.168: Start Classic or Island levels of your own from the Editor.
|
||||
- Shovey 0.6.168: Follow Shovey in his map circle, with more water along the landscape coast and a secret on the beach.
|
||||
|
||||
## 0.7.121
|
||||
|
||||
- Keep Apfelwurm and its editor available when the game library updates.
|
||||
- Shovey 0.6.167: The level result, book, shop and item texts show again in every language.
|
||||
- Shovey 0.6.167: Your account's progress arrives quietly and quickly; the map no longer says it is loading.
|
||||
- Apfelwurm 0.2.32: Include Apfelwurm and its editor in Arcade's automatic game updates.
|
||||
|
||||
## 0.7.120
|
||||
|
||||
- Show the original painted covers for Shovey, Apfelwurm and Choano.
|
||||
- Browse covers on a scenic background in portrait and landscape; a side cover selects, the centre cover plays.
|
||||
- Download missing games on their cover with a progress bar while browsing.
|
||||
- Shovey opens its proper title with the daily chest, profile and swipeable covers.
|
||||
|
||||
## 0.7.119
|
||||
|
||||
- Browse the new console shelf, open games from their artwork and return Home with progress saved.
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.7.119
|
||||
0.7.124
|
||||
@@ -6,37 +6,5 @@
|
||||
],
|
||||
"artwork": {
|
||||
"wurm": "wurm_art"
|
||||
},
|
||||
"screenshots": {
|
||||
"shovey": {
|
||||
"portrait": {
|
||||
"path": "packaging/library/portrait.png",
|
||||
"crop_top": 52
|
||||
},
|
||||
"landscape": {
|
||||
"path": "packaging/library/landscape.png",
|
||||
"crop_top": 52
|
||||
}
|
||||
},
|
||||
"wurm": {
|
||||
"portrait": {
|
||||
"path": "packaging/library/portrait.png",
|
||||
"crop_top": 72
|
||||
},
|
||||
"landscape": {
|
||||
"path": "packaging/library/landscape.png",
|
||||
"crop_top": 72
|
||||
}
|
||||
},
|
||||
"choano": {
|
||||
"portrait": {
|
||||
"path": "packaging/library/portrait.png",
|
||||
"crop_top": 76
|
||||
},
|
||||
"landscape": {
|
||||
"path": "packaging/library/landscape.png",
|
||||
"crop_top": 76
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
197
|
||||
198
|
||||
@@ -0,0 +1,61 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Download Wurm's portable exports from its exact pinned release; compile nothing."""
|
||||
import argparse
|
||||
import json
|
||||
from pathlib import Path
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import tarfile
|
||||
import tempfile
|
||||
|
||||
EXPORT_FILES = {name + suffix for name in ('wurm', 'wurm-editor')
|
||||
for suffix in ('.zx', '-resources.json', '-catalog.json', '-preview.png')}
|
||||
MAX_FILE_BYTES = 64 * 1024 * 1024
|
||||
|
||||
|
||||
def unpack(archive, source):
|
||||
build = source / 'build'
|
||||
build.mkdir(parents=True, exist_ok=True)
|
||||
with tarfile.open(archive, 'r:gz') as bundle:
|
||||
members = bundle.getmembers()
|
||||
if len(members) != len(EXPORT_FILES) or {m.name for m in members} != EXPORT_FILES:
|
||||
raise ValueError('Wurm release must contain exactly its eight portable exports')
|
||||
if any(not m.isfile() or not 0 < m.size <= MAX_FILE_BYTES for m in members):
|
||||
raise ValueError('Wurm release contains an invalid portable export')
|
||||
# Validate the complete member list before any output is replaced.
|
||||
with tempfile.TemporaryDirectory(prefix='portable-export-', dir=build) as directory:
|
||||
stage = Path(directory)
|
||||
for member in members:
|
||||
with bundle.extractfile(member) as incoming, (stage / member.name).open('wb') as output:
|
||||
shutil.copyfileobj(incoming, output)
|
||||
exports = build / 'games'
|
||||
exports.mkdir(exist_ok=True)
|
||||
for name in EXPORT_FILES:
|
||||
(stage / name).replace(exports / name)
|
||||
|
||||
|
||||
def fetch(source, commit):
|
||||
version = json.loads((source / 'version.json').read_text())['version']
|
||||
if not re.fullmatch(r'\d+\.\d+\.\d+', version) or not re.fullmatch(r'[0-9a-f]{40}', commit):
|
||||
raise ValueError('Invalid Wurm release identity')
|
||||
tag = 'v' + version
|
||||
released = subprocess.check_output(['gh', 'api', f'repos/waozixyz/wurm/commits/{tag}',
|
||||
'--jq', '.sha'], text=True).strip()
|
||||
if released != commit:
|
||||
raise ValueError('Wurm release does not match Arcade\'s pinned commit')
|
||||
downloads = source / 'build/downloads'
|
||||
downloads.mkdir(parents=True, exist_ok=True)
|
||||
name = f'wurm-portable-{tag}.tar.gz'
|
||||
subprocess.run(['gh', 'release', 'download', tag, '--repo', 'waozixyz/wurm',
|
||||
'--pattern', name, '--dir', str(downloads), '--clobber'], check=True)
|
||||
unpack(downloads / name, source)
|
||||
print(f'Imported Wurm {version} portable release at {commit}')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--source', type=Path, required=True)
|
||||
parser.add_argument('--commit', required=True)
|
||||
args = parser.parse_args()
|
||||
fetch(args.source.resolve(), args.commit)
|
||||
@@ -150,8 +150,10 @@ def art():
|
||||
library = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(library)
|
||||
recorded = json.loads((library.LIBRARY / 'sources.json').read_text())
|
||||
current = {f'{name}-{key}': hashlib.sha256(data).hexdigest() for name, key, data in library.art()}
|
||||
if {copy: item['source_sha256'] for copy, item in recorded.items()} != current:
|
||||
# A changed source or cover crop rewrites the library copies.
|
||||
current = {f'{name}-{key}': (hashlib.sha256(data).hexdigest(), crop_top)
|
||||
for name, key, data, crop_top in library.art()}
|
||||
if {copy: (item['source_sha256'], item.get('crop_top', 0)) for copy, item in recorded.items()} != current:
|
||||
library.main()
|
||||
|
||||
|
||||
|
||||
@@ -39,9 +39,6 @@ def declared_packages(root, ziran=None, lock_flags=()):
|
||||
not isinstance(alias, str) or not re.fullmatch(r'[A-Za-z_][A-Za-z0-9_]*', alias)
|
||||
for name, alias in artwork.items()):
|
||||
raise ValueError('Invalid artwork package')
|
||||
screenshots = registration.get('screenshots', {})
|
||||
if not isinstance(screenshots, dict) or any(name not in names[1:] for name in screenshots):
|
||||
raise ValueError('Invalid gameplay screenshot package')
|
||||
packages = []
|
||||
for name in names:
|
||||
source = package_root(root, name, ziran, lock_flags)
|
||||
@@ -85,20 +82,6 @@ def declared_packages(root, ziran=None, lock_flags=()):
|
||||
cover = dict(cover)
|
||||
if internal:
|
||||
cover['action'] = 'internal'
|
||||
elif name in screenshots:
|
||||
views = screenshots[name]
|
||||
if not isinstance(views, dict) or set(views) != {'portrait', 'landscape'}:
|
||||
raise ValueError('Gameplay screenshots need portrait and landscape')
|
||||
cover = {}
|
||||
for key, value in views.items():
|
||||
if isinstance(value, dict):
|
||||
if set(value) != {'path', 'crop_top'} or type(value['crop_top']) is not int or not 0 <= value['crop_top'] <= 256:
|
||||
raise ValueError('Invalid gameplay screenshot crop')
|
||||
cover_crops[key] = value['crop_top']
|
||||
value = value['path']
|
||||
cover[key] = str(relative_path(value))
|
||||
cover['action'] = 'open'
|
||||
app_art_source = source
|
||||
apps.append(dict(package=name, source=source, art_source=app_art_source, manifest=manifest,
|
||||
descriptor=descriptor,
|
||||
cover=cover, cover_crops=cover_crops, internal=internal, requires=requires, shared_code=shared_code,
|
||||
|
||||
@@ -16,12 +16,12 @@ import io
|
||||
import json
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
from PIL import Image
|
||||
from PIL import Image, ImageOps
|
||||
from game_packages import declared_packages
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
LIBRARY = ROOT / 'assets/arcade/library'
|
||||
# Previews stay at 256 px. Separately fetched gameplay heroes are sized for
|
||||
# Previews stay at 256 px. Separately fetched painted covers are sized for
|
||||
# full-screen landscape and focused portrait art, with a total 2 MiB budget.
|
||||
PREVIEW_LONGEST = 256
|
||||
LANDSCAPE_LONGEST = 1600
|
||||
@@ -51,11 +51,14 @@ def small_copy(data, key, crop_top=0):
|
||||
raise ValueError('Gameplay crop exceeds screenshot')
|
||||
if crop_top:
|
||||
image = image.crop((0, crop_top, image.width, image.height))
|
||||
# The shared library cards are 2:3. Keep the top of taller paintings,
|
||||
# where their title lives, rather than letting the card centre-crop it.
|
||||
# Originals remain untouched; this framing belongs to the thumbnail.
|
||||
if key == 'portrait' and image.height > image.width * 1.5:
|
||||
image = image.crop((0, 0, image.width, round(image.width * 1.5)))
|
||||
# Frame the original painted artwork for the shelf, never gameplay captures.
|
||||
# Portrait paintings keep their title near the top; landscape art is centred.
|
||||
if key in ('portrait', 'landscape'):
|
||||
ratio = 2 / 3 if key == 'portrait' else 16 / 9
|
||||
width = min(image.width, round(image.height * ratio))
|
||||
height = min(image.height, round(image.width / ratio))
|
||||
image = ImageOps.fit(image, (width, height), Image.Resampling.LANCZOS,
|
||||
centering=(0.5, 0.0 if key == 'portrait' else 0.5))
|
||||
longest = {'preview': PREVIEW_LONGEST, 'logo': LOGO_LONGEST, 'landscape': LANDSCAPE_LONGEST, 'portrait': PORTRAIT_LONGEST}.get(key, COVER_LONGEST)
|
||||
scale = min(1.0, longest / max(image.size))
|
||||
alpha = ('A' in image.getbands() or 'transparency' in image.info) and key not in ('landscape', 'portrait')
|
||||
|
||||
@@ -63,7 +63,6 @@ Codec :: #import "apps/node_codec";
|
||||
#import "apps/connection"
|
||||
#import "apps/remote_catalog"
|
||||
Labels :: #import "apps/words";
|
||||
HostBarTheme :: #import "shovey/shovey_theme";
|
||||
#import "profile_palette"
|
||||
#import "apps/game_hud"
|
||||
collection_dew_text: [32]u8;
|
||||
@@ -642,7 +641,7 @@ CollectionOpenBytes :: (bytes: string, metadata: string, data: string) -> bool {
|
||||
selected_digest := TextUntilNul(digest[:])
|
||||
if !packed {
|
||||
if !CollectionNodeOpen(metadata, data, bytes, selected_digest, TextUntilNul(harness[:]), language) { return false }
|
||||
if collection_node.ready {
|
||||
if collection_node_remote {
|
||||
selected = collection_node.bytes
|
||||
selected_digest = TextUntilNul(collection_node.release.artifacts[0].sha256[:])
|
||||
}
|
||||
@@ -766,7 +765,8 @@ CollectionOpenGame :: (id: string) -> bool {
|
||||
if root == null || !root.collection { Report("Arcade: no collection is open to start "); Report(id); Report("\n"); return false }
|
||||
entry := AppCatalogAt(*root.catalog, AppCatalogFind(*root.catalog, id))
|
||||
plan: AppInstallPlan
|
||||
if entry != null && AppHostInstallPlan(*collection_host, root, entry, *plan) && plan.count > 0 {
|
||||
if entry != null && (TextUntilNul(entry.cover.action[:]) == "title" ||
|
||||
(AppHostInstallPlan(*collection_host, root, entry, *plan) && plan.count > 0)) {
|
||||
unused CopyCString(id, collection_host.platform.presentation.download_id[:])
|
||||
collection_host.platform.presentation.download_request += 1
|
||||
return true
|
||||
@@ -895,7 +895,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
if top > 0 {
|
||||
Box(session, BoxProps.{.key = cast(u64)49190,
|
||||
.bounds = Rectangle.{viewport.x, viewport.y, viewport.width, cast(float32)top},
|
||||
.fill = ColorFromPacked(ifx entity_shovey then HostBarTheme.ShoveyPalette().background else AppCoversPalette().background)})
|
||||
.fill = ColorFromPacked(ifx entity_shovey then ShoveyHostPalette().background else AppCoversPalette().background)})
|
||||
}
|
||||
now := cast(float64)MonotonicMilliseconds() / 1000.0
|
||||
runtime.app.session = session
|
||||
@@ -1045,6 +1045,35 @@ collection_seed: string;
|
||||
collection_seed_digest: [65]u8;
|
||||
collection_harness_digest: [65]u8;
|
||||
collection_node_locale: [16]u8;
|
||||
// The version of the catalog this build carries; "" when its receipt has none.
|
||||
collection_seed_version: [32]u8;
|
||||
|
||||
CollectionVersionPart :: (text: string, at: *s64) -> s64 {
|
||||
value: s64
|
||||
while at.* < text.count && text[at.*] >= cast(u8)48 && text[at.*] <= cast(u8)57 {
|
||||
value = value * 10 + cast(s64)(text[at.*] - cast(u8)48)
|
||||
at.* += 1
|
||||
}
|
||||
if at.* < text.count && text[at.*] == cast(u8)46 { at.* += 1 }
|
||||
return value
|
||||
}
|
||||
|
||||
// A saved or fetched signed release replaces the catalog this build carries
|
||||
// only when it is newer. An older or equal cached release never hides the
|
||||
// build's own library, artwork or games.
|
||||
CollectionNodeNewer :: () -> bool {
|
||||
current := TextUntilNul(collection_seed_version[:])
|
||||
if current == "" { return true }
|
||||
candidate := TextUntilNul(collection_node.release.version[:])
|
||||
left: s64
|
||||
right: s64
|
||||
for part: cast(s32)0..2 {
|
||||
a := CollectionVersionPart(candidate, *left)
|
||||
b := CollectionVersionPart(current, *right)
|
||||
if a != b { return a > b }
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
collection_signature :: #system_library "c";
|
||||
CollectionCheckSignature :: (signature: *u8, public_key: *u8, message: *u8,
|
||||
@@ -1073,13 +1102,15 @@ CollectionNodeOpen :: (metadata: string, data: string, seed: string,
|
||||
unused CopyCString(digest, collection_seed_digest[:])
|
||||
unused CopyCString(harness, collection_harness_digest[:])
|
||||
unused CopyCString(locale, collection_node_locale[:])
|
||||
collection_seed_version[0] = 0
|
||||
unused AppsReadText(metadata, 0, "version", collection_seed_version[:])
|
||||
collection_package_origin = AppRemoteCopy(TextUntilNul(collection_node.source.origin[:]))
|
||||
collection_node_choice = AppConnectionRead(*collection_node_files, collection_package_origin)
|
||||
collection_node_notice = collection_node_choice == APP_CONNECTION_UNDECIDED
|
||||
allowed := collection_node_choice == APP_CONNECTION_ALLOWED
|
||||
CollectionDownloadsAllow(allowed)
|
||||
AppRemoteCatalogAllow(*collection_node, allowed)
|
||||
collection_node_remote = collection_node.ready
|
||||
collection_node_remote = collection_node.ready && CollectionNodeNewer()
|
||||
if allowed { unused AppRemoteCatalogRefresh(*collection_node) }
|
||||
return true
|
||||
}
|
||||
@@ -1138,6 +1169,16 @@ CollectionNodePump :: () {
|
||||
AppRemoteCatalogPump(*collection_node)
|
||||
// A newer library applies on its own once the background fetch finishes.
|
||||
if (collection_node_apply || collection_node_choice == APP_CONNECTION_ALLOWED) && collection_node.stage == 0 {
|
||||
// The build's own newer catalog stays; the fetched release stays cached.
|
||||
if collection_node.changed && !collection_node_remote && !CollectionNodeNewer() {
|
||||
AppRemoteCatalogCollect(*collection_node)
|
||||
}
|
||||
// A newer signed release can reuse cached verified bytes without a
|
||||
// download, so the catalog does not report it as changed.
|
||||
if !collection_node.changed && !collection_node_remote && collection_node.ready &&
|
||||
!collection_node.failed && CollectionNodeNewer() {
|
||||
collection_node.changed = true
|
||||
}
|
||||
if collection_node.changed && !CollectionNodeActivate() { return }
|
||||
collection_node_apply = false
|
||||
collection_node_initial = false
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
// that declares a newer one is refused. scripts/check-games.py fails while it
|
||||
// differs from the standard and the ledger.
|
||||
GAME_CONTRACT_VERSION :: 1
|
||||
GAME_OLDEST_HOST_API :: 41
|
||||
GAME_HOST_API :: 42
|
||||
GAME_OLDEST_HOST_API :: 43
|
||||
GAME_HOST_API :: 43
|
||||
// The older direct loader has no verified reminder dispatch. Products use
|
||||
// CollectionHost; do not advertise its API42 authority from the direct loader.
|
||||
GAME_DIRECT_HOST_API :: 41
|
||||
@@ -2,8 +2,8 @@
|
||||
"name": "kryon-node-app",
|
||||
"contract_version": 1,
|
||||
"module_api": 2,
|
||||
"host_api": 42,
|
||||
"oldest_host_api": 41,
|
||||
"host_api": 43,
|
||||
"oldest_host_api": 43,
|
||||
"identity": "Stable signed package ID; moving source must not rename installed games",
|
||||
"frames": {
|
||||
"matching": "Fields match by name",
|
||||
|
||||
@@ -25,7 +25,7 @@ assert chess["kind"] == "game"
|
||||
assert (ROOT / "apps/chess/engine.zi").is_file(), "Arcade must own the game"
|
||||
assert not (inbe / "apps/chess").exists(), "Inbe must consume Chess, not own another copy"
|
||||
assert chess["contract_version"] == 1 and chess["module_api"] == 2
|
||||
assert chess["host_api"] == 41 and chess["save_schema"] == 1
|
||||
assert chess["host_api"] == 43 and chess["save_schema"] == 1
|
||||
assert (ROOT / chess["preview"]).is_file()
|
||||
env = {key: value for key, value in os.environ.items()
|
||||
if key not in {"DISPLAY", "WAYLAND_DISPLAY", "XAUTHORITY", "DBUS_SESSION_BUS_ADDRESS"}}
|
||||
|
||||
@@ -167,7 +167,7 @@ Check :: () -> s32 {
|
||||
if protocol == APPS_NODE_PROTOCOL {
|
||||
if Open(key, protocol, true) { return 120 }
|
||||
AppHostStop(*collection_host); AppHostCollect(*collection_host)
|
||||
if Open(key, protocol, false, 41) { return 121 }
|
||||
if Open(key, protocol, false, 42) { return 121 }
|
||||
AppHostStop(*collection_host); AppHostCollect(*collection_host)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ def main():
|
||||
assets = WORK / game / 'assets/notification'
|
||||
assets.mkdir(parents=True, exist_ok=True)
|
||||
(assets / 'catalog.json').write_text(json.dumps(dict(id=identifier, name='notification',
|
||||
contract_version=1, module_api=2, host_api=42, save_schema=1)))
|
||||
contract_version=1, module_api=2, host_api=43, save_schema=1)))
|
||||
for protocol in (1, 2):
|
||||
defines = ['--define', 'KRYON_HOSTED_UI']
|
||||
if protocol == 2:
|
||||
|
||||
@@ -328,7 +328,7 @@ class CollectionTests(unittest.TestCase):
|
||||
}))
|
||||
(source / "editor/catalog.json").write_text(json.dumps({
|
||||
"id": "xyz.waozi.wurm-editor", "name": "wurm-editor", "title": "Apfelwurm Editor",
|
||||
"kind": "game", "contract_version": 1, "module_api": 2, "host_api": 41,
|
||||
"kind": "game", "contract_version": 1, "module_api": 2, "host_api": 43,
|
||||
"harnesses": ["arcade"], "preview": "assets/wurm-editor-preview.png",
|
||||
}))
|
||||
images = {
|
||||
@@ -362,7 +362,7 @@ class CollectionTests(unittest.TestCase):
|
||||
self.add_library_copy(name, key, images[f"{name}-{key}"])
|
||||
ledger["node_apps"]["wurm-editor"] = {
|
||||
"id": "xyz.waozi.wurm-editor", "title": "Apfelwurm Editor", "version": "0.1.0",
|
||||
"sequence": 1, "host_api": 41,
|
||||
"sequence": 1, "host_api": 43,
|
||||
}
|
||||
ledger_path.write_text(json.dumps(ledger))
|
||||
resolver = self.root / "scripts/ziran.sh"
|
||||
@@ -469,13 +469,14 @@ class CollectionTests(unittest.TestCase):
|
||||
with self.assertRaisesRegex(ValueError, 'Invalid artwork package'):
|
||||
self.stage()
|
||||
|
||||
def test_changed_gameplay_crop_requires_regenerating_art(self):
|
||||
registration = self.root / 'games.json'
|
||||
value = json.loads(registration.read_text())
|
||||
value['screenshots']['shovey']['landscape']['crop_top'] += 1
|
||||
registration.write_text(json.dumps(value))
|
||||
with self.assertRaisesRegex(ValueError, 'crop changed'):
|
||||
self.stage()
|
||||
def test_library_covers_use_original_painted_art(self):
|
||||
approved = json.loads((ROOT / 'tests/library_art_sources.json').read_text())
|
||||
sources = json.loads((self.root / 'assets/arcade/library/sources.json').read_text())
|
||||
for game in ('shovey', 'wurm', 'choano'):
|
||||
for view in ('portrait', 'landscape'):
|
||||
name = game + '-' + view
|
||||
self.assertEqual(sources[name]['source_sha256'], approved[name])
|
||||
self.assertNotIn('screenshots', json.loads((self.root / 'games.json').read_text()))
|
||||
|
||||
def test_library_heroes_are_bounded_and_editor_art_stays_small(self):
|
||||
catalog, packages = builder.stage(self.root, self.controller, self.controller_digest, self.output)
|
||||
@@ -496,10 +497,8 @@ class CollectionTests(unittest.TestCase):
|
||||
self.assertLessEqual(max(thumbnail.size), limit)
|
||||
self.assertLessEqual(thumbnail.width, source.width)
|
||||
self.assertLessEqual(thumbnail.height, source.height)
|
||||
crop_top = app.get("cover_crops", {}).get(key, 0)
|
||||
expected_ratio = source.width / (source.height - crop_top)
|
||||
if key == 'portrait' and not app['internal']:
|
||||
expected_ratio = max(2 / 3, expected_ratio)
|
||||
expected_ratio = 2 / 3 if key == 'portrait' else 16 / 9 if key == 'landscape' else source.width / source.height
|
||||
if app['internal']: expected_ratio = source.width / source.height
|
||||
self.assertAlmostEqual(thumbnail.width / thumbnail.height,
|
||||
expected_ratio, delta=(1 + expected_ratio) / thumbnail.height)
|
||||
self.assertIn(thumbnail.mode, ('RGB', 'RGBA'))
|
||||
@@ -675,7 +674,7 @@ class LibraryThumbnailTests(unittest.TestCase):
|
||||
self.assertEqual(suffix, '.webp')
|
||||
with Image.open(io.BytesIO(contents)) as thumbnail:
|
||||
self.assertEqual(thumbnail.format, 'WEBP')
|
||||
self.assertEqual(thumbnail.size, (810, 1080))
|
||||
self.assertEqual(thumbnail.size, (720, 1080))
|
||||
self.assertEqual(thumbnail.mode, 'RGB')
|
||||
self.assertIsNone(thumbnail.getcolors(256))
|
||||
|
||||
@@ -686,7 +685,7 @@ class LibraryThumbnailTests(unittest.TestCase):
|
||||
source.save(encoded, 'PNG')
|
||||
contents, _ = artist.small_copy(encoded.getvalue(), 'landscape', crop_top=52)
|
||||
with Image.open(io.BytesIO(contents)) as cover:
|
||||
self.assertEqual(cover.size, (1440, 848))
|
||||
self.assertEqual(cover.size, (1440, 810))
|
||||
red, green, blue = cover.getpixel((720, 0))
|
||||
self.assertLess(red, 40)
|
||||
self.assertGreater(blue, 150)
|
||||
|
||||
@@ -229,15 +229,20 @@ def main():
|
||||
assert len(set(pixels)) > 20, "Focused art must color the background"
|
||||
|
||||
def open_game(label):
|
||||
# Position marks select an offscreen cover; the artwork itself opens it.
|
||||
nodes = driver.find(label=label, role='button', visible=True)
|
||||
covers = [node for node in nodes if node['height'] > 100]
|
||||
if not covers:
|
||||
driver.press(label=label, role='button')
|
||||
order = ['Shovey', 'Apfelwurm', 'Choano']
|
||||
current = next(n for n in driver.tree() if n['kind']=='button' and n['selected'] and n['height']>100)
|
||||
while current['label'] != label:
|
||||
driver.key('right' if order.index(current['label']) < order.index(label) else 'left')
|
||||
driver.wait_idle(frames=20)
|
||||
covers = [node for node in driver.find(label=label, role='button', visible=True) if node['height'] > 100]
|
||||
assert covers, f'{label} must become reachable on the shelf'
|
||||
driver.press(key=covers[0]['key'], role='button')
|
||||
current = next(n for n in driver.tree() if n['kind']=='button' and n['selected'] and n['height']>100)
|
||||
driver.press(key=current['key'],role='button')
|
||||
|
||||
def finish_download(label):
|
||||
entry = next(e for e in by_name.values() if e['title']==label)
|
||||
wait(lambda: (profile/'resources/downloads'/(entry['sha256']+'.zx')).exists() and
|
||||
not driver.find(label='Downloading',role='text'), 'Download did not finish on shelf')
|
||||
assert driver.find(label=label,role='button'), 'Download left the shelf'
|
||||
open_game(label)
|
||||
|
||||
def primary_download(label='Download'):
|
||||
driver.wait(label=label, role='button')
|
||||
@@ -265,11 +270,6 @@ def main():
|
||||
driver.wait_idle(frames=20)
|
||||
editor = [n for n in driver.find(label='Apfelwurm', role='button') if n['height'] > 100]
|
||||
assert editor and editor[0]['selected'], 'Right selects the next game'
|
||||
driver.key('enter')
|
||||
driver.wait(label='Cancel', role='button')
|
||||
driver.wait(label='Apfelwurm', role='text')
|
||||
assert not driver.find(role='modal'), 'Game launch must stay in the page'
|
||||
driver.press(label='Cancel', role='button')
|
||||
driver.key('left')
|
||||
driver.wait_idle(frames=20)
|
||||
subprocess.run(['xdotool', 'windowsize', window, '1120', '700'], check=True)
|
||||
@@ -300,21 +300,15 @@ def main():
|
||||
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]
|
||||
open_game('Shovey')
|
||||
driver.wait(label='Cancel', role='button')
|
||||
driver.press(label='Cancel', role='button')
|
||||
assert not games & set(server['requests']), 'Cancel must download nothing'
|
||||
open_game('Shovey')
|
||||
server['game_delay'] = 3
|
||||
primary_download()
|
||||
driver.wait(label='Hide', role='button')
|
||||
assert not driver.find(role='modal'), 'Transfer progress must not capture modal focus'
|
||||
driver.press(key=50033, role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
assert any(n['selected'] and n['height'] > 100 for n in driver.find(label='Shovey', role='button')), 'Returning keeps the selected cover'
|
||||
open_game('Shovey')
|
||||
driver.wait(label='Downloading',role='text')
|
||||
assert driver.find(label='Apfelwurm',role='button'), 'Download must keep the carousel available'
|
||||
assert not driver.find(role='modal'), 'Transfer progress must not capture modal focus'
|
||||
assert any(n['selected'] and n['height']>100 for n in driver.find(label='Shovey',role='button'))
|
||||
finish_download('Shovey')
|
||||
server['game_delay'] = 0
|
||||
driver.wait(key=20510, label="Play", role="button")
|
||||
driver.wait(label='Play',role='button',timeout=60)
|
||||
assert not driver.find(label="Restart", role="button"), "A game opens its own title"
|
||||
capture(child, "shovey-title")
|
||||
enter_shovey_play(driver)
|
||||
@@ -337,13 +331,15 @@ def main():
|
||||
driver.wait_idle(frames=5)
|
||||
driver.press(label="Back", role="button")
|
||||
driver.wait(label="Play", role="button")
|
||||
driver.key("escape")
|
||||
driver.wait(label="Shovey", role="button")
|
||||
driver.key(290)
|
||||
driver.wait(key=50400,visible=True)
|
||||
saved = wait(lambda: record.read_bytes() if record.exists() else None, "Classic did not save")
|
||||
assert not driver.find(label=sizes["shovey"], role="text"), "Installed games must omit their download size"
|
||||
open_game('Shovey')
|
||||
driver.wait(label='Editor', role='button')
|
||||
driver.press(label='Editor', role='button')
|
||||
driver.wait(label='Next',role='button')
|
||||
driver.press(label='Next',role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
driver.press(label='Open',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'
|
||||
@@ -357,21 +353,22 @@ def main():
|
||||
driver.wait(label="New level", role="text")
|
||||
capture(child, "editor-open")
|
||||
driver.key("escape")
|
||||
driver.wait(label="Play", role="button")
|
||||
driver.wait(label='Editor', role='button')
|
||||
assert not driver.find(label='Shovey', role='button'), 'Editor Back returns to the same game title'
|
||||
driver.key("escape")
|
||||
driver.wait(label="Shovey", role="button")
|
||||
driver.wait(label='Open',role='button')
|
||||
driver.press(label='Previous',role='button')
|
||||
driver.wait(label='Play',role='button')
|
||||
assert not driver.find(key=50400,visible=True), 'Editor Back returns to the game title'
|
||||
driver.key(290)
|
||||
driver.wait(key=50400,visible=True)
|
||||
window = subprocess.check_output(["xdotool", "search", "--onlyvisible", "--pid", str(child.pid)], text=True).splitlines()[0]
|
||||
subprocess.run(["xdotool", "windowsize", window, "900", "540"], check=True)
|
||||
grid(child, "apps-landscape")
|
||||
server['corrupt_wurm'] = True
|
||||
open_game('Apfelwurm')
|
||||
primary_download()
|
||||
driver.wait(label='Try again', role='button', timeout=60)
|
||||
driver.wait(label='Download failed',role='text',timeout=60)
|
||||
assert not driver.find(label='Pause', role='button'), 'Unverified bytes must never run'
|
||||
server['corrupt_wurm'] = False
|
||||
primary_download('Try again')
|
||||
open_game('Apfelwurm')
|
||||
finish_download('Apfelwurm')
|
||||
# Both the built-in editor and retained add-on open inside Wurm.
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
driver.press(label='Level editor', role='button')
|
||||
@@ -396,7 +393,7 @@ def main():
|
||||
driver.key(290)
|
||||
driver.wait(label='Shovey', role='button')
|
||||
open_game('Choano')
|
||||
primary_download()
|
||||
finish_download('Choano')
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
assert not driver.find(label='Pause', role='button'), 'Choano keeps its own title screen'
|
||||
driver.press(label='Play', role='button')
|
||||
@@ -433,7 +430,7 @@ def main():
|
||||
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: console covers, consent/cancel, digest failure/retry, all three game titles/play, in-game editors, Back, rotation, offline reopen and retained saves passed")
|
||||
print("Arcade: console covers, selection and in-place downloads, digest failure/retry, all three game titles/play, in-game editors, Back, rotation, offline reopen and retained saves passed")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"""Real console home, artwork pixels, rotation, input and profile roundtrip privately."""
|
||||
import argparse, contextlib, json, os, subprocess, sys, tempfile, time
|
||||
from pathlib import Path
|
||||
from PIL import Image
|
||||
from PIL import Image, ImageOps, ImageChops, ImageStat
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--binary', type=Path, default=root / 'build/arcade')
|
||||
@@ -13,9 +13,44 @@ sys.path.insert(0, str(root / 'tests'))
|
||||
sys.path.insert(0, str(args.inbe_source / 'tests'))
|
||||
from collection_ui_test import package_server, answer_library_question
|
||||
from ui_driver import UiDriver
|
||||
out = root / 'work/console-redesign/results'
|
||||
out = root / 'backup/console-fixes/results'
|
||||
out.mkdir(parents=True, exist_ok=True)
|
||||
driver = UiDriver(out / 'driver')
|
||||
metadata = json.loads((root / 'build/arcade.json').read_text())
|
||||
approved = json.loads((root / 'tests/library_art_sources.json').read_text())
|
||||
sources = json.loads((root / 'assets/arcade/library/sources.json').read_text())
|
||||
for name, digest in approved.items():
|
||||
assert sources[name]['source_sha256'] == digest, 'Cover replaced the original painted artwork: ' + name
|
||||
assert metadata['art']['bytes'] <= 2 * 1024 * 1024
|
||||
|
||||
def selected_cover():
|
||||
return next(n for n in driver.tree() if n['kind'] == 'button' and n['selected'] and n['height'] > 100)
|
||||
|
||||
def viewport_width():
|
||||
# Scenery shapes may extend past the window; the window-sized background starts at its origin.
|
||||
return max(n['width'] for n in driver.tree() if n['x'] == 0 and n['y'] == 0)
|
||||
|
||||
def tap_cover(label, mouse):
|
||||
cover = next(n for n in driver.find(label=label, role='button') if n['height'] > 100 and n['visible'])
|
||||
width = viewport_width()
|
||||
x = max(4, min(width - 4, cover['x'] + cover['width'] / 2))
|
||||
y = cover['y'] + cover['height'] / 2
|
||||
if mouse:
|
||||
# A real X11 click held like a person's: SDL sees the move, press and release.
|
||||
subprocess.run(['xdotool', 'mousemove', '--window', window, str(int(x)), str(int(y))], check=True)
|
||||
time.sleep(.25)
|
||||
subprocess.run(['xdotool', 'mousedown', '1'], check=True)
|
||||
time.sleep(.15)
|
||||
subprocess.run(['xdotool', 'mouseup', '1'], check=True)
|
||||
time.sleep(.3)
|
||||
else:
|
||||
driver.pointer(x, y)
|
||||
driver.pointer(x, y, down=True)
|
||||
driver.wait_idle(frames=2)
|
||||
driver.pointer(x, y, down=False)
|
||||
driver.release_pointer()
|
||||
driver.wait_idle(frames=20)
|
||||
|
||||
with package_server(root) as (origin, server), tempfile.TemporaryDirectory(dir=out) as temporary, (out / 'capture.log').open('w') as log:
|
||||
profile = Path(temporary)
|
||||
child = subprocess.Popen([str(args.binary.resolve())], cwd=root, env=os.environ | driver.environment() | {
|
||||
@@ -34,8 +69,10 @@ with package_server(root) as (origin, server), tempfile.TemporaryDirectory(dir=o
|
||||
assert int(subprocess.check_output(['xdotool', 'getwindowpid', window], text=True)) == child.pid
|
||||
for name, width, height in [('home-landscape', 1200, 720), ('home-portrait', 480, 820)]:
|
||||
subprocess.run(['xdotool', 'windowsize', window, str(width), str(height)], check=True)
|
||||
# Keep the whole window on the private screen so captures are never clipped.
|
||||
subprocess.run(['xdotool', 'windowmove', window, '0', '0'], check=True)
|
||||
deadline = time.monotonic() + 10
|
||||
while max(n['width'] for n in driver.tree()) != width:
|
||||
while viewport_width() != width:
|
||||
assert time.monotonic() < deadline
|
||||
time.sleep(.05)
|
||||
driver.wait_idle(frames=30)
|
||||
@@ -45,9 +82,11 @@ with package_server(root) as (origin, server), tempfile.TemporaryDirectory(dir=o
|
||||
for title in ('Shovey', 'Apfelwurm', 'Choano'):
|
||||
assert driver.find(label=title, role='button'), 'Accessible game name missing'
|
||||
assert not driver.find(label=title, role='text'), 'No captions under artwork'
|
||||
background = next(n for n in nodes if n['key'] == 50021)
|
||||
assert (background['x'], background['y'], background['width'], background['height']) == (0, 0, width, height)
|
||||
assert background['detail'].endswith(('landscape.webp' if width > height else 'portrait.webp'))
|
||||
# Both orientations draw the same scenic pattern, never game art behind the covers.
|
||||
scenery = next(n for n in nodes if n['key'] == 50400)
|
||||
assert (scenery['x'], scenery['y'], scenery['width'], scenery['height']) == (0, 0, width, height)
|
||||
assert not any(n['key'] == 50021 for n in nodes), 'No full-screen game artwork behind the covers'
|
||||
assert not [n for n in nodes if n['role'] == 'image' and n['width'] >= width * .9 and n['height'] >= height * .9], 'No hero image'
|
||||
selected = [n for n in nodes if n['kind'] == 'button' and n['selected'] and n['height'] > 100]
|
||||
(out / 'latest-debug-tree.json').write_text(json.dumps(nodes,indent=2))
|
||||
assert len(selected) == 1, [(n['label'],n['selected'],n['width'],n['height']) for n in nodes if n['kind']=='button']
|
||||
@@ -55,50 +94,66 @@ with package_server(root) as (origin, server), tempfile.TemporaryDirectory(dir=o
|
||||
assert abs(selected['width'] / selected['height'] - (16/9 if width > height else 2/3)) < .02
|
||||
covers = [n for n in nodes if n['role'] == 'image' and n['label'] in ('Shovey','Apfelwurm','Choano') and n['visible']]
|
||||
assert len(covers) >= 2, 'Real neighbouring covers must be visible'
|
||||
if width > height:
|
||||
assert len(covers) == 3 and max(n['y'] for n in covers) - min(n['y'] for n in covers) < 1
|
||||
assert selected['y'] > height * .65, 'Single shelf belongs at bottom'
|
||||
else:
|
||||
assert selected['width'] >= width * .65 and selected['height'] > height * .55
|
||||
assert len([n for n in nodes if 50300 <= n['key'] <= 50302 and n['role'] == 'image']) == 3
|
||||
# The portrait carousel layout in landscape too: one large centred cover,
|
||||
# neighbours cut by the screen edges and the small cover markers below.
|
||||
assert abs(selected['x'] + selected['width'] / 2 - width / 2) < 2, 'Selected cover is centred'
|
||||
assert selected['width'] >= width * (.55 if width > height else .65)
|
||||
assert height * .15 < selected['y'] and selected['y'] + selected['height'] < height * .9
|
||||
neighbours = [n for n in covers if n['label'] != selected['label']]
|
||||
assert neighbours and all(n['x'] <= 0 or n['x'] + n['width'] >= width for n in neighbours), 'Neighbours peek in from the sides'
|
||||
assert all(abs(n['y'] + n['height'] / 2 - (selected['y'] + selected['height'] / 2)) < 2 for n in neighbours)
|
||||
markers = [n for n in nodes if 50300 <= n['key'] <= 50302 and n['role'] == 'image']
|
||||
assert len(markers) == 3 and all(n['y'] > selected['y'] + selected['height'] for n in markers)
|
||||
assert all(n['detail'].endswith(('landscape.webp' if width > height else 'portrait.webp')) for n in markers)
|
||||
for icon in ('profile', 'dew'):
|
||||
assert any(n['role'] == 'image' and n['detail'].endswith('/assets/hud/' + icon + '.webp') for n in nodes), 'Painted startup icon missing'
|
||||
subprocess.run(['import', '-window', window, str(out / (name + '.png'))], check=True)
|
||||
(out / (name + '-tree.json')).write_text(json.dumps(driver.tree(), indent=2))
|
||||
with Image.open(out / (name + '.png')) as im:
|
||||
rgb = im.convert('RGB')
|
||||
top = list(rgb.crop((0,0,width//2,88)).resize((30,10)).getdata())
|
||||
clear = sum(all(abs(a-b) <= 3 for a,b in zip(pixel,(248,250,252))) for pixel in top)
|
||||
assert clear < len(top)//2 and len(set(top)) > 20, 'Former white band must paint full game artwork'
|
||||
# The sky above the covers is the dusk scenic pattern, not a white band or game art.
|
||||
sky = ImageStat.Stat(rgb.crop((0, 0, width - 260, 80))).mean
|
||||
assert sky[2] > sky[0] + 15 and max(sky) < 170 and min(sky) > 12, ('Scenic sky must fill the top', sky)
|
||||
hills = ImageStat.Stat(rgb.crop((0, int(height * .93), width, height))).mean
|
||||
assert hills[1] > hills[0] and max(hills) < 140, ('Scenic hills must fill the bottom', hills)
|
||||
for cover in covers:
|
||||
x,y,w,h = (cover[k] for k in ('x','y','width','height'))
|
||||
crop = rgb.crop((max(0,x),max(0,y),min(width,x+w),min(height,y+h)))
|
||||
assert len(crop.getcolors(1000000) or []) > 100, 'A neighbour became a blank grey block'
|
||||
# Compare the rendered focused cover to the approved painted asset.
|
||||
view = 'landscape' if width > height else 'portrait'
|
||||
game = {'Shovey':'shovey', 'Apfelwurm':'wurm', 'Choano':'choano'}[selected['label']]
|
||||
asset = root / 'assets/arcade/library' / (game + '-' + view + '.webp')
|
||||
with Image.open(asset) as painting:
|
||||
expected = ImageOps.fit(painting.convert('RGB'), (round(selected['width']), round(selected['height'])))
|
||||
actual = rgb.crop(tuple(round(v) for v in (selected['x'],selected['y'],selected['x']+selected['width'],selected['y']+selected['height'])))
|
||||
# Ignore the rounded corners and lower action icon.
|
||||
region = (20,20,expected.width-20,expected.height-50)
|
||||
error = ImageStat.Stat(ImageChops.difference(actual.crop(region),expected.crop(region))).mean
|
||||
assert sum(error)/3 < 12, ('Rendered cover must show the original painting',game,error)
|
||||
mint = rgb.getpixel((int(selected['x'])-2,int(selected['y']+selected['height']/2)))
|
||||
assert mint[0] > 160 and mint[1] > 200 and mint[2] > 180, ('Missing focus glow',mint)
|
||||
before = background['detail']
|
||||
before = selected['label']
|
||||
driver.key('right')
|
||||
driver.wait_idle(frames=20)
|
||||
changed = next(n for n in driver.tree() if n['key'] == 50021)
|
||||
assert changed['detail'] != before, 'Selection changes the full-screen game background'
|
||||
driver.key('enter')
|
||||
driver.wait(label='Cancel', role='button')
|
||||
dialog_nodes = driver.tree()
|
||||
(out / 'install-dialog-tree.json').write_text(json.dumps(dialog_nodes,indent=2))
|
||||
subprocess.run(['import','-window',window,str(out/'install-dialog.png')],check=True)
|
||||
assert not any(n['kind'] == 'modal' for n in dialog_nodes), 'Launch progress must not create a modal'
|
||||
assert any(n['label'] == 'Apfelwurm' and n['kind'] == 'text' for n in dialog_nodes), 'Launch screen must name the game'
|
||||
driver.press(label='Cancel', role='button')
|
||||
driver.key('left')
|
||||
changed = selected_cover()['label']
|
||||
assert changed != before, 'Keyboard selection moves to the next cover'
|
||||
assert not any(n['key'] == 50021 for n in driver.tree()), 'Selection never adds a game background'
|
||||
# Physical mouse and the held pointer/touch path both select only.
|
||||
requests = list(server['requests'])
|
||||
for mouse in (True, False):
|
||||
tap_cover('Shovey', mouse)
|
||||
assert selected_cover()['label'] == 'Shovey'
|
||||
tap_cover('Apfelwurm', mouse)
|
||||
assert selected_cover()['label'] == 'Apfelwurm'
|
||||
assert any(n['key'] == 50400 for n in driver.tree()), 'A side-cover tap stays on the carousel'
|
||||
assert server['requests'] == requests, 'Side-cover tap launched/downloaded a game'
|
||||
assert not driver.find(label='Cancel',role='button')
|
||||
tap_cover('Shovey', False)
|
||||
driver.wait_idle(frames=20)
|
||||
driver.press(label='Profile', role='button')
|
||||
driver.wait(label='Account', role='text')
|
||||
if width < height:
|
||||
driver.press(label='Library connection', role='button')
|
||||
driver.wait(label='Allow fetching content and automatic app updates?', role='text')
|
||||
driver.press(label='Stay offline', role='button')
|
||||
else:
|
||||
driver.press(label='Back', role='button')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
|
||||
@@ -118,8 +173,39 @@ with package_server(root) as (origin, server), tempfile.TemporaryDirectory(dir=o
|
||||
|
||||
with Image.open(out / 'home-landscape.png') as im:
|
||||
im.crop((im.width - 240, 0, im.width, 90)).resize((960, 360), Image.Resampling.LANCZOS).save(out / 'dew-profile-closeup.png')
|
||||
assert not any(entry['sha256'] in server['requests'] for entry in json.loads((root / 'build/arcade.json').read_text())['children']), 'Browsing does not predownload games'
|
||||
print('PASS console home: real art/background pixels, no white band/title/captions/editors, orientation, focus glow, keyboard, named install consent, Profile roundtrip')
|
||||
assert not any(entry['sha256'] in server['requests'] for entry in metadata['children']), 'Browsing does not predownload games'
|
||||
# Each orientation starts a missing game on the same shelf, immediately.
|
||||
for label, width, height in [('Apfelwurm',1200,720),('Shovey',480,820)]:
|
||||
subprocess.run(['xdotool','windowsize',window,str(width),str(height)],check=True)
|
||||
driver.wait_idle(frames=30)
|
||||
if selected_cover()['label'] != label: tap_cover(label, False)
|
||||
entry = next(e for e in metadata['children'] if e['title'] == label)
|
||||
server['game_delay'] = 3
|
||||
tap_cover(label, width > height)
|
||||
driver.wait(label='Downloading',role='text',timeout=10)
|
||||
nodes = driver.tree()
|
||||
assert any(n['key']==50400 for n in nodes), 'Download left the carousel'
|
||||
assert selected_cover()['label'] == label, 'Download moved selection'
|
||||
assert not driver.find(role='modal') and not driver.find(label='Cancel',role='button')
|
||||
cover = selected_cover()
|
||||
track = next(n for n in nodes if n['key']==cover['key']+14)
|
||||
assert track['width'] > 40 and cover['y'] < track['y'] < cover['y']+cover['height'], 'Progress bar must be on the downloading cover'
|
||||
other = 'Shovey' if label=='Apfelwurm' else 'Apfelwurm'
|
||||
tap_cover(other,False)
|
||||
assert selected_cover()['label']==other, 'Download blocked browsing'
|
||||
deadline = time.monotonic()+60
|
||||
while driver.find(label='Downloading',role='text') or not (profile/'resources/downloads'/(entry['sha256']+'.zx')).exists():
|
||||
assert time.monotonic()<deadline,'Background installation did not finish'
|
||||
time.sleep(.1)
|
||||
assert any(n['key']==50400 for n in driver.tree()), 'Finishing download interrupted browsing'
|
||||
assert server['requests'].count(entry['sha256'])==1,'Repeated activation queued duplicate transfers'
|
||||
server['game_delay']=0
|
||||
# A fresh activation now opens the installed game through its real title.
|
||||
tap_cover('Shovey',False)
|
||||
tap_cover('Shovey',False)
|
||||
driver.wait(label='Play',role='button',timeout=60)
|
||||
assert not any(n['key']==50400 for n in driver.tree()), 'Centred installed cover did not launch'
|
||||
print('PASS console home: original painted cover pixels, scenic pattern with no game-art backdrop, same centred carousel in landscape and portrait, no title/captions/editors, focus glow, keyboard, side-cover mouse/touch selection only, immediate inline download and browsing, installed title, Profile roundtrip')
|
||||
print('Captured only owned private-Xvfb window:', child.pid)
|
||||
for name in ('home-landscape.png', 'home-portrait.png', 'dew-profile-closeup.png'):
|
||||
print(out / name)
|
||||
|
||||
@@ -47,7 +47,7 @@ class ArtifactTests(unittest.TestCase):
|
||||
self.apps = []
|
||||
for name, requires in [('base', []), ('base-editor', ['test.base'])]:
|
||||
descriptor = dict(id='test.' + name, name=name, title=name, kind='game',
|
||||
harnesses=['arcade'], entry='portable:Main', host_api=42,
|
||||
harnesses=['arcade'], entry='portable:Main', host_api=43,
|
||||
contract_version=1, module_api=2, save_schema=1,
|
||||
preview='preview.png', build_defines=['OWNER_ONLY'])
|
||||
self.apps.append(dict(descriptor=descriptor, requires=requires, enabled=True,
|
||||
|
||||
@@ -15,12 +15,12 @@ spec.loader.exec_module(checker)
|
||||
class HostCompatibility(unittest.TestCase):
|
||||
def test_supported_and_unsupported_interfaces(self):
|
||||
standard = json.loads((ROOT / 'standards/game-v1.json').read_text())
|
||||
for host_api in (41, 42):
|
||||
for host_api in (43,):
|
||||
checker.compatible(dict(name='fixture', contract_version=1, module_api=2,
|
||||
host_api=host_api), standard)
|
||||
for field, value in [('host_api', 40), ('host_api', 43), ('host_api', True),
|
||||
for field, value in [('host_api', 42), ('host_api', 44), ('host_api', True),
|
||||
('module_api', 1), ('contract_version', 2)]:
|
||||
game = dict(name='fixture', contract_version=1, module_api=2, host_api=42)
|
||||
game = dict(name='fixture', contract_version=1, module_api=2, host_api=43)
|
||||
game[field] = value
|
||||
with self.subTest(field=field, value=value), self.assertRaises(AssertionError):
|
||||
checker.compatible(game, standard)
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"choano-landscape": "1ca6e31c1062a7cca41bace4cf1bb221291988aea4a1dd61271899c2f5f28307",
|
||||
"choano-portrait": "47b07722c474a67ee4a06b7644a3aff211503674391e363c17eb06a34ce60d6c",
|
||||
"shovey-landscape": "40c01eb8300e4c5db52b2d75373e17cdaf7f68140c33c0a225613fc174660747",
|
||||
"shovey-portrait": "ddcbf989eab5971157d8cdc73494ed03660bb4c7a7679543248f45be260777e3",
|
||||
"wurm-landscape": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30",
|
||||
"wurm-portrait": "e8962c969f554567d598eb0b54db5836f7f1ed7462619463040c6cc2887a5a47"
|
||||
}
|
||||
@@ -49,10 +49,15 @@ def live_library(binary, driver, work):
|
||||
driver.wait(label='Choano', role='button', timeout=60)
|
||||
metadata = json.loads((profile / 'node/current.json').read_text())
|
||||
assert metadata['app_id'] == 'inbe.arcade'
|
||||
source = json.loads((ROOT / 'build/arcade.json').read_text())['node']
|
||||
bundled = json.loads((ROOT / 'build/arcade.json').read_text())
|
||||
source = bundled['node']
|
||||
assert metadata['sequence'] >= source['minimum_sequence']
|
||||
digest = next(item['sha256'] for item in metadata['artifacts'] if item['variant'] == 'module')
|
||||
catalog = catalog_assets((profile / 'node' / (digest + '.zx')).read_bytes())
|
||||
# Equal or older signed releases stay cached; the newer build's
|
||||
# own art remains authoritative, as it does in installed Arcade.
|
||||
if tuple(map(int, metadata['version'].split('.'))) <= tuple(map(int, bundled['version'].split('.'))):
|
||||
catalog = bundled
|
||||
art = profile / 'resources/downloads' / (catalog['art']['sha256'] + '.zx')
|
||||
deadline = time.monotonic() + 60
|
||||
while (not art.exists() or art.stat().st_size != catalog['art']['bytes']) and time.monotonic() < deadline:
|
||||
@@ -143,7 +148,11 @@ def main():
|
||||
relative = self.path.removeprefix('/api/v2/packages/inbe.arcade/')
|
||||
if relative.startswith('latest?'):
|
||||
index = state['revision']
|
||||
data = json.dumps(descriptor(key, payloads[index], 196 + index, module_api=2)).encode()
|
||||
if state.get('older'):
|
||||
# Signed, valid and newer in sequence, but an older app version.
|
||||
data = json.dumps(descriptor(key, payloads[0], 195, module_api=2, version='0.0.1')).encode()
|
||||
else:
|
||||
data = json.dumps(descriptor(key, payloads[index], 196 + index, module_api=2)).encode()
|
||||
elif relative.removesuffix('.zx') in digests:
|
||||
data = payloads[digests.index(relative.removesuffix('.zx'))]
|
||||
else:
|
||||
@@ -169,6 +178,8 @@ def main():
|
||||
shutil.copy2(args.binary, app / 'arcade')
|
||||
for name in ('arcade.zx', 'apps.zx', 'entity.zx'):
|
||||
shutil.copyfile(ROOT / 'build' / name, app / name)
|
||||
# The installed HUD icons sit beside the binary, as in a release.
|
||||
shutil.copytree(ROOT / 'build/assets/hud', app / 'assets/hud')
|
||||
receipt = json.loads((ROOT / 'build/arcade.json').read_text())
|
||||
receipt['node'] = dict(origin=origin, app_id='inbe.arcade', key_id='fixture-2026', minimum_sequence=195,
|
||||
public_key=key.public_key().public_bytes(serialization.Encoding.Raw, serialization.PublicFormat.Raw).hex())
|
||||
@@ -205,7 +216,7 @@ def main():
|
||||
# event is still queued. Wait for the accepted viewport first.
|
||||
import time
|
||||
deadline = time.monotonic() + 10
|
||||
while max(node['width'] for node in driver.tree()) != width:
|
||||
while max(node['width'] for node in driver.tree() if node['x'] == 0 and node['y'] == 0) != width:
|
||||
assert time.monotonic() < deadline, 'The host did not accept the new viewport'
|
||||
time.sleep(0.05)
|
||||
driver.wait_idle(frames=20)
|
||||
@@ -234,6 +245,27 @@ def main():
|
||||
assert not state['requests'], 'Offline choice must prevent preview downloads'
|
||||
assert_plain_library()
|
||||
consent.unlink()
|
||||
# A signed release older than the catalog this build carries is kept
|
||||
# cached but never replaces the bundled library, then or after restart.
|
||||
state['older'] = True
|
||||
with application('older-release'):
|
||||
import time
|
||||
driver.wait(label='Allow', role='button')
|
||||
driver.press(label='Allow', role='button')
|
||||
cached = profile / 'node/current.json'
|
||||
deadline = time.monotonic() + 60
|
||||
while not (cached.is_file() and json.loads(cached.read_text() or '{}').get('version') == '0.0.1'):
|
||||
assert time.monotonic() < deadline, 'The older signed release was not fetched'
|
||||
time.sleep(0.1)
|
||||
driver.wait_idle(frames=60)
|
||||
assert driver.find(label='Choano', role='button'), 'An older release replaced the bundled library'
|
||||
assert not driver.find(label='Node Shovey', role='button')
|
||||
with application('older-cached'):
|
||||
driver.wait(label='Choano', role='button', timeout=60)
|
||||
driver.wait_idle(frames=40)
|
||||
assert not driver.find(label='Node Shovey', role='button'), 'A cached older release replaced the bundled library'
|
||||
state['older'] = False
|
||||
consent.unlink()
|
||||
with application('consent-refresh') as child:
|
||||
driver.wait(label='Allow', role='button')
|
||||
driver.press(label='Allow', role='button')
|
||||
@@ -286,7 +318,7 @@ def main():
|
||||
server.shutdown()
|
||||
server.server_close()
|
||||
thread.join()
|
||||
print('Arcade node consent, automatic signed membership refresh, preview rendering, game download consent and offline restart passed')
|
||||
print('Arcade node consent, older releases never replacing the bundled library, automatic signed membership refresh, preview rendering, game download consent and offline restart passed')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
"""Wurm releases are imported unchanged, with the exact source/release identity."""
|
||||
import importlib.util
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import tarfile
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / 'scripts'))
|
||||
|
||||
|
||||
def load(name, path):
|
||||
spec = importlib.util.spec_from_file_location(name, ROOT / path)
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
|
||||
|
||||
exports = load('wurm_exports', 'scripts/fetch-wurm-export.py')
|
||||
|
||||
|
||||
class WurmExports(unittest.TestCase):
|
||||
def setUp(self):
|
||||
scratch = ROOT / 'work/console-redesign'
|
||||
scratch.mkdir(parents=True, exist_ok=True)
|
||||
self.temporary = tempfile.TemporaryDirectory(dir=scratch)
|
||||
self.addCleanup(self.temporary.cleanup)
|
||||
self.root = Path(self.temporary.name)
|
||||
|
||||
def archive(self, bad=None):
|
||||
archive = self.root / 'exports.tar.gz'
|
||||
with tarfile.open(archive, 'w:gz') as output:
|
||||
for name in sorted(exports.EXPORT_FILES):
|
||||
member = tarfile.TarInfo(name)
|
||||
data = name.encode()
|
||||
member.size = len(data)
|
||||
if name == 'wurm.zx' and bad:
|
||||
if bad == 'link':
|
||||
member.type, member.linkname = tarfile.SYMTYPE, 'private'
|
||||
else:
|
||||
member.name = '../wurm.zx'
|
||||
output.addfile(member, io.BytesIO(data))
|
||||
return archive
|
||||
|
||||
def test_complete_archive_is_copied_unchanged(self):
|
||||
exports.unpack(self.archive(), self.root)
|
||||
for name in exports.EXPORT_FILES:
|
||||
self.assertEqual((self.root / 'build/games' / name).read_bytes(), name.encode())
|
||||
|
||||
def test_invalid_members_preserve_previous_export(self):
|
||||
target = self.root / 'build/games/wurm.zx'
|
||||
target.parent.mkdir(parents=True)
|
||||
target.write_bytes(b'previous export')
|
||||
for bad in ('link', 'traversal'):
|
||||
with self.assertRaises(ValueError):
|
||||
exports.unpack(self.archive(bad), self.root)
|
||||
self.assertEqual(target.read_bytes(), b'previous export')
|
||||
|
||||
def test_wrong_release_commit_is_rejected_before_download(self):
|
||||
(self.root / 'version.json').write_text('{"version":"0.2.32"}')
|
||||
with patch.object(exports.subprocess, 'check_output', return_value='1' * 40), \
|
||||
patch.object(exports.subprocess, 'run') as download:
|
||||
with self.assertRaisesRegex(ValueError, 'pinned commit'):
|
||||
exports.fetch(self.root, '2' * 40)
|
||||
download.assert_not_called()
|
||||
|
||||
@unittest.skipUnless(os.environ.get('WURM_EXPORT_ARCHIVE'), 'set WURM_EXPORT_ARCHIVE and WURM_SOURCE for real bundle test')
|
||||
def test_real_release_passes_arcade_import_contract(self):
|
||||
importer = load('game_importer', 'scripts/build-games.py')
|
||||
source = Path(os.environ['WURM_SOURCE'])
|
||||
archive = Path(os.environ['WURM_EXPORT_ARCHIVE'])
|
||||
exports.unpack(archive, self.root)
|
||||
apps, records = [], {}
|
||||
for declaration in json.loads((source / 'apps.json').read_text())['apps']:
|
||||
descriptor = json.loads((source / declaration['manifest']).read_text())
|
||||
name = descriptor['name']
|
||||
apps.append(dict(descriptor=descriptor, requires=declaration.get('requires', []),
|
||||
enabled=True, source=source, package='wurm'))
|
||||
records[descriptor['id']] = {
|
||||
kind: str(self.root / 'build/games' / (name + suffix))
|
||||
for kind, suffix in [('bundle', '.zx'), ('resources', '-resources.json'), ('preview', '-preview.png')]}
|
||||
manifest = self.root / 'exports.json'
|
||||
manifest.write_text(json.dumps({'apps': records}))
|
||||
before = {path.name: importer.digest(path) for path in (self.root / 'build/games').iterdir()}
|
||||
with patch.object(importer, 'ROOT', self.root), patch.object(importer, 'declared_apps', return_value=apps):
|
||||
importer.build('unused', [], manifest)
|
||||
for name, digest in before.items():
|
||||
if '-catalog.json' not in name:
|
||||
self.assertEqual(importer.digest(self.root / 'build/games' / name), digest)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -47,7 +47,7 @@
|
||||
},
|
||||
{
|
||||
"commit": "d74348c2e288ac55740461f7e106cda365b4db4a",
|
||||
"dependencies": {"apps": "p2bf10414e9201651", "crypto": "pc23fbf455e97614d", "curl": "p8da229d15597ab5c", "daochi_client": "p89503086b39ba0fb", "entity": "peb3fb337c2b79068", "game2d": "pf2f54c7603f6e861", "kryon": "pe4419a225f95e507", "kss": "p1b13dda539ed2a39", "liboqs": "p60ff905f3a963886", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p71f489a3ce887de0", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "p810dc0509cd1b75d"},
|
||||
"dependencies": {"apps": "p2bf10414e9201651", "crypto": "pc23fbf455e97614d", "curl": "p8da229d15597ab5c", "daochi_client": "p89503086b39ba0fb", "entity": "peb3fb337c2b79068", "game2d": "pf2f54c7603f6e861", "kryon": "pe4419a225f95e507", "kss": "p1b13dda539ed2a39", "liboqs": "p5c52c96443a2bf32", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p71f489a3ce887de0", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "p810dc0509cd1b75d"},
|
||||
"dependency_refs": {"apps": "master", "crypto": "master", "curl": "master", "daochi_client": "master", "entity": "master", "game2d": "master", "kryon": "master", "kss": "master", "liboqs": "main", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "master", "practices": "master", "qrcode": "master", "rini": "main", "sqlite": "master"},
|
||||
"id": "p183b01bccc6424e7",
|
||||
"name": "Inbe",
|
||||
@@ -63,6 +63,15 @@
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kss.git"
|
||||
},
|
||||
{
|
||||
"commit": "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pbb0d432304fad5c6"},
|
||||
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13"},
|
||||
"id": "p2b1c0e80f47c3873",
|
||||
"name": "Apps",
|
||||
"ref": "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "7364520deacb9ead8b46771a24a066220dedf144",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pe4419a225f95e507"},
|
||||
@@ -72,6 +81,15 @@
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "eada9baf35b45a7ebea4fb93728403dcca34cb41",
|
||||
"dependencies": {"apps": "pf7f4c26f3cf01fbe", "entity": "p507e86a4cf18dc9c", "game2d": "p0e63706817d43aba", "kryon": "pe42819128210d99c", "kss": "pa3347b028712cc32", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "3515cdf3af20e79001f7774eed224e94180540ed", "entity": "075784438af94fe4a0aba48ed4d8c7208c161bf1", "game2d": "8b5a989dea686250078da2d209fde1cd2946fc77", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c", "kss": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62", "mingcute": "master"},
|
||||
"id": "p2f197edc2542d0f6",
|
||||
"name": "Choano",
|
||||
"ref": "eada9baf35b45a7ebea4fb93728403dcca34cb41",
|
||||
"url": "https://github.com/waozixyz/choano.git"
|
||||
},
|
||||
{
|
||||
"commit": "1844042d1ca751e62e61df7617dba19c98588339",
|
||||
"dependencies": {},
|
||||
@@ -91,14 +109,23 @@
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "619888d404e7d7e441921702c41a5838a8981408",
|
||||
"commit": "7bf154f197696f5bf04be2ea4c576db86bb6a238",
|
||||
"dependencies": {},
|
||||
"id": "p60ff905f3a963886",
|
||||
"id": "p5c52c96443a2bf32",
|
||||
"name": "liboqs",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/open-quantum-safe/liboqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "2c56268db0b270ad53e51af9cae5dc46876a65d9",
|
||||
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pbb0d432304fad5c6", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
|
||||
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
|
||||
"id": "p6ab8e2a733002786",
|
||||
"name": "Entity",
|
||||
"ref": "2c56268db0b270ad53e51af9cae5dc46876a65d9",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "970d5e44b1702158cb16469892da6ff50f142427",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
|
||||
@@ -110,7 +137,7 @@
|
||||
},
|
||||
{
|
||||
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
|
||||
"dependencies": {"liboqs": "p60ff905f3a963886"},
|
||||
"dependencies": {"liboqs": "p5c52c96443a2bf32"},
|
||||
"dependency_refs": {"liboqs": "main"},
|
||||
"id": "p7098ac9cd92f7e5f",
|
||||
"name": "Oqs",
|
||||
@@ -127,13 +154,13 @@
|
||||
"url": "https://github.com/waozixyz/practices.git"
|
||||
},
|
||||
{
|
||||
"commit": "5e609079d1e91699a627b5d938d1fffa4a31ac07",
|
||||
"dependencies": {"apps": "pf7f4c26f3cf01fbe", "crypto": "pc23fbf455e97614d", "entity": "p507e86a4cf18dc9c", "game2d": "p0e63706817d43aba", "kryon": "pe42819128210d99c", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "3515cdf3af20e79001f7774eed224e94180540ed", "crypto": "master", "entity": "075784438af94fe4a0aba48ed4d8c7208c161bf1", "game2d": "8b5a989dea686250078da2d209fde1cd2946fc77", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c", "mingcute": "master"},
|
||||
"id": "p76764de56f198b2c",
|
||||
"name": "Apfelwurm",
|
||||
"ref": "5e609079d1e91699a627b5d938d1fffa4a31ac07",
|
||||
"url": "https://github.com/waozixyz/wurm.git"
|
||||
"commit": "a9c85df73fa1ed7af55da8a6ab3ca7d3cdf5e6a8",
|
||||
"dependencies": {"kryon": "pbb0d432304fad5c6"},
|
||||
"dependency_refs": {"kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13"},
|
||||
"id": "p7e2abf6e63acf588",
|
||||
"name": "Game2D",
|
||||
"ref": "a9c85df73fa1ed7af55da8a6ab3ca7d3cdf5e6a8",
|
||||
"url": "https://github.com/kryonlabs/game2d.git"
|
||||
},
|
||||
{
|
||||
"commit": "5d1ee888094efc63d1fb25a58af93478b103d441",
|
||||
@@ -180,15 +207,6 @@
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/rini.git"
|
||||
},
|
||||
{
|
||||
"commit": "d167ae4ebd78b91f06fa52da53043807bceff889",
|
||||
"dependencies": {"apps": "pf7f4c26f3cf01fbe", "crypto": "pc23fbf455e97614d", "entity": "p507e86a4cf18dc9c", "kryon": "pe42819128210d99c", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "3515cdf3af20e79001f7774eed224e94180540ed", "crypto": "944826f70779a6b6cd53f6b06a75b36f4d8a2558", "entity": "075784438af94fe4a0aba48ed4d8c7208c161bf1", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c", "mingcute": "master"},
|
||||
"id": "pa2625f766af74a1b",
|
||||
"name": "Shovey",
|
||||
"ref": "d167ae4ebd78b91f06fa52da53043807bceff889",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
},
|
||||
{
|
||||
"commit": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62",
|
||||
"dependencies": {"kryon": "pe42819128210d99c"},
|
||||
@@ -208,13 +226,31 @@
|
||||
"url": "https://github.com/kryonlabs/plot.git"
|
||||
},
|
||||
{
|
||||
"commit": "b6808bea2d4180c43d44173007a3d0cfcbd3c811",
|
||||
"dependencies": {"apps": "pf7f4c26f3cf01fbe", "entity": "p507e86a4cf18dc9c", "game2d": "p0e63706817d43aba", "kryon": "pe42819128210d99c", "kss": "pa3347b028712cc32", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "3515cdf3af20e79001f7774eed224e94180540ed", "entity": "075784438af94fe4a0aba48ed4d8c7208c161bf1", "game2d": "8b5a989dea686250078da2d209fde1cd2946fc77", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c", "kss": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62", "mingcute": "master"},
|
||||
"id": "pb7041edd93bdf889",
|
||||
"name": "Choano",
|
||||
"ref": "b6808bea2d4180c43d44173007a3d0cfcbd3c811",
|
||||
"url": "https://github.com/waozixyz/choano.git"
|
||||
"commit": "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5",
|
||||
"dependencies": {"apps": "pb91195370ac0cb93", "crypto": "pc23fbf455e97614d", "entity": "p6ab8e2a733002786", "game2d": "p7e2abf6e63acf588", "kryon": "pbb0d432304fad5c6", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8", "crypto": "master", "entity": "2c56268db0b270ad53e51af9cae5dc46876a65d9", "game2d": "a9c85df73fa1ed7af55da8a6ab3ca7d3cdf5e6a8", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "mingcute": "master"},
|
||||
"id": "pb0ffd96a1a0f002c",
|
||||
"name": "Apfelwurm",
|
||||
"ref": "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5",
|
||||
"url": "https://github.com/waozixyz/wurm.git"
|
||||
},
|
||||
{
|
||||
"commit": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pbb0d432304fad5c6"},
|
||||
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13"},
|
||||
"id": "pb91195370ac0cb93",
|
||||
"name": "Apps",
|
||||
"ref": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "b5ac5d1a303326009012d68016c1d8859b6b3a13",
|
||||
"dependencies": {"libwebp": "p3b3c785a0e17e605", "raylib": "pcc7aa76725f2fb2f", "sdl3": "p16cd0434af3dff7b"},
|
||||
"dependency_refs": {"libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e", "sdl3": "829a65d769d935c4852f8159e964312c0957260a"},
|
||||
"id": "pbb0d432304fad5c6",
|
||||
"name": "kryon",
|
||||
"ref": "b5ac5d1a303326009012d68016c1d8859b6b3a13",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "944826f70779a6b6cd53f6b06a75b36f4d8a2558",
|
||||
@@ -259,6 +295,15 @@
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7",
|
||||
"dependencies": {"apps": "pb91195370ac0cb93", "crypto": "pc23fbf455e97614d", "entity": "p6ab8e2a733002786", "kryon": "pbb0d432304fad5c6", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8", "crypto": "944826f70779a6b6cd53f6b06a75b36f4d8a2558", "entity": "2c56268db0b270ad53e51af9cae5dc46876a65d9", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "mingcute": "master"},
|
||||
"id": "pe5f45d325747aa4d",
|
||||
"name": "Shovey",
|
||||
"ref": "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
},
|
||||
{
|
||||
"commit": "7e39f9fa43e0bde4bcc2426c79579e4f16c3749a",
|
||||
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pe4419a225f95e507", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
|
||||
@@ -288,13 +333,13 @@
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"dependencies": {"apps": "pf7f4c26f3cf01fbe", "choano": "pb7041edd93bdf889", "daochi_client": "p6af0b5bd9fd0cd31", "entity": "p507e86a4cf18dc9c", "game2d": "p0e63706817d43aba", "inbe": "p183b01bccc6424e7", "kryon": "pe42819128210d99c", "kss": "pa3347b028712cc32", "mingcute": "pe1027b9d16704793", "shovey": "pa2625f766af74a1b", "wurm": "p76764de56f198b2c", "wurm_art": "p02e33d091b212961"},
|
||||
"dependency_refs": {"apps": "3515cdf3af20e79001f7774eed224e94180540ed", "choano": "b6808bea2d4180c43d44173007a3d0cfcbd3c811", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "entity": "075784438af94fe4a0aba48ed4d8c7208c161bf1", "game2d": "8b5a989dea686250078da2d209fde1cd2946fc77", "inbe": "master", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c", "kss": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62", "mingcute": "master", "shovey": "d167ae4ebd78b91f06fa52da53043807bceff889", "wurm": "5e609079d1e91699a627b5d938d1fffa4a31ac07", "wurm_art": "5e609079d1e91699a627b5d938d1fffa4a31ac07"},
|
||||
"dependencies": {"apps": "p2b1c0e80f47c3873", "choano": "p2f197edc2542d0f6", "daochi_client": "p6af0b5bd9fd0cd31", "entity": "p6ab8e2a733002786", "game2d": "p0e63706817d43aba", "inbe": "p183b01bccc6424e7", "kryon": "pbb0d432304fad5c6", "kss": "pa3347b028712cc32", "mingcute": "pe1027b9d16704793", "shovey": "pe5f45d325747aa4d", "wurm": "pb0ffd96a1a0f002c", "wurm_art": "p02e33d091b212961"},
|
||||
"dependency_refs": {"apps": "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc", "choano": "eada9baf35b45a7ebea4fb93728403dcca34cb41", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "entity": "2c56268db0b270ad53e51af9cae5dc46876a65d9", "game2d": "8b5a989dea686250078da2d209fde1cd2946fc77", "inbe": "master", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "kss": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62", "mingcute": "master", "shovey": "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7", "wurm": "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5", "wurm_art": "5e609079d1e91699a627b5d938d1fffa4a31ac07"},
|
||||
"name": "Arcade"
|
||||
},
|
||||
"toolchain": {
|
||||
"commit": "e4e8efa4a92f36e2fb0cea1d56b11471afa68621",
|
||||
"ref": "e4e8efa4a92f36e2fb0cea1d56b11471afa68621",
|
||||
"commit": "0e91eb43bd665f02db86eb9b9cdd875b5436a066",
|
||||
"ref": "0e91eb43bd665f02db86eb9b9cdd875b5436a066",
|
||||
"url": "https://github.com/ziranlang/ziran.git"
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ bridge_modules = ["app"]
|
||||
|
||||
[toolchain]
|
||||
git = "https://github.com/ziranlang/ziran.git"
|
||||
ref = "e4e8efa4a92f36e2fb0cea1d56b11471afa68621"
|
||||
ref = "0e91eb43bd665f02db86eb9b9cdd875b5436a066"
|
||||
|
||||
[install]
|
||||
bin = "arcade"
|
||||
@@ -29,17 +29,17 @@ abis = "arm64-v8a,x86_64"
|
||||
|
||||
[dependencies.kryon]
|
||||
git = "https://github.com/kryonlabs/kryon.git"
|
||||
ref = "1cd873fda5d12cd4dd562956da94cee33c3e364c"
|
||||
ref = "b5ac5d1a303326009012d68016c1d8859b6b3a13"
|
||||
|
||||
[dependencies.apps]
|
||||
git = "https://github.com/waozixyz/apps.git"
|
||||
# Use the shared controller reviewed with the supported collection host.
|
||||
ref = "3515cdf3af20e79001f7774eed224e94180540ed"
|
||||
ref = "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc"
|
||||
|
||||
# Shovey's editions and editor are available as separate downloads.
|
||||
[dependencies.shovey]
|
||||
git = "https://github.com/waozixyz/shovey.git"
|
||||
ref = "d167ae4ebd78b91f06fa52da53043807bceff889"
|
||||
ref = "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7"
|
||||
|
||||
# Compatibility tooling runs Inner Breeze's host checks; releases check its publisher pins.
|
||||
[dependencies.inbe]
|
||||
@@ -48,7 +48,7 @@ ref = "master"
|
||||
|
||||
[dependencies.entity]
|
||||
git = "https://github.com/waozixyz/entity.git"
|
||||
ref = "075784438af94fe4a0aba48ed4d8c7208c161bf1"
|
||||
ref = "2c56268db0b270ad53e51af9cae5dc46876a65d9"
|
||||
|
||||
[dependencies.mingcute]
|
||||
git = "https://github.com/kryonlabs/mingcute.git"
|
||||
@@ -56,7 +56,7 @@ ref = "master"
|
||||
|
||||
[dependencies.wurm]
|
||||
git = "https://github.com/waozixyz/wurm.git"
|
||||
ref = "5e609079d1e91699a627b5d938d1fffa4a31ac07"
|
||||
ref = "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5"
|
||||
|
||||
[dependencies.game2d]
|
||||
git = "https://github.com/kryonlabs/game2d.git"
|
||||
@@ -64,7 +64,7 @@ ref = "8b5a989dea686250078da2d209fde1cd2946fc77"
|
||||
|
||||
[dependencies.choano]
|
||||
git = "https://github.com/waozixyz/choano.git"
|
||||
ref = "b6808bea2d4180c43d44173007a3d0cfcbd3c811"
|
||||
ref = "eada9baf35b45a7ebea4fb93728403dcca34cb41"
|
||||
|
||||
# Library art can advance independently of the tested game payload.
|
||||
[dependencies.wurm_art]
|
||||
|
||||