Compare commits

...
Author SHA1 Message Date
waozi 50445a571a Release Arcade 0.7.116 as a thin Android launcher 2026-10-30 23:22:06 -03:00
waozi 41251f1d61 Use shared Android account key file filters 2026-10-30 22:01:16 -03:00
26 changed files with 482 additions and 161 deletions

No files matched your search

+6
View File
@@ -1,5 +1,11 @@
# Arcade changelog
## 0.7.116
- Android Arcade downloads games and library thumbnails on demand instead of bundling the entire game library; installed games remain playable offline with saved progress.
- Filter account-key imports to key files and related backup types on Android.
## 0.7.115
- Arcade opens correctly on Android instead of closing during startup.
+3 -2
View File
@@ -54,6 +54,7 @@ run: all
./build/arcade
test: all
python3 tests/android_catalog_test.py
python3 tests/android_jni_contract_test.py
python3 tests/game_updates_test.py
$(ZIRAN) fmt --check src/*.zi apps/chess/*.zi tests/chess_engine_behavior.zi tests/chess_app_behavior.zi
@@ -135,7 +136,7 @@ install: all install-arcade
install -m 0644 build/shovey-icon.png '$(DATA_DIR)/icons/hicolor/256x256/apps/xyz.waozi.shovey.png'
install -m 0644 packaging/xyz.waozi.arcade.desktop packaging/xyz.waozi.shovey.desktop '$(DATA_DIR)/applications/'
# Arcade's own APK opens its whole library offline. Each builds an unsigned
# Arcade's APK is a thin catalog with on-demand games and art. Each builds an unsigned
# release APK in build/android/; only -gplay carries a Google library.
# scripts/android-release.py signs and checks them.
.PHONY: android android-fdroid android-gplay
@@ -148,7 +149,7 @@ android-fdroid: collection
android-gplay: collection
python3 scripts/build-android.py --product arcade --release --edition gplay
# The collection make android packed opens every game offline (desktop host).
# Test the Android catalog through the generic install/cache path privately.
.PHONY: android-offline-ui-test
android-offline-ui-test: build/arcade build/entity.zx
env -u DISPLAY -u WAYLAND_DISPLAY -u XAUTHORITY -u DBUS_SESSION_BUS_ADDRESS \
+7 -2
View File
@@ -131,8 +131,13 @@ and desktop-menu entry for the current user; it does not publish a release.
## Android
Arcade's APK opens the whole library offline: `make android` packs the
collection with every game, its art and the Apps controller, and builds an
Arcade's APK contains only the catalog, shared Apps controller, Entity host,
font and launcher resources. Library thumbnails download when needed; games
and their declared dependencies install after download consent. Installed
games remain available offline, and updates preserve downloads and saves.
Entity keeps ordinary profile pictures; optional game imagery falls back to
the profile picture when absent.
Standalone Shovey retains its complete offline collection. `make android` builds an
unsigned release APK in `build/android/`. `make android-fdroid` and
`make android-gplay` build the other editions; only `-gplay` carries a Google
library (Play Billing). Builds need the Android SDK with NDK 28.2.13676358,
+1 -1
View File
@@ -1 +1 @@
0.7.115
0.7.116
+1 -1
View File
@@ -1 +1 @@
fc63c84e19ce2f63fcd587478962c67aee31202353addcf840c9228d69c048c7
600060d7a040bf558e110ccf991ebfc9eb2810042f503a111c7d7f20c20f1b17
+2 -2
View File
@@ -34,8 +34,8 @@
"arcade": {
"id": "inbe.arcade",
"title": "Arcade",
"version": "0.7.115",
"sequence": 194,
"version": "0.7.116",
"sequence": 195,
"host_api": 41
},
"wurm": {
+1
View File
@@ -73,6 +73,7 @@ android {
}
}
sourceSets.main.java.srcDir new File(kryonDir, 'templates/droid/droid/app/src/main/java/org/kryonlabs/platform')
sourceSets.main.assets.srcDir "${rootProject.projectDir}/../build/entity-assets"
// The collection, its receipt and the launcher icon, staged by make android
// (scripts/build-android.py).
@@ -404,7 +404,7 @@ public class ArcadeActivity extends NativeActivity {
try {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType(mimeTypes == null || mimeTypes.isEmpty() ? "*/*" : mimeTypes);
org.kryonlabs.platform.DocumentTypes.apply(intent, mimeTypes);
startActivityForResult(intent, REQUEST_OPEN_DOCUMENT);
} catch (Exception error) {
Log.e(TAG, "Could not open the document picker", error);
+9 -9
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
"""Sign and verify Arcade's Android APKs: the normal and F-Droid editions,
which hold no Google library, and the Google Play edition, the only one with
Play Billing. Each carries the whole library for offline play."""
Play Billing. Arcade downloads games on demand."""
import argparse
import hashlib
import json
@@ -75,16 +75,16 @@ def verify(apk, version, tools, edition='direct'):
payload = archive.read('assets/arcade.zx')
assert metadata['id'] == 'inbe.arcade' and metadata['version'] == version
assert metadata['sha256'] == hashlib.sha256(payload).hexdigest(), 'Embedded collection differs from its receipt'
# Offline play: every game in the catalog is packed into the collection.
assert metadata.get('games') == 'packed' and 'art' not in metadata and metadata['children'], \
'The collection must pack its games and art'
for child in metadata['children']:
assert child['bundle'].encode() in payload, f"{child['id']} is not packed for offline play"
from android_catalog import verify_assets
verify_assets({name.removeprefix('assets/'): archive.read(name)
for name in names if name.startswith('assets/') and not name.endswith('/')}, edition=edition)
dex = b''.join(archive.read(name) for name in names if re.fullmatch(r'classes\d*\.dex', name))
for marker in (b'Lorg/kryonlabs/play/PlayBilling;', b'Lcom/android/billingclient/'):
assert (marker in dex) == google_play, 'Only the Google Play edition may include Play Billing'
with apk.open('rb') as source:
apk_digest = hashlib.file_digest(source, 'sha256').hexdigest()
return dict(version=version, version_code=int(package[2]), package=package[1], abis=abis, edition=edition,
sha256=hashlib.sha256(apk.read_bytes()).hexdigest(), certificate_sha256=expected,
sha256=apk_digest, certificate_sha256=expected,
payload_sha256=metadata['sha256'], games=[child['id'] for child in metadata['children']],
bytes=apk.stat().st_size)
@@ -104,7 +104,7 @@ def main():
apk = args.apk.resolve(strict=True)
if args.action == 'verify':
verify(apk, args.version, tools, args.edition)
print(f'Arcade {args.version} {args.edition}: APK identity, signer, alignment and offline games verified')
print(f'Arcade {args.version} {args.edition}: APK identity, signer, alignment and thin catalog verified')
return
suffix = '' if args.edition == 'direct' else '-' + args.edition
output = (args.output or ROOT / f'build/android/arcade-{args.version}{suffix}.apk').resolve()
@@ -135,7 +135,7 @@ def main():
records = ROOT / 'backup/android-release'
records.mkdir(parents=True, exist_ok=True)
(records / f'verification{suffix}.json').write_text(json.dumps(result, indent=2) + '\n')
print(f'Arcade {args.version} {args.edition}: signed {output}; identity, signer, alignment and offline games verified')
print(f'Arcade {args.version} {args.edition}: signed {output}; identity, signer, alignment and thin catalog verified')
if __name__ == '__main__':
+91
View File
@@ -0,0 +1,91 @@
"""Strict content boundary for the thin Android Arcade launcher."""
import hashlib
import io
import json
import struct
import subprocess
from functools import lru_cache
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
ESSENTIALS = {'arcade.zx', 'arcade.json', 'apps.zx', 'entity.zx', 'kryon-font.ttf'}
@lru_cache(maxsize=1)
def profile_asset_hashes():
package = Path(subprocess.check_output(
[str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', 'entity', '--locked'],
cwd=ROOT, text=True).strip())
paths = json.loads((package / 'asset-groups.json').read_text())['profile']
result = {}
for path in paths:
with (package / path).open('rb') as source:
result[path] = hashlib.file_digest(source, 'sha256').hexdigest()
return result
def profile_assets():
return set(profile_asset_hashes())
def bundle_assets(payload, limit):
# The catalog is tiny. Reject packed collections before allocating/reading
# their contents, then inspect every actual asset rather than path strings
# in the JSON (which intentionally names remote game and art resources).
assert len(payload) <= limit, 'Bundle exceeds its asset policy budget'
stream = io.BytesIO(payload)
def take(size):
assert 0 <= size <= len(payload), 'Invalid bundle field'
data = stream.read(size)
assert len(data) == size, 'Truncated bundle'
return data
def number():
return struct.unpack('<I', take(4))[0]
def text():
return take(number())
assert take(8) == b'ZX\0\0\x1b\0\0\0', 'Unsupported catalog bundle'
text(); text()
for _ in range(number()):
text(); text()
for _ in range(number()):
for _ in range(7):
text()
take(8); text(); take(4)
for _ in range(number()):
text(); text(); text()
take(number())
assets = {}
for _ in range(number()):
name = text().decode()
assert name not in assets, 'Duplicate bundle asset'
assets[name] = take(number())
assert not stream.read(1), 'Trailing bundle bytes'
return assets
def catalog_assets(payload):
assets = bundle_assets(payload, 256 * 1024)
assert set(assets) == {'assets/apps/catalog.json', 'assets/arcade/sidebar.shape'}, 'Game payload or art bundled in Arcade'
return json.loads(assets['assets/apps/catalog.json'])
def verify_assets(assets, essentials=True, edition='direct'):
expected = ESSENTIALS if essentials else ESSENTIALS - {'entity.zx', 'kryon-font.ttf'}
if essentials and edition == 'gplay':
# AndroidX's generated ART startup profiles accompany Play Billing.
expected = expected | {'dexopt/baseline.prof', 'dexopt/baseline.profm'}
assert set(assets) == expected, 'Unexpected or missing Android asset: ' + str(set(assets) ^ expected)
metadata = json.loads(assets['arcade.json'])
assert metadata['id'] == 'inbe.arcade' and metadata.get('games') != 'packed'
assert hashlib.sha256(assets['arcade.zx']).hexdigest() == metadata['sha256']
trusted = (ROOT / 'apps-controller.sha256').read_text().strip()
assert hashlib.sha256(assets['apps.zx']).hexdigest() == metadata['apps_sha256'] == trusted
if essentials:
pictures = bundle_assets(assets['entity.zx'], 16 * 1024 * 1024)
assert set(pictures) == profile_assets(), 'Entity contains undeclared or game artwork'
assert {name: hashlib.sha256(data).hexdigest() for name, data in pictures.items()} == profile_asset_hashes(), 'Entity profile artwork differs from its pinned declaration'
assert not bundle_assets(assets['apps.zx'], 2 * 1024 * 1024), 'Apps controller must contain no art or game payloads'
catalog = catalog_assets(assets['arcade.zx'])
assert catalog['children'] == metadata['children'] and catalog['art'] == metadata['art']
assert catalog['harness'] == 'assets/apps/apps.zx'
return metadata
+12 -11
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
"""Package Arcade's native Android host: Arcade with its whole library offline,
"""Package Arcade's native Android host: a thin on-demand launcher,
or the older standalone Shovey collection."""
import argparse
import hashlib
@@ -32,8 +32,7 @@ def launcher_icon(source, resources):
icon.resize((size, size), Image.Resampling.LANCZOS).save(folder / 'ic_launcher.png')
def stage_arcade():
"""Pack the staged collection with its games, art and Apps controller, so
the APK opens the whole library offline. Returns Arcade's release."""
"""Stage the catalog and reviewed shared controller without game payloads. Returns Arcade's release."""
collection = ROOT / 'build/collection'
receipt = json.loads((collection / 'receipt.json').read_text())
release = json.loads((ROOT / 'apps/versions.json').read_text())['node_apps']['arcade']
@@ -46,13 +45,14 @@ def stage_arcade():
if assets.exists():
shutil.rmtree(assets)
assets.mkdir(parents=True)
ziran_bundle('--root', str(ROOT / 'src'), '--entry', 'collection:Main',
'--asset-dir', 'assets=' + str(collection / 'assets'), '-o', str(assets / 'arcade.zx'),
str(ROOT / 'src/collection.zi'))
# The library packs its games and art: the host downloads nothing.
offline = {key: value for key, value in receipt.items() if key != 'art'} | {'games': 'packed'}
offline['sha256'] = hashlib.sha256((assets / 'arcade.zx').read_bytes()).hexdigest()
(assets / 'arcade.json').write_text(json.dumps(offline, indent=2) + '\n')
# Reuse the standard thin catalog; standalone Shovey remains packed.
for name in ('arcade.zx', 'arcade.json'):
shutil.copyfile(ROOT / 'build' / name, assets / name)
shutil.copyfile(collection / 'assets/apps/apps.zx', assets / 'apps.zx')
from android_catalog import verify_assets
metadata = verify_assets({p.name: p.read_bytes() for p in assets.iterdir()}, essentials=False)
if metadata['version'] != release['version']:
raise ValueError('The thin catalog version changed; rebuild the collection first')
# Android before 10 has no font lookup; the Windows build ships the same font.
shutil.copyfile(package('kryon') / 'assets/fonts/LiberationSans-Regular.ttf', assets / 'kryon-font.ttf')
launcher_icon(ROOT / 'site/android-launcher-512.png', ROOT / 'build/android-res')
@@ -80,7 +80,7 @@ def stage_shovey():
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--product', choices=('shovey', 'arcade'), default='shovey',
help='arcade: Arcade with its whole library; shovey: the standalone Shovey collection')
help='arcade: thin Arcade launcher; shovey: the standalone Shovey collection')
parser.add_argument('--release', action='store_true', help='Build an unsigned release APK for the release signer')
parser.add_argument('--edition', choices=('direct', 'fdroid', 'gplay'), default='direct',
help='The APK edition; only gplay carries a Google library')
@@ -133,6 +133,7 @@ def main():
output = ROOT / 'build/android' / (f'arcade{suffix}-unsigned.apk' if args.release else f'arcade{suffix}.apk')
output.parent.mkdir(parents=True, exist_ok=True)
shutil.copyfile(apk, output)
subprocess.run(['python3', str(ROOT / 'tests/android_catalog_test.py'), str(output), '--edition', edition], cwd=ROOT, check=True)
print(f'Arcade APK: {output}')
return
output = ROOT / ('build/shovey-test-unsigned.apk' if args.application_id else
+21 -2
View File
@@ -47,8 +47,27 @@ def build(root, output):
controller_context(root, context)
package = Path(subprocess.check_output(
['ziran', 'pkg', 'path', 'apps', '--locked'], cwd=context, text=True).strip())
subprocess.run([sys.executable, str(package / 'scripts/build-ui.py'),
'--output', str(output.resolve())], cwd=root, check=True)
subprocess.run([sys.executable, str(package / 'scripts/generate-ui-locales.py'), '--check'],
cwd=root, check=True)
toolchain = Path(subprocess.check_output(
['ziran', 'pkg', 'path', 'ziran', '--locked'], cwd=context, text=True).strip())
compiler = toolchain / 'build/bin/ziran'
if not compiler.is_file():
compiler = root / 'build/toolchain/bin/ziran'
subprocess.run(['make', '-s', '-C', str(toolchain),
'BUILD_DIR=' + str(root / 'build/toolchain'), 'all'], check=True)
output.mkdir(parents=True, exist_ok=True)
kryon = Path(subprocess.check_output(
['ziran', 'pkg', 'path', 'kryon', '--locked'], cwd=context, text=True).strip())
# Keep Apps' supported source entry mode with this host's exact graph.
subprocess.run([str(compiler), 'bundle',
'--module-path', str(package / 'src'),
'--module-path', 'kryon=' + str(kryon / 'src/ui'),
'--module-path', 'kryon=' + str(kryon / 'src/backend'),
'--module-path', str(toolchain / 'std'),
'--root', str(package / 'ui'), '--entry', 'apps:Main',
'--define', 'KRYON_HOSTED_UI', '-o', str(output.resolve() / 'apps.zx'),
str(package / 'ui/apps.zi')], cwd=context, check=True)
def main():
+4 -1
View File
@@ -14,6 +14,9 @@ flags = ['--locked'] if args.locked or not (ROOT / 'ziran.local.toml').exists()
def package(name):
return Path(subprocess.check_output([ZIRAN, 'pkg', 'path', name, *flags], cwd=ROOT, text=True).strip())
entity, kryon, toolchain, qrcode = map(package, ('entity', 'kryon', 'ziran', 'qrcode'))
staged = ROOT / 'build/entity-profile-source'
subprocess.run(['python3', str(entity / 'scripts/stage-assets.py'), '--group', 'profile',
'--output', str(staged)], cwd=ROOT, check=True)
subprocess.run([ZIRAN, 'bundle', '--root', str(entity),
'--module-path', str(entity / 'src'),
'--module-path', str(kryon / 'src/ui'),
@@ -21,7 +24,7 @@ subprocess.run([ZIRAN, 'bundle', '--root', str(entity),
'--module-path', 'kryon=' + str(kryon / 'src/backend'),
'--module-path', 'qrcode=' + str(qrcode / 'src'),
'--module-path', str(toolchain / 'std'),
'--define', 'KRYON_HOSTED_UI', '--asset-dir', 'assets=' + str(entity / 'assets'),
'--define', 'KRYON_HOSTED_UI', '--asset-dir', 'assets=' + str(staged / 'assets'),
'--entry', 'entity:Main', '-o', str(ROOT / 'build/entity.zx'), str(entity / 'src/entity.zi')],
cwd=entity, check=True)
+3 -5
View File
@@ -43,11 +43,9 @@ def build(ziran, lock_flags):
compiler = toolchain / "build/bin/ziran"
if not compiler.is_file():
compiler = ROOT / "build/toolchain/bin/ziran"
def dependency(name, project):
return Path(subprocess.check_output(
[str(compiler), "pkg", "path", name, *lock_flags], cwd=project, text=True).strip())
daochi_client = dependency("daochi_client", entity)
crypto = dependency("crypto", daochi_client)
# Resolve transitive packages from Arcade's lock, never their private graphs.
daochi_client = package("DaochiClient")
crypto = package("crypto")
entries = []
apps = dependency_order(declared_apps(ROOT, ziran, lock_flags))
by_id = {app['descriptor']['id']: app for app in apps}
+2 -2
View File
@@ -39,8 +39,8 @@ COVER_QUALITY = 80
def bundle_assets(data):
"""The files embedded in a ZX v26 bundle by path; never runs it."""
if data[:8] != b'ZX\0\0\x1a\0\0\0' or len(data) > ART_LIMIT:
"""The files embedded in a ZX v26/v27 bundle by path; never runs it."""
if data[:8] not in (b'ZX\0\0\x1a\0\0\0', b'ZX\0\0\x1b\0\0\0') or len(data) > ART_LIMIT:
raise ValueError('unsupported bundle')
at = 8
+1 -1
View File
@@ -72,7 +72,7 @@ class Reader:
def catalog_from_bundle(path):
with Reader(path) as reader:
if reader.take(8) != b"ZX\0\0\x1a\0\0\0":
if reader.take(8) not in (b"ZX\0\0\x1a\0\0\0", b"ZX\0\0\x1b\0\0\0"):
raise ValueError("unsupported bundle")
reader.text()
reader.text()
+2
View File
@@ -43,6 +43,8 @@ ArcadeStart :: () -> bool {
// Standalone Shovey opens on its covers, as Arcade opens on its library.
opened = CollectionOpenShoveyBytes(bundle, metadata, data)
} else {
// The reviewed shared Apps controller is a host asset, like Entity.
collection_controller = ReadAppAsset("apps.zx")
opened = CollectionOpenBytes(bundle, metadata, data)
}
if !opened {
+2 -2
View File
@@ -488,8 +488,8 @@ CollectionController :: (context: *void) -> HostedAsset {
return controller
}
// packed: the collection carries every game and its art, as the Android APK
// does, so nothing is downloaded.
// Packed standalone collections carry their games and art. Thin Arcade
// uses the ordinary generic Apps download, install and cached bundle path.
CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
data: string, locale: string, packed: bool) -> bool {
if collection_ready { return false }
+107
View File
@@ -0,0 +1,107 @@
"""Assert the actual staged/packaged Android assets contain no games or art."""
import json
import importlib.util
from pathlib import Path
import sys
import struct
import hashlib
import unittest
import zipfile
ROOT = Path(__file__).resolve().parents[1]
sys.path.insert(0, str(ROOT / 'scripts'))
from android_catalog import verify_assets
class AndroidCatalogTests(unittest.TestCase):
@classmethod
def setUpClass(cls):
spec = importlib.util.spec_from_file_location('android_builder', ROOT / 'scripts/build-android.py')
builder = importlib.util.module_from_spec(spec)
spec.loader.exec_module(builder)
builder.stage_arcade()
def setUp(self):
self.assets = {name: (ROOT / 'build' / name).read_bytes()
for name in ('arcade.zx', 'arcade.json', 'apps.zx', 'entity.zx')}
self.assets['kryon-font.ttf'] = b'font' # Content boundary, not a font renderer.
def test_standard_catalog(self):
verify_assets(self.assets)
def test_reject_game_or_thumbnail_beside_catalog(self):
for name in ('games/shovey.zx', 'covers/shovey.png'):
with self.subTest(name=name), self.assertRaises(AssertionError):
verify_assets(self.assets | {name: b'payload'})
def test_reject_packed_collection(self):
with self.assertRaises(AssertionError):
verify_assets(self.assets | {'arcade.zx': b'packed' * 100000})
def test_reject_game_or_art_inside_bundle(self):
def number(n):
return struct.pack('<I', n)
def text(data):
return number(len(data)) + data
# Structurally valid ZX with a catalog and an extra embedded asset.
for path in (b'assets/arcade/games/test.zx', b'assets/arcade/covers/test.png'):
payload = b'ZX\0\0\x1b\0\0\0' + text(b'') * 2 + number(0) * 4
payload += number(2) + text(b'assets/apps/catalog.json') + text(b'{}')
payload += text(path) + text(b'payload')
metadata = json.loads(self.assets['arcade.json'])
metadata['sha256'] = hashlib.sha256(payload).hexdigest()
with self.subTest(path=path), self.assertRaisesRegex(AssertionError, 'Game payload or art'):
verify_assets(self.assets | {'arcade.zx': payload, 'arcade.json': json.dumps(metadata).encode()})
def test_reject_game_art_nested_in_entity(self):
from android_catalog import profile_assets
def text(data):
return struct.pack('<I', len(data)) + data
names = sorted(profile_assets() | {'assets/entity/game-art.png'})
payload = b'ZX\0\0\x1b\0\0\0' + text(b'') * 2 + struct.pack('<IIII', 0, 0, 0, 0)
payload += struct.pack('<I', len(names))
payload += b''.join(text(name.encode()) + text(b'image') for name in names)
with self.assertRaisesRegex(AssertionError, 'Entity contains'):
verify_assets(self.assets | {'entity.zx': payload})
def test_reject_modified_profile_art(self):
from android_catalog import profile_assets
def text(data):
return struct.pack('<I', len(data)) + data
names = sorted(profile_assets())
payload = b'ZX\0\0\x1b\0\0\0' + text(b'') * 2 + struct.pack('<IIII', 0, 0, 0, 0)
payload += struct.pack('<I', len(names))
payload += b''.join(text(name.encode()) + text(b'changed image') for name in names)
with self.assertRaisesRegex(AssertionError, 'profile artwork differs'):
verify_assets(self.assets | {'entity.zx': payload})
def test_reject_packed_policy(self):
metadata = json.loads(self.assets['arcade.json']) | {'games': 'packed'}
with self.assertRaises(AssertionError):
verify_assets(self.assets | {'arcade.json': json.dumps(metadata).encode()})
def test_reject_unreviewed_controller(self):
with self.assertRaises(AssertionError):
verify_assets(self.assets | {'apps.zx': b'altered'})
def test_staged_android_assets(self):
folder = ROOT / 'build/android-assets'
if not folder.exists():
self.skipTest('Run make android to stage Android assets')
verify_assets({str(p.relative_to(folder)): p.read_bytes() for p in folder.rglob('*') if p.is_file()} |
{'entity.zx': (ROOT / 'build/entity.zx').read_bytes()})
if __name__ == '__main__':
if len(sys.argv) >= 2 and sys.argv[1].endswith('.apk'):
import argparse
parser = argparse.ArgumentParser()
parser.add_argument('apk')
parser.add_argument('--edition', choices=('direct', 'fdroid', 'gplay'), default='direct')
args = parser.parse_args()
with zipfile.ZipFile(args.apk) as apk:
verify_assets({name[7:]: apk.read(name) for name in apk.namelist()
if name.startswith('assets/') and not name.endswith('/')}, edition=args.edition)
print('APK contains only the thin catalog and host essentials')
else:
unittest.main()
+112 -67
View File
@@ -1,10 +1,6 @@
"""Check that the APK's collection opens Arcade's whole library offline.
The collection make android packs (build/android-assets) is opened by the
desktop host from a private folder, as the Android host opens it from the
APK's assets: no controller beside it and no reachable download origin, so
every game and the art must come from the collection itself."""
"""Exercise APK assets through generic Apps install, open and offline cache."""
import argparse
import contextlib
import hashlib
import json
import os
@@ -15,7 +11,10 @@ import sys
import tempfile
import time
LEVEL_UPDATES = 'Download new levels when they come out?'
root = Path(__file__).resolve().parents[1]
sys.path.insert(0, str(root / 'scripts'))
from android_catalog import verify_assets
from collection_ui_test import package_server, answer_library_question, answer_level_updates
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--binary', type=Path, required=True)
@@ -23,75 +22,121 @@ parser.add_argument('--inbe-source', type=Path, required=True)
args = parser.parse_args()
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 400
assert os.environ['YUE_DESKTOP_RECOVERY'] == '0'
root = Path(__file__).resolve().parents[1]
assets = root / 'build/android-assets'
receipt = json.loads((assets / 'arcade.json').read_text())
assert receipt['id'] == 'inbe.arcade' and receipt['games'] == 'packed' and 'art' not in receipt
assert receipt['sha256'] == hashlib.sha256((assets / 'arcade.zx').read_bytes()).hexdigest()
metadata = verify_assets({p.name: p.read_bytes() for p in assets.iterdir() if p.is_file()} |
{'entity.zx': (root / 'build/entity.zx').read_bytes()})
entries = {entry['expected_id']: entry for entry in metadata['children']}
sys.path.insert(0, str(args.inbe_source / 'tests'))
from ui_driver import UiDriver
output = root / 'build/android-offline-ui-test'
output = root / 'work/android-offline-ui-test'
output.mkdir(parents=True, exist_ok=True)
driver = UiDriver(output / 'driver')
with tempfile.TemporaryDirectory(prefix='arcade-offline-') as temporary:
with tempfile.TemporaryDirectory(prefix='host-', dir=output) as temporary, package_server(root) as (origin, server):
install = Path(temporary) / 'app'
install.mkdir()
shutil.copy2(args.binary, install / 'arcade')
for name in ('arcade.zx', 'arcade.json'):
for name in ('arcade.zx', 'arcade.json', 'apps.zx'):
shutil.copyfile(assets / name, install / name)
# The shared profile, which the APK also carries.
shutil.copyfile(root / 'build/entity.zx', install / 'entity.zx')
profile = Path(temporary) / 'profile'
log_path = output / 'arcade.log'
with log_path.open('w') as log:
# Port 9 (discard) refuses connections: any download would fail.
child = subprocess.Popen([str(install / 'arcade')], cwd=install,
env=os.environ | driver.environment() |
{'ARCADE_DATA': str(profile), 'ENTITY_DATA': str(profile / 'entity'),
'LANG': 'en_US.UTF-8', 'ARCADE_PACKAGE_ORIGIN': 'http://127.0.0.1:9'},
stdout=log, stderr=subprocess.STDOUT)
driver.attach(child, log_path)
try:
for title in ('Shovey', 'Shovey Editor', 'Apfelwurm'):
driver.wait(label=title, role='button', timeout=60)
covers = [node for node in driver.find(role='image', visible=True)
if node['width'] >= 100 and node['height'] >= 140]
assert len(covers) >= 2, 'The packed library art must draw without a download'
if driver.find(label=LEVEL_UPDATES, role='text'):
driver.press(label='Not now', role='button')
driver.wait_gone(label=LEVEL_UPDATES, role='text')
driver.press(label='Shovey', role='button')
deadline = time.monotonic() + 30
while True:
assert not driver.find(label='Download', role='button'), 'A packed game must not ask to download'
assert not driver.find(label='Try again', role='button'), 'A packed game must not download'
if driver.find(label=LEVEL_UPDATES, role='text'):
driver.press(label='Not now', role='button')
driver.wait_gone(label=LEVEL_UPDATES, role='text')
if [node for node in driver.tree() if str(node.get('label', '')).startswith('Level 1 / ')]:
break
assert not driver.find(label='Request rejected'), 'The packed host rejected its game'
assert time.monotonic() < deadline, 'Shovey did not start from the packed collection'
time.sleep(0.05)
if driver.find(label='How do you want to move?', role='text'):
driver.press(label='Swipe and tap')
driver.wait_gone(label='How do you want to move?', role='text')
driver.press(label='Back', role='button')
# Shared-code dependencies and the larger standalone game must
# also fit while the full offline collection remains resident.
for title, marker, role in [('Shovey Editor', 'New level', 'text'),
('Apfelwurm', 'Play', 'button')]:
driver.wait(label=title, role='button')
driver.press(label=title, role='button')
driver.wait(label=marker, role=role, timeout=60)
assert not driver.find(label='Request rejected')
assert not driver.find(label='Download', role='button')
driver.key('escape')
driver.wait(label='Shovey', role='button')
assert not list((profile / 'resources').rglob('*.zx')), 'Nothing may be downloaded'
finally:
if child.poll() is None:
child.terminate()
child.wait(timeout=10)
print('The Android collection draws its art and opens Shovey, its shared-code editor and Apfelwurm offline')
retained = profile / 'games/inbe.chess/records/computer'
retained.parent.mkdir(parents=True)
retained.write_bytes(b'existing private save')
record = profile / 'games/arcade.shovey/records/local.campaign'
@contextlib.contextmanager
def application(name):
log_path = output / (name + '.log')
with log_path.open('w') as log:
child = subprocess.Popen([str(install / 'arcade')], cwd=install,
env=os.environ | driver.environment() |
{'ARCADE_DATA': str(profile), 'ENTITY_DATA': str(profile / 'entity'),
'LANG': 'en_US.UTF-8', 'ARCADE_PACKAGE_ORIGIN': origin},
stdout=log, stderr=subprocess.STDOUT)
driver.attach(child, log_path)
try:
yield child
finally:
if child.poll() is None:
child.terminate()
child.wait(timeout=10)
def download(label='Download'):
driver.wait(label=label, role='button', timeout=60)
action = max(driver.find(label=label, role='button', visible=True), key=lambda node: node['width'])
driver.press(key=action['key'], role='button')
def play():
answer_level_updates(driver)
if driver.find(label='How do you want to move?', role='text'):
driver.press(label='Swipe and tap')
driver.wait(label='Restart', role='button', timeout=60)
assert not driver.find(label='Download', role='button')
with application('install'):
answer_library_question(driver)
games = {entry['sha256'] for entry in metadata['children']}
assert not games & set(server['requests']), 'No game before download consent'
driver.press(label='Shovey Editor', role='button')
driver.wait(label='Cancel', role='button')
driver.press(label='Cancel', role='button')
assert not games & set(server['requests']), 'Cancel must download nothing'
driver.press(label='Shovey Editor', role='button')
server['corrupt_shovey'] = True
download()
driver.wait(label='Try again', role='button', timeout=60)
assert not driver.find(label='New level', role='text'), 'Corrupt dependency must not open'
server['corrupt_shovey'] = False
download('Try again')
driver.wait(label='New level', role='text', timeout=60)
assert server['requests'].count(entries['shovey']['sha256']) == 2
assert server['requests'].count(entries['shovey-editor']['sha256']) == 1
driver.key('escape')
driver.wait(label='Shovey', role='button')
driver.press(label='Shovey', role='button')
play()
driver.key('right')
deadline = time.monotonic() + 20
while not record.exists() and time.monotonic() < deadline:
driver.wait_idle(frames=5)
assert record.exists(), 'Game must persist progress'
driver.press(label='Back', role='button')
driver.wait(label='Shovey', role='button')
driver.press(label='Apfelwurm', role='button')
download()
driver.wait(label='Play', role='button', timeout=60)
driver.key('escape')
driver.wait(label='Shovey', role='button')
driver.press(label='Profile', role='button')
driver.wait(label='Account', role='text')
driver.press(label='Leaderboard', role='button')
driver.wait(label='Apfelwurm', role='button')
driver.press(label='Apfelwurm', role='button')
# The profile stays usable with its optional game sheets omitted.
driver.wait(label='Back', role='button')
driver.press(label='Back', role='button')
saved = record.read_bytes()
for name in ('shovey', 'shovey-editor', 'wurm'):
entry = entries[name]
cached = profile / 'resources/downloads' / (entry['sha256'] + '.zx')
assert hashlib.sha256(cached.read_bytes()).hexdigest() == entry['sha256']
assert metadata['art']['sha256'] in server['requests'], 'Art must download separately'
requested = list(server['requests'])
server['offline'] = True
with application('offline'):
answer_library_question(driver)
driver.press(label='Shovey', role='button')
play()
driver.press(label='Back', role='button')
driver.wait(label='Shovey Editor', role='button')
driver.press(label='Shovey Editor', role='button')
driver.wait(label='New level', role='text', timeout=60)
driver.key('escape')
driver.wait(label='Apfelwurm', role='button')
driver.press(label='Apfelwurm', role='button')
driver.wait(label='Play', role='button', timeout=60)
assert server['requests'] == requested, 'Installed apps/art must reopen offline without requests'
assert record.read_bytes() == saved, 'Offline restart must preserve saved progress'
assert retained.read_bytes() == b'existing private save'
print('Android catalog: consent, dependency verification/retry, install/open, cached offline and retained saves passed')
+15 -6
View File
@@ -14,7 +14,9 @@ spec.loader.exec_module(builder)
class ControllerSourceTests(unittest.TestCase):
def test_local_overrides_do_not_reach_locked_resolution(self):
with tempfile.TemporaryDirectory() as directory:
scratch = ROOT / 'work/apps-controller-test'
scratch.mkdir(parents=True, exist_ok=True)
with tempfile.TemporaryDirectory(dir=scratch) as directory:
root = Path(directory)
manifest = ('[package]\nname = "Arcade"\n'
'[toolchain]\ngit = "https://github.com/ziranlang/ziran.git"\nref = "master"\n'
@@ -30,10 +32,13 @@ class ControllerSourceTests(unittest.TestCase):
(root / 'ziran.local.toml').write_text('unreviewed local dependency')
package = root / 'cached-apps'
output = root / 'output'
compiler = root / 'cached-ziran/build/bin/ziran'
compiler.parent.mkdir(parents=True)
compiler.write_text('fixture compiler path; subprocess calls are mocked')
contexts = []
def resolve(command, *, cwd, text):
self.assertEqual(command, ['ziran', 'pkg', 'path', 'apps', '--locked'])
self.assertIn(command, [['ziran', 'pkg', 'path', name, '--locked'] for name in ('apps', 'ziran', 'kryon')])
self.assertTrue(text)
self.assertNotIn('dependencies.wurm', (cwd / 'ziran.toml').read_text())
selected = json.loads((cwd / 'ziran.lock').read_text())
@@ -42,14 +47,18 @@ class ControllerSourceTests(unittest.TestCase):
self.assertEqual(selected['toolchain'], lock['toolchain'])
self.assertEqual({p.name for p in cwd.iterdir()}, {'ziran.toml', 'ziran.lock'})
contexts.append(cwd)
return str(package) + '\n'
return str(package if command[3] == 'apps' else root / ('cached-' + command[3])) + '\n'
with patch.object(builder.subprocess, 'check_output', side_effect=resolve), \
patch.object(builder.subprocess, 'run') as run:
builder.build(root, output)
run.assert_called_once_with(
[builder.sys.executable, str(package / 'scripts/build-ui.py'),
'--output', str(output)], cwd=root, check=True)
self.assertEqual(run.call_count, 2)
command = run.call_args.args[0]
self.assertEqual(command[0], str(compiler))
self.assertIn(str(package / 'ui/apps.zi'), command)
self.assertIn('kryon=' + str(root / 'cached-kryon/src/ui'), command)
self.assertIn(str(root / 'cached-ziran/std'), command)
self.assertNotIn('--project', command)
self.assertFalse(contexts[0].exists())
self.assertEqual((root / 'ziran.toml').read_text(), manifest)
self.assertEqual(json.loads((root / 'ziran.lock').read_text()), lock)
+1 -1
View File
@@ -28,7 +28,7 @@ spec.loader.exec_module(published_games)
def bundle_asset_paths(path):
"""Read the actual bundle index without loading its images or executing it."""
with published_games.Reader(path) as reader:
if reader.take(8) != b"ZX\0\0\x1a\0\0\0":
if reader.take(8) != b"ZX\0\0\x1b\0\0\0":
raise ValueError("Unsupported game bundle")
reader.text()
reader.text()
+2 -2
View File
@@ -22,7 +22,7 @@ def bundle(files):
def text(value):
return struct.pack("<I", len(value)) + value
data = b"ZX\0\0\x1a\0\0\0" + text(b"arcade") + text(b"Main")
data = b"ZX\0\0\x1b\0\0\0" + text(b"arcade") + text(b"Main")
data += struct.pack("<IIII", 0, 0, 0, 0) + struct.pack("<I", len(files))
for path in sorted(files):
data += text(path.encode()) + text(files[path])
@@ -63,7 +63,7 @@ class Handler(http.server.BaseHTTPRequestHandler):
self.end_headers()
self.wfile.write(b"{}")
return
body = response.get("body", b"ZX\0\0\x1a\0\0\0port")
body = response.get("body", b"ZX\0\0\x1b\0\0\0port")
self.send_response(response.get("status", 200))
self.send_header("Content-Type", response.get("type", "application/octet-stream"))
if "etag" in response:
+2 -2
View File
@@ -18,10 +18,10 @@ spec.loader.exec_module(web)
def bundle(files):
"""A minimal ZX v26 bundle: empty program sections, then its files."""
"""A minimal ZX v27 bundle: empty program sections, then its files."""
def text(value):
return struct.pack('<I', len(value)) + value
data = b'ZX\0\0\x1a\0\0\0' + text(b'art') + text(b'Main') + struct.pack('<IIII', 0, 0, 0, 0)
data = b'ZX\0\0\x1b\0\0\0' + text(b'art') + text(b'Main') + struct.pack('<IIII', 0, 0, 0, 0)
data += struct.pack('<I', len(files))
for path in sorted(files):
data += text(path.encode()) + text(files[path])
+72 -39
View File
@@ -20,24 +20,26 @@
},
{
"commit": "d74348c2e288ac55740461f7e106cda365b4db4a",
"dependencies": {"apps": "p9928fc15e7b93288", "crypto": "pc23fbf455e97614d", "curl": "p1ca0e8d3c19dbe4c", "daochi_client": "p7de54c8ad98fe034", "entity": "pb6d17ac2aeb5844f", "game2d": "pf2f54c7603f6e861", "kryon": "p43481d12b77897ce", "kss": "p1b13dda539ed2a39", "liboqs": "p1aaef6f156781e69", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p9079dde0fcc11248", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "p1d80baafaa5fa18a"},
"dependencies": {"apps": "p9928fc15e7b93288", "crypto": "pc23fbf455e97614d", "curl": "p1ca0e8d3c19dbe4c", "daochi_client": "p89503086b39ba0fb", "entity": "p18beca948f69fa8d", "game2d": "pf2f54c7603f6e861", "kryon": "pe5e9983467e15f53", "kss": "p1b13dda539ed2a39", "liboqs": "pf9af593c157b8edf", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p9079dde0fcc11248", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "p1d80baafaa5fa18a"},
"dependency_refs": {"apps": "master", "crypto": "master", "curl": "master", "daochi_client": "master", "entity": "master", "game2d": "master", "kryon": "master", "kss": "master", "liboqs": "main", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "master", "practices": "master", "qrcode": "master", "rini": "main", "sqlite": "master"},
"id": "p183b01bccc6424e7",
"name": "Inbe",
"ref": "master",
"url": "https://github.com/waozixyz/inbe.git"
},
{
"commit": "a9ad1876e14c2be093a538aca41fd3468fe3cf19",
"dependencies": {},
"id": "p1aaef6f156781e69",
"name": "liboqs",
"ref": "main",
"source": true,
"url": "https://github.com/open-quantum-safe/liboqs.git"
"commit": "2bcf6678635bd19e130654f7e962a9fc9bf3c0e1",
"dependencies": {"curl": "p1ca0e8d3c19dbe4c", "daochi_client": "p89503086b39ba0fb", "kryon": "pe5e9983467e15f53", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096", "zlib": "p1dff88558141400b"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "master", "kryon": "master", "monocypher": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "p18beca948f69fa8d",
"name": "Entity",
"ref": "master",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
"dependencies": {"kryon": "p43481d12b77897ce"},
"dependencies": {"kryon": "pe5e9983467e15f53"},
"dependency_refs": {"kryon": "master"},
"id": "p1b13dda539ed2a39",
"name": "Kss",
"ref": "master",
@@ -45,7 +47,8 @@
},
{
"commit": "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd",
"dependencies": {"apps": "p9928fc15e7b93288", "curl": "p1ca0e8d3c19dbe4c", "entity": "pb6d17ac2aeb5844f", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793"},
"dependencies": {"apps": "p9928fc15e7b93288", "curl": "p1ca0e8d3c19dbe4c", "entity": "p18beca948f69fa8d", "kryon": "pe5e9983467e15f53", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "master", "curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "entity": "master", "kryon": "master", "mingcute": "master"},
"id": "p1b5832789c5a5053",
"name": "Shovey",
"ref": "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd",
@@ -70,12 +73,13 @@
"url": "https://github.com/sqlite/sqlite.git"
},
{
"commit": "e1c1135dbd731560964ce26dc4529014eefcec5c",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p43481d12b77897ce",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
"commit": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
"dependencies": {},
"id": "p1dff88558141400b",
"name": "zlib",
"ref": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
"source": true,
"url": "https://github.com/madler/zlib.git"
},
{
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
@@ -88,7 +92,8 @@
},
{
"commit": "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p43481d12b77897ce"},
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pe5e9983467e15f53"},
"dependency_refs": {"crypto": "master", "kryon": "master"},
"id": "p6a59d2d6364debd6",
"name": "Apps",
"ref": "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a",
@@ -96,20 +101,13 @@
},
{
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
"dependencies": {"liboqs": "p1aaef6f156781e69"},
"dependencies": {"liboqs": "pf9af593c157b8edf"},
"dependency_refs": {"liboqs": "main"},
"id": "p7098ac9cd92f7e5f",
"name": "Oqs",
"ref": "master",
"url": "https://github.com/ziranlang/oqs.git"
},
{
"commit": "8250ece58a03f4d9c07cd8434780d659b54f5d7f",
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
"id": "p7de54c8ad98fe034",
"name": "DaochiClient",
"ref": "master",
"url": "https://github.com/ziranlang/daochi-client.git"
},
{
"commit": "f5f0a19a5dc6c14a49adb3cd63ea79a60f6ba77b",
"dependencies": {},
@@ -119,6 +117,15 @@
"source": true,
"url": "https://github.com/LoupVaillant/Monocypher.git"
},
{
"commit": "256fe6ff049d48a25dfe2a8b0db7ad84477fd282",
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
"dependency_refs": {"crypto": "master", "oqs": "master"},
"id": "p89503086b39ba0fb",
"name": "DaochiClient",
"ref": "master",
"url": "https://github.com/ziranlang/daochi-client.git"
},
{
"commit": "8b81994303400255ddb0ee2da49044dbaef4397f",
"dependencies": {},
@@ -130,7 +137,8 @@
},
{
"commit": "5b67236a8e355e67ce4f8cc0389b9ce3805b874b",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p43481d12b77897ce"},
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pe5e9983467e15f53"},
"dependency_refs": {"crypto": "master", "kryon": "master"},
"id": "p9928fc15e7b93288",
"name": "Apps",
"ref": "master",
@@ -138,7 +146,8 @@
},
{
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
"dependencies": {"kryon": "p43481d12b77897ce"},
"dependencies": {"kryon": "pe5e9983467e15f53"},
"dependency_refs": {"kryon": "master"},
"id": "pab5377a2950368a2",
"name": "plot",
"ref": "master",
@@ -146,23 +155,26 @@
},
{
"commit": "99d9ad777325e9dfc15cd8610056948819dc1f07",
"dependencies": {"apps": "p9928fc15e7b93288", "crypto": "pc23fbf455e97614d", "entity": "pb6d17ac2aeb5844f", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793"},
"dependencies": {"apps": "p9928fc15e7b93288", "crypto": "pc23fbf455e97614d", "entity": "p18beca948f69fa8d", "kryon": "pe5e9983467e15f53", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "master", "crypto": "master", "entity": "master", "kryon": "master", "mingcute": "master"},
"id": "pb4256918f4b7855d",
"name": "Apfelwurm",
"ref": "99d9ad777325e9dfc15cd8610056948819dc1f07",
"url": "https://github.com/waozixyz/wurm.git"
},
{
"commit": "33e54462886507cfb355f86e6d2d93cef7b2331c",
"dependencies": {"daochi_client": "p7de54c8ad98fe034", "kryon": "p43481d12b77897ce", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "pb6d17ac2aeb5844f",
"commit": "78a79e8bf19d72f6afd1a941bc410b75d08854a3",
"dependencies": {"curl": "p1ca0e8d3c19dbe4c", "daochi_client": "p89503086b39ba0fb", "kryon": "pe5e9983467e15f53", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096", "zlib": "p1dff88558141400b"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "master", "kryon": "master", "monocypher": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "pb4bafadac4ab4c11",
"name": "Entity",
"ref": "master",
"ref": "78a79e8bf19d72f6afd1a941bc410b75d08854a3",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "528618898db605b0f2960759d49871cde2209086",
"dependencies": {"apps": "p9928fc15e7b93288", "entity": "pb6d17ac2aeb5844f", "game2d": "pf2f54c7603f6e861", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793"},
"dependencies": {"apps": "p9928fc15e7b93288", "entity": "p18beca948f69fa8d", "game2d": "pf2f54c7603f6e861", "kryon": "pe5e9983467e15f53", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "master", "entity": "master", "game2d": "master", "kryon": "master", "mingcute": "master"},
"id": "pba7b4d6a4dcf84ae",
"name": "Choano",
"ref": "528618898db605b0f2960759d49871cde2209086",
@@ -184,9 +196,19 @@
"ref": "master",
"url": "https://github.com/kryonlabs/mingcute.git"
},
{
"commit": "ee9d204548295e6c6900939ba1120efe44659e79",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"dependency_refs": {"raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e"},
"id": "pe5e9983467e15f53",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "d32e4b606ece83e8869c954f66c334f44f7b4838",
"dependencies": {"kryon": "p43481d12b77897ce"},
"dependencies": {"kryon": "pe5e9983467e15f53"},
"dependency_refs": {"kryon": "master"},
"id": "pe878ed78ee9f8300",
"name": "Game2D",
"ref": "d32e4b606ece83e8869c954f66c334f44f7b4838",
@@ -203,20 +225,31 @@
},
{
"commit": "cee04692f3461dcb098833472f071c434980debb",
"dependencies": {"kryon": "p43481d12b77897ce"},
"dependencies": {"kryon": "pe5e9983467e15f53"},
"dependency_refs": {"kryon": "master"},
"id": "pf2f54c7603f6e861",
"name": "Game2D",
"ref": "master",
"url": "https://github.com/kryonlabs/game2d.git"
},
{
"commit": "e77d81dab791c13bf1c4e5d9a7160c403be9bbe0",
"dependencies": {},
"id": "pf9af593c157b8edf",
"name": "liboqs",
"ref": "main",
"source": true,
"url": "https://github.com/open-quantum-safe/liboqs.git"
}
],
"root": {
"dependencies": {"apps": "p6a59d2d6364debd6", "choano": "pba7b4d6a4dcf84ae", "entity": "pb6d17ac2aeb5844f", "game2d": "pe878ed78ee9f8300", "inbe": "p183b01bccc6424e7", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793", "shovey": "p1b5832789c5a5053", "wurm": "pb4256918f4b7855d", "wurm_art": "pef8c9ab30363ef38"},
"dependencies": {"apps": "p6a59d2d6364debd6", "choano": "pba7b4d6a4dcf84ae", "entity": "pb4bafadac4ab4c11", "game2d": "pe878ed78ee9f8300", "inbe": "p183b01bccc6424e7", "kryon": "pe5e9983467e15f53", "mingcute": "pe1027b9d16704793", "shovey": "p1b5832789c5a5053", "wurm": "pb4256918f4b7855d", "wurm_art": "pef8c9ab30363ef38"},
"dependency_refs": {"apps": "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a", "choano": "528618898db605b0f2960759d49871cde2209086", "entity": "78a79e8bf19d72f6afd1a941bc410b75d08854a3", "game2d": "d32e4b606ece83e8869c954f66c334f44f7b4838", "inbe": "master", "kryon": "master", "mingcute": "master", "shovey": "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd", "wurm": "99d9ad777325e9dfc15cd8610056948819dc1f07", "wurm_art": "2fa52f64eb0c29e8351b437176e896b938ece8e8"},
"name": "Arcade"
},
"toolchain": {
"commit": "a97e88b5b0a956c9c9977cce593ea4ecdb7ad72b",
"ref": "master",
"commit": "3f6234e9a181cdad20fac4fad1d1afb1b8ccf054",
"ref": "3f6234e9a181cdad20fac4fad1d1afb1b8ccf054",
"url": "https://github.com/ziranlang/ziran.git"
}
}
+2 -2
View File
@@ -7,7 +7,7 @@ bridge_modules = ["app"]
[toolchain]
git = "https://github.com/ziranlang/ziran.git"
ref = "master"
ref = "3f6234e9a181cdad20fac4fad1d1afb1b8ccf054"
[install]
bin = "arcade"
@@ -48,7 +48,7 @@ ref = "master"
[dependencies.entity]
git = "https://github.com/waozixyz/entity.git"
ref = "master"
ref = "78a79e8bf19d72f6afd1a941bc410b75d08854a3"
[dependencies.mingcute]
git = "https://github.com/kryonlabs/mingcute.git"