Load the signed Arcade library and previews with connection consent
This commit is contained in:
1 parent
c2fd3a8921
commit
d44f1eee22
27 files changed
+789
-149
No files matched your search
@@ -71,8 +71,6 @@ jobs:
|
||||
# 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
|
||||
# The Apps library that release packs, by the digest its own commit trusts.
|
||||
git show "$tag:apps-controller.sha256" > build/published/apps-controller.sha256
|
||||
echo "version=${tag#node-arcade-}" >> "$GITHUB_OUTPUT"
|
||||
- name: Build the browser edition
|
||||
run: |
|
||||
@@ -80,7 +78,7 @@ jobs:
|
||||
python3 scripts/build-entity.py
|
||||
python3 scripts/build-apps.py --output build/apps-ui
|
||||
python3 scripts/build-web.py --bundle build/published/arcade.zx \
|
||||
--controller-sha256 "$(cat build/published/apps-controller.sha256)" \
|
||||
--controller-sha256 "$(cat apps-controller.sha256)" \
|
||||
--version '${{ steps.published.outputs.version }}'
|
||||
rm -f build/web-site/runtime.html
|
||||
- name: Wait for the published games the browser will download
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# Arcade changelog
|
||||
|
||||
## 0.7.117
|
||||
|
||||
- Ask before connecting to the node for Arcade's signed app library and compressed previews, with an offline choice and a connection control.
|
||||
- Refresh library membership and game versions independently of the APK, keeping downloaded apps and saved progress available offline.
|
||||
- Recover library thumbnails after failed requests and keep the native host release version separate from catalog releases.
|
||||
|
||||
## 0.7.116
|
||||
|
||||
- Android Arcade downloads games and library thumbnails on demand instead of bundling the entire game library; installed games remain playable offline with saved progress.
|
||||
|
||||
@@ -15,7 +15,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 covers use thumbnails up to 640 pixels on their longest side, and logos up to 512 pixels, preserving full colours and transparency. Games keep their original artwork. The verified art bundle stays cached across restarts and is replaced when its content changes. The art lives in `assets/arcade/library/` (`python3 scripts/library-art.py` refreshes it when a game's art changes; the build stops until it does). Inner Breeze needs host interface 35 for it. Each game
|
||||
downloads when opened, with its existing identity and saved progress. This
|
||||
catalog requires Inner Breeze host API 34. Downloaded games work offline;
|
||||
catalog requires Inner Breeze host API 41. 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.
|
||||
|
||||
@@ -46,17 +46,19 @@ review are not implemented.
|
||||
|
||||
## Shared Apps library
|
||||
|
||||
Arcade embeds the shared `apps.zx` controller and artwork in a verified
|
||||
catalog. The catalog fixes the digest of every separately downloaded game. Each game package lists its apps in its own `apps.json`:
|
||||
Arcade includes the reviewed shared `apps.zx` controller and a small seed
|
||||
catalog. It asks before connecting to its node for the signed app library
|
||||
and compressed previews. The connection control can switch back to offline;
|
||||
verified cached apps, previews and saved progress remain available.
|
||||
The catalog fixes the digest of every separately downloaded game. Each game package lists its apps in its own `apps.json`:
|
||||
the app's `catalog.json`, and for an app the library opens from a cover, the
|
||||
cover's portrait art, landscape art, logo, caption and action. `games.json`
|
||||
names the game packages, and Arcade's own `apps.json` its own apps. Arcade
|
||||
presents every declared leaf directly, without a second chooser, and a cover
|
||||
opens its app straight into play or editing. Shovey’s separate standalone
|
||||
collection uses the same leaves and saves. Kryon’s shared `Carousel` handles
|
||||
navigation and painting. The local player does not offer node updates or OS
|
||||
actions it
|
||||
cannot perform. Inbe supplies its own account and package policy.
|
||||
navigation and painting. Library refreshes use the reusable Apps signed catalog
|
||||
loader and do not update the native host. Inbe supplies its own account and package policy.
|
||||
Arcade's launcher icon is MingCute's `game_2` gamepad (Apache-2.0).
|
||||
|
||||
An optional `artwork` mapping in `games.json` names a locked source-only
|
||||
|
||||
@@ -1 +1 @@
|
||||
600060d7a040bf558e110ccf991ebfc9eb2810042f503a111c7d7f20c20f1b17
|
||||
d9348aac9e83664a55510ec34acacf9e4bedb568ad47aa09474bb79121f98d02
|
||||
+2
-2
@@ -34,8 +34,8 @@
|
||||
"arcade": {
|
||||
"id": "inbe.arcade",
|
||||
"title": "Arcade",
|
||||
"version": "0.7.116",
|
||||
"sequence": 195,
|
||||
"version": "0.7.117",
|
||||
"sequence": 196,
|
||||
"host_api": 41
|
||||
},
|
||||
"wurm": {
|
||||
|
||||
@@ -2,7 +2,10 @@
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## 0.7.117
|
||||
|
||||
- Game and library updates arrive separately from native Arcade app updates.
|
||||
- Publish the verified game modules and compressed previews with the aligned shared host dependencies.
|
||||
|
||||
## 0.7.116
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
0.7.116
|
||||
0.7.117
|
||||
@@ -0,0 +1 @@
|
||||
196
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"origin": "https://api.waozi.xyz",
|
||||
"app_id": "inbe.arcade",
|
||||
"key_id": "inbe-2026-10",
|
||||
"public_key": "d9a549043c0ac91a5197d85053a815c831d342a1082143c2bd1ffd43e1e6f145"
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import struct
|
||||
import subprocess
|
||||
from functools import lru_cache
|
||||
from pathlib import Path
|
||||
from node_config import node_source
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
ESSENTIALS = {'arcade.zx', 'arcade.json', 'apps.zx', 'entity.zx', 'kryon-font.ttf'}
|
||||
@@ -78,6 +79,7 @@ def verify_assets(assets, essentials=True, edition='direct'):
|
||||
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 metadata.get('node') == node_source(ROOT), 'Node publisher binding differs from the reviewed host configuration'
|
||||
assert hashlib.sha256(assets['arcade.zx']).hexdigest() == metadata['sha256']
|
||||
trusted = (ROOT / 'apps-controller.sha256').read_text().strip()
|
||||
assert hashlib.sha256(assets['apps.zx']).hexdigest() == metadata['apps_sha256'] == trusted
|
||||
|
||||
@@ -5,6 +5,7 @@ import argparse
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
@@ -12,6 +13,13 @@ from PIL import Image
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
def native_release():
|
||||
version = (ROOT / 'VERSION').read_text().strip()
|
||||
code = int((ROOT / 'packaging/android/version-code').read_text().strip())
|
||||
if not re.fullmatch(r'(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)', version) or not 0 < code <= 2100000000:
|
||||
raise ValueError('Invalid native Android version or versionCode')
|
||||
return dict(version=version, sequence=code)
|
||||
|
||||
def package(name):
|
||||
return Path(subprocess.check_output([str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', name], cwd=ROOT, text=True).strip())
|
||||
|
||||
@@ -36,7 +44,7 @@ def stage_arcade():
|
||||
collection = ROOT / 'build/collection'
|
||||
receipt = json.loads((collection / 'receipt.json').read_text())
|
||||
release = json.loads((ROOT / 'apps/versions.json').read_text())['node_apps']['arcade']
|
||||
if receipt['version'] != release['version'] or receipt['version'] != (ROOT / 'VERSION').read_text().strip():
|
||||
if receipt['version'] != release['version'] or receipt['version'] != (ROOT / 'catalog/VERSION').read_text().strip():
|
||||
raise ValueError('The Arcade version changed; rebuild the collection first')
|
||||
controller = (collection / 'assets/apps/apps.zx').read_bytes()
|
||||
if hashlib.sha256(controller).hexdigest() != receipt['apps_sha256']:
|
||||
@@ -58,7 +66,7 @@ def stage_arcade():
|
||||
launcher_icon(ROOT / 'site/android-launcher-512.png', ROOT / 'build/android-res')
|
||||
# Only Arcade gets this adaptive icon; standalone Shovey keeps its art.
|
||||
shutil.copytree(ROOT / 'packaging/android/icon-res', ROOT / 'build/android-res', dirs_exist_ok=True)
|
||||
return release
|
||||
return native_release()
|
||||
|
||||
def stage_shovey():
|
||||
"""Shovey's standalone collection from Arcade's staging. Returns its release."""
|
||||
|
||||
@@ -11,6 +11,7 @@ import shutil
|
||||
import subprocess
|
||||
import tarfile
|
||||
from game_packages import declared_packages
|
||||
from node_config import node_source
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
MAX_PAYLOAD_BYTES = 64 * 1024 * 1024
|
||||
@@ -280,7 +281,7 @@ def main():
|
||||
receipt = dict(id=catalog["id"], version=version,
|
||||
sha256=digest(ROOT / "build/arcade.zx"),
|
||||
apps_sha256=args.apps_sha256, children=catalog["children"], art=art,
|
||||
source_mode="project")
|
||||
source_mode="project", node=node_source(ROOT))
|
||||
(output / "receipt.json").write_text(json.dumps(receipt, indent=2) + "\n")
|
||||
(ROOT / "build/arcade.json").write_text(json.dumps(receipt, indent=2) + "\n")
|
||||
node_receipt = receipt | {"sha256": digest(node_apps / "arcade.zx")}
|
||||
|
||||
@@ -44,7 +44,7 @@ def build(ziran, lock_flags):
|
||||
if not compiler.is_file():
|
||||
compiler = ROOT / "build/toolchain/bin/ziran"
|
||||
# Resolve transitive packages from Arcade's lock, never their private graphs.
|
||||
daochi_client = package("DaochiClient")
|
||||
daochi_client = package("daochi_client")
|
||||
crypto = package("crypto")
|
||||
entries = []
|
||||
apps = dependency_order(declared_apps(ROOT, ziran, lock_flags))
|
||||
|
||||
@@ -218,10 +218,11 @@ def main():
|
||||
args.controller_sha256 = receipt['apps_sha256']
|
||||
args.version = receipt['version']
|
||||
else:
|
||||
from node_config import node_source
|
||||
bundle = args.bundle.resolve()
|
||||
receipt = dict(id='inbe.arcade', version=args.version,
|
||||
sha256=hashlib.sha256(bundle.read_bytes()).hexdigest(),
|
||||
apps_sha256=args.controller_sha256)
|
||||
apps_sha256=args.controller_sha256, node=node_source(ROOT))
|
||||
# The host reads the receipt into a 4 KiB buffer.
|
||||
text = json.dumps(receipt, separators=(',', ':')) if args.shovey else json.dumps(receipt, indent=2) + '\n'
|
||||
if len(text.encode()) >= 4096:
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
"""The native host's reviewed public node publisher binding."""
|
||||
import json
|
||||
import re
|
||||
|
||||
|
||||
def node_source(root):
|
||||
source = json.loads((root / 'packaging/node.json').read_text())
|
||||
if (set(source) != {'origin', 'app_id', 'key_id', 'public_key'}
|
||||
or source['origin'] != 'https://api.waozi.xyz'
|
||||
or source['app_id'] != 'inbe.arcade'
|
||||
or not re.fullmatch(r'[a-z0-9][a-z0-9.-]{0,62}', source['key_id'])
|
||||
or not re.fullmatch(r'[a-f0-9]{64}', source['public_key'])):
|
||||
raise ValueError('Invalid reviewed node publisher binding')
|
||||
sequence = json.loads((root / 'apps/versions.json').read_text())['node_apps']['arcade']['sequence']
|
||||
if type(sequence) is not int or not 1 <= sequence <= 2147483647:
|
||||
raise ValueError('Invalid catalog release floor')
|
||||
return source | {'minimum_sequence': sequence}
|
||||
@@ -28,6 +28,10 @@ collection_package_files: *AppFiles;
|
||||
// Packages the platform already holds, read-only and verified like a
|
||||
// download: the website's own copy of the library art. "" for none.
|
||||
collection_package_folder: string;
|
||||
// Set by the host's origin-specific connection choice. Cached bytes do not
|
||||
// need a connection; no new transfer is permitted while it is off.
|
||||
collection_package_allowed: bool;
|
||||
collection_package_origin: string;
|
||||
package_c :: #system_library "c";
|
||||
PackageFree :: (memory: *void) #foreign package_c "free";
|
||||
CollectionDownloadsOpen :: (files: *AppFiles) { collection_package_files = files }
|
||||
@@ -120,11 +124,12 @@ CollectionFetch :: (context: *void, account: string, parent: *AppNode,
|
||||
if operation != APPS_INSTALL { return false }
|
||||
// Cached installs and removals use the host's ordinary saved state.
|
||||
if package.bytes != "" { return false }
|
||||
if !collection_package_allowed { reply.status = APPS_REJECTED; return true }
|
||||
if package.transfer.status != .Downloading {
|
||||
FileDownloadRelease(*package.transfer)
|
||||
package.failed = false
|
||||
base := EnvironmentText("ARCADE_PACKAGE_ORIGIN")
|
||||
if base == "" { base = "https://api.waozi.xyz" }
|
||||
base := collection_package_origin
|
||||
if base == "" { return false }
|
||||
url: Vec(u8)
|
||||
BuilderPrint(*url, "%/api/v2/packages/inbe.arcade/%.zx", base, TextUntilNul(package.digest[:]))
|
||||
address := BuilderFinish(url)
|
||||
@@ -136,6 +141,28 @@ CollectionFetch :: (context: *void, account: string, parent: *AppNode,
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionDownloadsBusy :: () -> bool {
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
if package.transfer.status == .Downloading { return true }
|
||||
package = package.next
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
CollectionDownloadsAllow :: (allowed: bool) {
|
||||
collection_package_allowed = allowed
|
||||
if allowed { return }
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
if package.transfer.status == .Downloading {
|
||||
FileDownloadRelease(*package.transfer)
|
||||
package.failed = true
|
||||
}
|
||||
package = package.next
|
||||
}
|
||||
}
|
||||
|
||||
CollectionDownloadsPump :: () {
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
|
||||
+213
-1
@@ -53,6 +53,9 @@ Codec :: #import "apps/node_codec";
|
||||
#import "kryon/image_raster"
|
||||
#import "kryon/loading_indicator"
|
||||
#import, file "collection_loading.zi";
|
||||
#import "apps/connection"
|
||||
#import "apps/remote_catalog"
|
||||
Labels :: #import "apps/words";
|
||||
#import "shovey/shovey_theme"
|
||||
ProfileIcon :: #import "mingcute/mingcute_regular_user_4";
|
||||
DewIcon :: #import "mingcute/mingcute_filled_drop";
|
||||
@@ -499,6 +502,12 @@ CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
|
||||
opened := AppFilesOpen(*collection_resources, collection_resource_root)
|
||||
if !opened { Report("Arcade: cannot open the private resources folder"); return false }
|
||||
CollectionDownloadsOpen(*collection_resources)
|
||||
return CollectionStart(bundle, digest, harness_digest, locale, packed)
|
||||
}
|
||||
|
||||
// Replacing a verified catalog reuses the host services and per-game saves.
|
||||
CollectionStart :: (bundle: string, digest: string, harness_digest: string,
|
||||
locale: string, packed: bool) -> bool {
|
||||
platform := AppPlatform.{.allows = CollectionAllows, .call = CollectionCall,
|
||||
.widgets = CollectionWidgets, .save = CollectionSave, .state = CollectionState,
|
||||
.effect = CollectionEffect, .host_api = GAME_HOST_API,
|
||||
@@ -555,7 +564,23 @@ CollectionOpenBytes :: (bytes: string, metadata: string, data: string) -> bool {
|
||||
locale := EnvironmentText("LANG")
|
||||
language := ifx locale.count >= 2 then locale[:2] else "en"
|
||||
packed := AppsReadText(metadata, 0, "games", games[:]) && TextUntilNul(games[:]) == "packed"
|
||||
return CollectionOpen(bytes, TextUntilNul(digest[:]), TextUntilNul(harness[:]), data, language, packed)
|
||||
selected := bytes
|
||||
selected_digest := TextUntilNul(digest[:])
|
||||
if !packed {
|
||||
if !CollectionNodeOpen(metadata, data, bytes, selected_digest, TextUntilNul(harness[:]), language) { return false }
|
||||
if collection_node.ready {
|
||||
selected = collection_node.bytes
|
||||
selected_digest = TextUntilNul(collection_node.release.artifacts[0].sha256[:])
|
||||
}
|
||||
}
|
||||
opened := CollectionOpen(selected, selected_digest, TextUntilNul(harness[:]), data, language, packed)
|
||||
if !opened && !packed && collection_node_remote {
|
||||
collection_node_remote = false
|
||||
collection_node.failed = true
|
||||
opened = CollectionStart(collection_seed, TextUntilNul(collection_seed_digest[:]),
|
||||
TextUntilNul(collection_harness_digest[:]), language, false)
|
||||
}
|
||||
return opened
|
||||
}
|
||||
|
||||
// The standalone player needs only Shovey's own payload and metadata. Its
|
||||
@@ -613,6 +638,7 @@ CollectionCollect :: () {
|
||||
if entity_ready { EntityPump() }
|
||||
PublicationsReadPump()
|
||||
AppHostCollect(*collection_host)
|
||||
CollectionNodePump()
|
||||
for path: collection_frame_paths { AppFileFree(path) }
|
||||
while collection_frame_paths.count > 0 { unused VecPop(collection_frame_paths) }
|
||||
collection_widget_node = null
|
||||
@@ -622,6 +648,7 @@ CollectionClose :: () -> bool {
|
||||
if !EntityClose() { return false }
|
||||
if collection_ready && !AppHostStop(*collection_host) { return false }
|
||||
collection_ready = false
|
||||
CollectionNodeClose()
|
||||
collection_loading = .{}
|
||||
CollectionDownloadsClose()
|
||||
CollectionCollect()
|
||||
@@ -761,6 +788,7 @@ CollectionUpdatesQuestion :: (session: Session, viewport: Rectangle) {
|
||||
CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers: s32) -> bool {
|
||||
collection_toolbar_visible = true
|
||||
defer { CollectionToolbar(session, viewport) }
|
||||
if CollectionNodeScreen(session, viewport) { collection_toolbar_visible = false; return true }
|
||||
if entity_visible { return EntityFrame(session, viewport, key, modifiers) }
|
||||
runtime := AppHostActiveRuntime(*collection_host)
|
||||
if runtime == null { Report("Arcade: no app is running\n"); return false }
|
||||
@@ -778,6 +806,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
asking := runtime.node.collection && !collection_host.platform.presentation.cover_grid && CollectionUpdates() == 2
|
||||
if asking { key = 0 }
|
||||
top: s32 = ifx !covered && !runtime.node.collection && (entity_ready || nested) then 56 else 0
|
||||
if runtime.node.collection && collection_node.files != null { top = 88 }
|
||||
now := cast(float64)MonotonicMilliseconds() / 1000.0
|
||||
runtime.app.session = session
|
||||
runtime.app.bounds = Rectangle.{viewport.x, viewport.y + cast(float32)top, viewport.width, viewport.height - cast(float32)top}
|
||||
@@ -836,6 +865,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
}
|
||||
} else if runtime.node.collection {
|
||||
collection_loading = .{}
|
||||
CollectionNodeToolbar(session, viewport)
|
||||
}
|
||||
if asking {
|
||||
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
|
||||
@@ -886,3 +916,185 @@ CollectionToolbar :: (session: Session, viewport: Rectangle) {
|
||||
|
||||
c :: #system_library "c";
|
||||
CollectionFree :: (memory: *void) #foreign c "free";
|
||||
|
||||
// The native host composes the shared Apps connection and signed catalog.
|
||||
// Replacing a root uses the same services and saved-game namespaces.
|
||||
collection_node: AppRemoteCatalog;
|
||||
collection_node_files: AppFiles;
|
||||
collection_node_root: string;
|
||||
collection_node_choice: s32;
|
||||
collection_node_notice: bool;
|
||||
collection_node_initial: bool;
|
||||
collection_node_apply: bool;
|
||||
collection_node_remote: bool;
|
||||
collection_seed: string;
|
||||
collection_seed_digest: [65]u8;
|
||||
collection_harness_digest: [65]u8;
|
||||
collection_node_locale: [16]u8;
|
||||
|
||||
collection_signature :: #system_library "c";
|
||||
CollectionCheckSignature :: (signature: *u8, public_key: *u8, message: *u8,
|
||||
length: usize) -> s32 #foreign collection_signature "crypto_ed25519_check";
|
||||
CollectionVerifyRelease :: (signature: *u8, public_key: *u8, message: *u8,
|
||||
length: usize) -> bool { return CollectionCheckSignature(signature, public_key, message, length) == 0 }
|
||||
|
||||
CollectionNodeOpen :: (metadata: string, data: string, seed: string,
|
||||
digest: string, harness: string, locale: string) -> bool {
|
||||
source: AppRemoteSource
|
||||
source.oldest_host_api = 1
|
||||
source.host_api = GAME_HOST_API
|
||||
source.module_api = 2
|
||||
at := FieldAt(metadata, 0, "node")
|
||||
if at < 0 || !AppRemoteSourceRead(metadata, at, *source) || TextUntilNul(source.app_id[:]) != "inbe.arcade" { return false }
|
||||
// Private loopback fixtures can exercise the real transport. A production
|
||||
// environment variable cannot silently redirect a publisher's requests.
|
||||
test_origin := EnvironmentText("ARCADE_PACKAGE_ORIGIN")
|
||||
if test_origin.count > 17 && test_origin[:17] == "http://127.0.0.1:" && AppRemoteOriginValid(test_origin) {
|
||||
unused CopyCString(test_origin, source.origin[:])
|
||||
}
|
||||
collection_node_root = Join(data, "node")
|
||||
if !AppFilesOpen(*collection_node_files, collection_node_root) { return false }
|
||||
if !AppRemoteCatalogOpen(*collection_node, source, *collection_node_files, CollectionVerifyRelease) { return false }
|
||||
collection_seed = AppRemoteCopy(seed)
|
||||
unused CopyCString(digest, collection_seed_digest[:])
|
||||
unused CopyCString(harness, collection_harness_digest[:])
|
||||
unused CopyCString(locale, collection_node_locale[:])
|
||||
collection_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
|
||||
if allowed { unused AppRemoteCatalogRefresh(*collection_node) }
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionNodeChoose :: (choice: s32) -> bool {
|
||||
if !AppConnectionRemember(*collection_node_files, collection_package_origin, choice) { return false }
|
||||
collection_node_choice = choice
|
||||
collection_node_notice = false
|
||||
allowed := choice == APP_CONNECTION_ALLOWED
|
||||
CollectionDownloadsAllow(allowed)
|
||||
AppRemoteCatalogAllow(*collection_node, allowed)
|
||||
if allowed {
|
||||
collection_node_initial = !collection_node_remote
|
||||
collection_node_apply = true
|
||||
unused AppRemoteCatalogRefresh(*collection_node)
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionNodeActivate :: () -> bool {
|
||||
if !collection_node.changed || CollectionDownloadsBusy() { return false }
|
||||
runtime := AppHostActiveRuntime(*collection_host)
|
||||
if runtime == null || !runtime.node.collection { return false }
|
||||
if !AppHostStop(*collection_host) { return false }
|
||||
collection_ready = false
|
||||
{
|
||||
bytes := collection_node.bytes
|
||||
digest := TextUntilNul(collection_node.release.artifacts[0].sha256[:])
|
||||
collection_ready = CollectionStart(bytes, digest, TextUntilNul(collection_harness_digest[:]),
|
||||
TextUntilNul(collection_node_locale[:]), false)
|
||||
}
|
||||
if collection_ready {
|
||||
collection_node_remote = true
|
||||
AppRemoteCatalogCollect(*collection_node)
|
||||
} else {
|
||||
// Keep the former library and every game's separate save namespace.
|
||||
if collection_node.previous_bytes != "" {
|
||||
unused AppRemoteCatalogRestore(*collection_node)
|
||||
} else {
|
||||
unused AppFileWrite(*collection_node_files, "current.json", "")
|
||||
collection_node_remote = false
|
||||
collection_node.changed = false
|
||||
collection_node.failed = true
|
||||
}
|
||||
old_bytes := ifx collection_node_remote then collection_node.bytes else collection_seed
|
||||
old_digest := ifx collection_node_remote then TextUntilNul(collection_node.release.artifacts[0].sha256[:]) else TextUntilNul(collection_seed_digest[:])
|
||||
collection_ready = CollectionStart(old_bytes, old_digest, TextUntilNul(collection_harness_digest[:]),
|
||||
TextUntilNul(collection_node_locale[:]), false)
|
||||
}
|
||||
collection_loading = .{}
|
||||
return collection_ready
|
||||
}
|
||||
|
||||
CollectionNodePump :: () {
|
||||
if collection_node.files == null { return }
|
||||
AppRemoteCatalogPump(*collection_node)
|
||||
if collection_node_apply && collection_node.stage == 0 {
|
||||
if collection_node.changed && !CollectionNodeActivate() { return }
|
||||
collection_node_apply = false
|
||||
collection_node_initial = false
|
||||
}
|
||||
}
|
||||
|
||||
// Returns true when the notice/loading screen owns this frame's input.
|
||||
CollectionNodeScreen :: (session: Session, viewport: Rectangle) -> bool {
|
||||
if collection_node.files == null { return false }
|
||||
if collection_node_notice {
|
||||
choice := AppConnectionNotice(session, viewport, TextUntilNul(collection_node_locale[:]),
|
||||
collection_package_origin, cast(u64)49500)
|
||||
if choice != APP_CONNECTION_UNDECIDED { unused CollectionNodeChoose(choice) }
|
||||
return true
|
||||
}
|
||||
if collection_node_initial && collection_node.stage != 0 {
|
||||
Box(session, BoxProps.{.key = cast(u64)49510, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
|
||||
Text(session, TextProps.{.key = cast(u64)49511, .text = Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "loading_library"),
|
||||
.font = 20, .bounds = Rectangle.{viewport.x + 24.0, viewport.y + viewport.height / 2.0, viewport.width - 48.0, 64.0}})
|
||||
if Button(session, ButtonProps.{.key = cast(u64)49512, .id = 49512,
|
||||
.label = Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "stay_offline"),
|
||||
.bounds = Rectangle.{viewport.x + 24.0, viewport.y + viewport.height / 2.0 + 72.0, viewport.width - 48.0, 44.0},
|
||||
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
|
||||
unused CollectionNodeChoose(APP_CONNECTION_OFFLINE)
|
||||
}
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
CollectionNodeToolbar :: (session: Session, viewport: Rectangle) {
|
||||
if collection_node.files == null { return }
|
||||
unused WidgetPaletteUse(session, AppCoversPalette())
|
||||
defer { unused WidgetPaletteRestore(session) }
|
||||
Box(session, BoxProps.{.key = cast(u64)49519,
|
||||
.bounds = Rectangle.{viewport.x, viewport.y, viewport.width, 88.0},
|
||||
.fill = Color.{17, 18, 35, 255}})
|
||||
locale := TextUntilNul(collection_node_locale[:])
|
||||
allowed := collection_node_choice == APP_CONNECTION_ALLOWED
|
||||
status := ifx !allowed then "offline_library" else ifx collection_node.stage != 0 then "loading_library" else ifx collection_node.failed then "library_unavailable" else "saved_library"
|
||||
width := ifx viewport.width - 180.0 < 320.0 then viewport.width - 180.0 else 320.0
|
||||
if Button(session, ButtonProps.{.key = cast(u64)49520, .id = 49520,
|
||||
.label = Labels.AppsLabel(locale, ifx allowed then "refresh_library" else "connect_node"),
|
||||
.bounds = Rectangle.{viewport.x + 8.0, viewport.y + 6.0, width, 44.0},
|
||||
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
|
||||
if !allowed { collection_node_notice = true }
|
||||
else if collection_node.changed { collection_node_apply = true }
|
||||
else { collection_node_apply = true; unused AppRemoteCatalogRefresh(*collection_node) }
|
||||
}
|
||||
// A separate connection control keeps revocation available after consent.
|
||||
if Button(session, ButtonProps.{.key = cast(u64)49521, .id = 49521,
|
||||
.label = Labels.AppsLabel(locale, "node_connection"),
|
||||
.bounds = Rectangle.{viewport.x + viewport.width - 170.0, viewport.y + 52.0, 158.0, 28.0},
|
||||
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
|
||||
collection_node_notice = true
|
||||
}
|
||||
Text(session, TextProps.{.key = cast(u64)49522, .text = Labels.AppsLabel(locale, status), .font = 12, .wrap = TextWrap.TextWrapAuto,
|
||||
.bounds = Rectangle.{viewport.x + 16.0, viewport.y + 58.0, viewport.width - 196.0, 26.0}})
|
||||
}
|
||||
|
||||
CollectionNodeClose :: () {
|
||||
CollectionDownloadsAllow(false)
|
||||
AppFileFree(collection_package_origin)
|
||||
collection_package_origin = ""
|
||||
AppRemoteCatalogClose(*collection_node)
|
||||
AppFilesClose(*collection_node_files)
|
||||
AppFileFree(collection_node_root)
|
||||
AppFileFree(collection_seed)
|
||||
collection_node_root = ""
|
||||
collection_seed = ""
|
||||
collection_node_notice = false
|
||||
collection_node_initial = false
|
||||
collection_node_apply = false
|
||||
collection_node_remote = false
|
||||
}
|
||||
@@ -55,6 +55,14 @@ class AndroidCatalogTests(unittest.TestCase):
|
||||
def test_standard_catalog(self):
|
||||
verify_assets(self.assets)
|
||||
|
||||
def test_reject_changed_node_trust_binding(self):
|
||||
for key, value in (('origin', 'https://example.org'), ('public_key', 'a' * 64),
|
||||
('app_id', 'inbe.other'), ('minimum_sequence', 0)):
|
||||
metadata = json.loads(self.assets['arcade.json'])
|
||||
metadata['node'][key] = value
|
||||
with self.subTest(field=key), self.assertRaisesRegex(AssertionError, 'publisher binding'):
|
||||
verify_assets(self.assets | {'arcade.json': json.dumps(metadata).encode()})
|
||||
|
||||
def test_reject_game_or_thumbnail_beside_catalog(self):
|
||||
for name in ('games/shovey.zx', 'covers/shovey.png'):
|
||||
with self.subTest(name=name), self.assertRaises(AssertionError):
|
||||
|
||||
@@ -116,6 +116,14 @@ with tempfile.TemporaryDirectory(prefix='host-', dir=output) as temporary, packa
|
||||
# The profile stays usable with its optional game sheets omitted.
|
||||
driver.wait(label='Back', role='button')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Account', role='text')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.key('escape')
|
||||
driver.wait(label='Node connection', role='button')
|
||||
driver.press(label='Node connection', role='button')
|
||||
driver.wait(label='Stay offline', role='button')
|
||||
driver.press(label='Stay offline', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
saved = record.read_bytes()
|
||||
for name in ('shovey', 'shovey-editor', 'wurm'):
|
||||
entry = entries[name]
|
||||
|
||||
@@ -26,6 +26,7 @@ def load(name, script):
|
||||
|
||||
builder = load('collection_versions', 'build-collection.py')
|
||||
release = load('android_release_versions', 'android-release.py')
|
||||
native_builder = load('android_native_versions', 'build-android.py')
|
||||
|
||||
|
||||
class Fixture(unittest.TestCase):
|
||||
@@ -37,6 +38,8 @@ class Fixture(unittest.TestCase):
|
||||
self.root = Path(temporary.name)
|
||||
for directory in ('scripts', 'apps', 'catalog'):
|
||||
(self.root / directory).mkdir()
|
||||
(self.root / 'packaging').mkdir()
|
||||
shutil.copyfile(ROOT / 'packaging/node.json', self.root / 'packaging/node.json')
|
||||
|
||||
|
||||
class SynchronizerTests(Fixture):
|
||||
@@ -50,8 +53,12 @@ class SynchronizerTests(Fixture):
|
||||
" manifest=Path('apps/catalog.json'))]\n")
|
||||
(self.root / 'CHANGELOG.md').write_text('## [Unreleased]\n\n- Later host.\n\n## 0.7.117\n')
|
||||
(self.root / 'VERSION').write_text('0.7.116\n')
|
||||
(self.root / 'packaging/android').mkdir(parents=True)
|
||||
(self.root / 'packaging/android/version-code').write_text('195\n')
|
||||
(self.root / 'catalog/CHANGELOG.md').write_text('## 0.7.118\n\n- New games.\n')
|
||||
(self.root / 'catalog/VERSION').write_text('0.7.116\n')
|
||||
(self.root / 'packaging').mkdir(exist_ok=True)
|
||||
shutil.copyfile(ROOT / 'packaging/node.json', self.root / 'packaging/node.json')
|
||||
(self.root / 'apps/CHANGELOG.md').write_text('## [1.0.0] - 2026-10-31\n')
|
||||
self.original = {'node_apps': {
|
||||
'arcade': {'id': 'inbe.arcade', 'version': '0.7.116', 'sequence': 120},
|
||||
@@ -70,6 +77,7 @@ class SynchronizerTests(Fixture):
|
||||
def test_catalog_release_never_bumps_host_and_is_idempotent(self):
|
||||
ledger = self.sync('--catalog')
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.116\n')
|
||||
self.assertEqual((self.root / 'packaging/android/version-code').read_text(), '195\n')
|
||||
self.assertEqual((self.root / 'catalog/VERSION').read_text(), '0.7.118\n')
|
||||
self.assertEqual((ledger['arcade']['version'], ledger['arcade']['sequence']), ('0.7.118', 121))
|
||||
self.assertEqual(ledger['game'], self.original['node_apps']['game'])
|
||||
@@ -79,8 +87,25 @@ class SynchronizerTests(Fixture):
|
||||
(self.root / 'catalog/CHANGELOG.md').write_text('## 0.7.116\n')
|
||||
ledger = self.sync()
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.117\n')
|
||||
self.assertEqual((self.root / 'packaging/android/version-code').read_text(), '196\n')
|
||||
self.assertEqual(ledger, self.original['node_apps'])
|
||||
self.assertEqual(builder.catalog_version(self.root), '0.7.116')
|
||||
self.assertEqual(self.sync(), ledger)
|
||||
self.assertEqual((self.root / 'packaging/android/version-code').read_text(), '196\n')
|
||||
|
||||
def test_native_apk_identity_ignores_catalog_sequence(self):
|
||||
with patch.object(native_builder, 'ROOT', self.root):
|
||||
self.assertEqual(native_builder.native_release(), {'version': '0.7.116', 'sequence': 195})
|
||||
self.sync('--catalog')
|
||||
with patch.object(native_builder, 'ROOT', self.root):
|
||||
self.assertEqual(native_builder.native_release(), {'version': '0.7.116', 'sequence': 195})
|
||||
|
||||
def test_invalid_native_code_preserves_all_versions(self):
|
||||
(self.root / 'packaging/android/version-code').write_text('0\n')
|
||||
self.sync(success=False)
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.116\n')
|
||||
self.assertEqual((self.root / 'catalog/VERSION').read_text(), '0.7.116\n')
|
||||
self.assertEqual(json.loads((self.root / 'apps/versions.json').read_text()), self.original)
|
||||
|
||||
def test_catalog_release_updates_game_ledger_from_its_own_changelog(self):
|
||||
(self.root / 'apps/CHANGELOG.md').write_text('## [1.0.1] - 2026-10-31\n')
|
||||
@@ -128,6 +153,9 @@ class AndroidVerifierTests(Fixture):
|
||||
self.metadata = {'id': 'inbe.arcade', 'version': '0.7.116',
|
||||
'sha256': hashlib.sha256(payload).hexdigest(),
|
||||
'apps_sha256': self.controller_digest, 'children': [], 'art': catalog['art']}
|
||||
ledger = {'node_apps': {'arcade': {'sequence': 195}}}
|
||||
(self.root / 'apps/versions.json').write_text(json.dumps(ledger))
|
||||
self.metadata['node'] = builder.node_source(self.root)
|
||||
self.assets = {'assets/arcade.zx': payload, 'assets/apps.zx': controller,
|
||||
'assets/entity.zx': bundle({}), 'assets/kryon-font.ttf': b'font',
|
||||
'res/icon.png': b'icon', 'lib/arm64-v8a/libmain.so': b'arm64',
|
||||
|
||||
@@ -18,7 +18,15 @@ from PIL import Image
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_library_question(driver):
|
||||
"""Keep the test's bundled levels when the library asks about updates."""
|
||||
"""Consent to the loopback library, keeping bundled game levels."""
|
||||
deadline = time.monotonic() + 60
|
||||
while time.monotonic() < deadline:
|
||||
if driver.find(label='Connect', role='button', visible=True):
|
||||
driver.press(label='Connect', role='button')
|
||||
break
|
||||
if driver.find(label='Shovey', role='button', visible=True):
|
||||
break
|
||||
driver.wait_idle(frames=3)
|
||||
driver.wait(label='Shovey', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
|
||||
@@ -0,0 +1,272 @@
|
||||
"""Private host test: consent, signed node membership, art and offline cache."""
|
||||
import argparse
|
||||
import contextlib
|
||||
import hashlib
|
||||
import http.server
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import struct
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import threading
|
||||
from PIL import Image
|
||||
|
||||
from cryptography.hazmat.primitives import serialization
|
||||
from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def capture_window(child, path):
|
||||
window = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)],
|
||||
text=True, timeout=10).splitlines()[0]
|
||||
assert int(subprocess.check_output(['xdotool', 'getwindowpid', window], text=True, timeout=10)) == child.pid
|
||||
subprocess.run(['import', '-window', window, str(path)], check=True, timeout=10)
|
||||
return path
|
||||
|
||||
|
||||
def live_library(binary, driver, work):
|
||||
"""Use a disposable profile against the real public node; download no game."""
|
||||
import time
|
||||
from android_catalog import catalog_assets
|
||||
with tempfile.TemporaryDirectory(dir=work) as temporary:
|
||||
profile = Path(temporary)
|
||||
log_path = work / 'live-node.log'
|
||||
with log_path.open('w') as log:
|
||||
child = subprocess.Popen([str(binary.resolve())], cwd=ROOT,
|
||||
env=os.environ | driver.environment() | {'ARCADE_DATA': str(profile),
|
||||
'ENTITY_DATA': str(profile / 'entity'), 'LANG': 'en_US.UTF-8'},
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
driver.wait(label='Connect', role='button', timeout=60)
|
||||
driver.press(label='Connect', role='button')
|
||||
driver.wait(label='Apfelwurm Editor', role='button', timeout=60)
|
||||
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']
|
||||
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())
|
||||
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:
|
||||
driver.wait_idle(frames=5)
|
||||
assert art.stat().st_size == catalog['art']['bytes']
|
||||
with art.open('rb') as stream:
|
||||
assert hashlib.file_digest(stream, 'sha256').hexdigest() == catalog['art']['sha256']
|
||||
driver.wait_idle(frames=40)
|
||||
card = driver.wait(label='Shovey', role='button')
|
||||
with Image.open(capture_window(child, work / 'live-node-library.png')) as image:
|
||||
crop = image.crop((card['x'], card['y'], card['x'] + card['width'], card['y'] + card['height']))
|
||||
assert len(crop.convert('RGB').getcolors(1000000) or []) > 500
|
||||
cached = {path.stem for path in (profile / 'resources/downloads').glob('*.zx')}
|
||||
assert cached == {catalog['art']['sha256']}, 'No game payload may download during library browsing'
|
||||
print('Live node signed catalog and verified thumbnail pixels passed:', metadata['version'])
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.terminate()
|
||||
child.wait(timeout=10)
|
||||
|
||||
|
||||
def with_catalog(payload, catalog):
|
||||
"""Keep the real root program and replace only its fixture catalog asset."""
|
||||
assert len(payload) <= 262144
|
||||
source = io.BytesIO(payload)
|
||||
def number():
|
||||
return struct.unpack('<I', source.read(4))[0]
|
||||
def text():
|
||||
return source.read(number())
|
||||
assert source.read(8) == b'ZX\0\0\x1b\0\0\0'
|
||||
text(); text()
|
||||
for _ in range(number()):
|
||||
text(); text()
|
||||
for _ in range(number()):
|
||||
for _ in range(7):
|
||||
text()
|
||||
source.read(8); text(); source.read(4)
|
||||
for _ in range(number()):
|
||||
text(); text(); text()
|
||||
source.read(number())
|
||||
prefix = payload[:source.tell()]
|
||||
assets = {text(): text() for _ in range(number())}
|
||||
assert not source.read(1)
|
||||
assets[b'assets/apps/catalog.json'] = json.dumps(catalog).encode()
|
||||
def packed(value):
|
||||
return struct.pack('<I', len(value)) + value
|
||||
return prefix + struct.pack('<I', len(assets)) + b''.join(
|
||||
packed(name) + packed(value) for name, value in assets.items())
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--binary', type=Path, required=True)
|
||||
parser.add_argument('--inbe-source', type=Path, required=True)
|
||||
parser.add_argument('--apps-source', type=Path, required=True)
|
||||
parser.add_argument('--live', action='store_true', help='Verify the real public node using a disposable profile')
|
||||
args = parser.parse_args()
|
||||
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 400
|
||||
assert os.environ['YUE_DESKTOP_RECOVERY'] == '0'
|
||||
subprocess.run(['git', 'check-ignore', 'work/node-library-ui/data'], cwd=ROOT, check=True)
|
||||
sys.path[:0] = [str(args.inbe_source / 'tests'), str(args.apps_source / 'tests'), str(ROOT / 'scripts')]
|
||||
from ui_driver import UiDriver
|
||||
from remote_catalog_test import descriptor
|
||||
from android_catalog import catalog_assets
|
||||
work = ROOT / 'work/node-library-ui'
|
||||
work.mkdir(parents=True, exist_ok=True)
|
||||
driver = UiDriver(work / 'driver')
|
||||
if args.live:
|
||||
live_library(args.binary, driver, work)
|
||||
return
|
||||
key = Ed25519PrivateKey.generate()
|
||||
seed = (ROOT / 'build/arcade.zx').read_bytes()
|
||||
catalog = catalog_assets(seed)
|
||||
entry = next(child for child in catalog['children'] if child['expected_id'] == 'shovey')
|
||||
first_entry = dict(entry, title='Node Shovey')
|
||||
if 'cover' in entry:
|
||||
first_entry['cover'] = dict(entry['cover'], caption='Node Shovey')
|
||||
first = dict(catalog, children=[first_entry])
|
||||
payloads = [with_catalog(seed, first), with_catalog(seed, catalog)]
|
||||
digests = [hashlib.sha256(data).hexdigest() for data in payloads]
|
||||
state = {'revision': 0, 'requests': []}
|
||||
|
||||
class Handler(http.server.BaseHTTPRequestHandler):
|
||||
def log_message(self, *args):
|
||||
pass
|
||||
def do_GET(self):
|
||||
state['requests'].append(self.path)
|
||||
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()
|
||||
elif relative.removesuffix('.zx') in digests:
|
||||
data = payloads[digests.index(relative.removesuffix('.zx'))]
|
||||
else:
|
||||
package = ROOT / 'build/node-apps/arcade.games' / relative
|
||||
if not package.is_file():
|
||||
self.send_error(404)
|
||||
return
|
||||
data = package.read_bytes()
|
||||
self.send_response(200)
|
||||
self.send_header('Content-Length', str(len(data)))
|
||||
self.end_headers()
|
||||
self.wfile.write(data)
|
||||
|
||||
server = http.server.ThreadingHTTPServer(('127.0.0.1', 0), Handler)
|
||||
thread = threading.Thread(target=server.serve_forever)
|
||||
thread.start()
|
||||
origin = f'http://127.0.0.1:{server.server_port}'
|
||||
try:
|
||||
with tempfile.TemporaryDirectory(dir=work) as temporary:
|
||||
folder = Path(temporary)
|
||||
app = folder / 'app'
|
||||
app.mkdir()
|
||||
shutil.copy2(args.binary, app / 'arcade')
|
||||
for name in ('arcade.zx', 'apps.zx', 'entity.zx'):
|
||||
shutil.copyfile(ROOT / 'build' / name, app / name)
|
||||
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())
|
||||
(app / 'arcade.json').write_text(json.dumps(receipt))
|
||||
profile = folder / 'data'
|
||||
save = profile / 'games/inbe.chess/records/computer'
|
||||
save.parent.mkdir(parents=True)
|
||||
save.write_bytes(b'prior saved game')
|
||||
|
||||
@contextlib.contextmanager
|
||||
def application(name):
|
||||
log_path = work / (name + '.log')
|
||||
with log_path.open('w') as log:
|
||||
child = subprocess.Popen([str(app / 'arcade')], cwd=app,
|
||||
env=os.environ | driver.environment() | {'ARCADE_DATA': str(profile),
|
||||
'ENTITY_DATA': str(profile / 'entity'), 'LANG': 'en_US.UTF-8'},
|
||||
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 capture(child, name):
|
||||
return capture_window(child, work / (name + '.png'))
|
||||
|
||||
def resize(child, width, height):
|
||||
window = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)],
|
||||
text=True, timeout=10).splitlines()[0]
|
||||
subprocess.run(['xdotool', 'windowsize', window, str(width), str(height)], check=True, timeout=10)
|
||||
# The previous tree may already be stable while X11's resize
|
||||
# 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:
|
||||
assert time.monotonic() < deadline, 'The host did not accept the new viewport'
|
||||
time.sleep(0.05)
|
||||
driver.wait_idle(frames=20)
|
||||
|
||||
with application('consent-refresh') as child:
|
||||
driver.wait(label='Connect', role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
assert not state['requests'], 'No node traffic before consent'
|
||||
capture(child, 'consent')
|
||||
resize(child, 360, 740)
|
||||
capture(child, 'phone-consent')
|
||||
resize(child, 1000, 820)
|
||||
driver.press(label='Stay offline', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
assert not state['requests'], 'Offline choice must prevent preview downloads'
|
||||
driver.press(label='Node connection', role='button')
|
||||
driver.wait(label='Connect', role='button')
|
||||
driver.press(label='Connect', role='button')
|
||||
driver.wait(label='Node Shovey', role='button', timeout=60)
|
||||
assert not driver.find(label='Choano', role='button'), 'Membership must come from the signed node catalog'
|
||||
driver.wait_idle(frames=60)
|
||||
assert any(path.endswith(catalog['art']['sha256'] + '.zx') for path in state['requests']), 'Node previews must be fetched'
|
||||
assert driver.find(role='image', visible=True), 'Verified previews must draw'
|
||||
card = driver.wait(label='Node Shovey', role='button')
|
||||
assert card['y'] >= 88, 'The library must leave room for its connection controls'
|
||||
with Image.open(capture(child, 'node-library')) as image:
|
||||
crop = image.crop((card['x'], card['y'], card['x'] + card['width'], card['y'] + card['height']))
|
||||
assert len(crop.convert('RGB').getcolors(1000000) or []) > 500, 'The preview must paint actual image pixels'
|
||||
game_hashes = {entry['sha256'] for entry in catalog['children']}
|
||||
assert not any(any(digest in path for digest in game_hashes) for path in state['requests']), 'No game payload before Download'
|
||||
state['revision'] = 1
|
||||
driver.press(label='Refresh library', role='button')
|
||||
driver.wait(label='Choano', role='button', timeout=60)
|
||||
driver.wait(label='Apfelwurm Editor', role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
capture(child, 'refreshed-library')
|
||||
resize(child, 360, 740)
|
||||
capture(child, 'phone-library')
|
||||
resize(child, 1000, 820)
|
||||
assert save.read_bytes() == b'prior saved game'
|
||||
driver.press(label='Node connection', role='button')
|
||||
driver.wait(label='Stay offline', role='button')
|
||||
driver.press(label='Stay offline', role='button')
|
||||
driver.wait(label='Choano', role='button')
|
||||
driver.wait_idle(frames=10)
|
||||
count = len(state['requests'])
|
||||
driver.wait_idle(frames=40)
|
||||
assert len(state['requests']) == count, 'Revocation must stop node traffic'
|
||||
with application('cached-offline'):
|
||||
driver.wait(label='Choano', role='button', timeout=60)
|
||||
driver.wait(label='Apfelwurm Editor', role='button')
|
||||
driver.wait_idle(frames=40)
|
||||
assert len(state['requests']) == count, 'Saved offline choice and signed catalog must survive restart'
|
||||
assert save.read_bytes() == b'prior saved game'
|
||||
finally:
|
||||
server.shutdown()
|
||||
server.server_close()
|
||||
thread.join()
|
||||
print('Arcade node consent, signed membership refresh, preview rendering, game download consent and offline restart passed')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -240,6 +240,11 @@ try {
|
||||
};
|
||||
const libraryFetched = async () => evaluate(`performance.getEntriesByType('resource').map(entry => entry.name)
|
||||
.filter(name => /\\/library\\//.test(new URL(name).pathname) || name.includes(${JSON.stringify(library?.art || '-')}))`);
|
||||
// This private page chooses the public node connection explicitly. A
|
||||
// returning visit reuses its saved origin-specific answer.
|
||||
const initial = await waitButton(['Connect', 'Shovey']);
|
||||
if (initial.label === 'Connect') await click(initial);
|
||||
await waitButton('Shovey');
|
||||
if (library) {
|
||||
// The first visit draws every cover from the small copies alone.
|
||||
const colours = await coversDrawn();
|
||||
|
||||
@@ -20,6 +20,19 @@ def release(path):
|
||||
|
||||
catalog_version = release(Path('catalog/CHANGELOG.md'))
|
||||
host_version = None if catalog_only else release(Path('CHANGELOG.md'))
|
||||
host_code = None
|
||||
host_code_path = Path('packaging/android/version-code')
|
||||
if not catalog_only:
|
||||
host_code = int(host_code_path.read_text().strip())
|
||||
if not 0 < host_code <= 2100000000:
|
||||
raise SystemExit('Invalid native Android versionCode')
|
||||
previous = Path('VERSION').read_text().strip()
|
||||
if previous != host_version:
|
||||
if tuple(map(int, host_version.split('.'))) <= tuple(map(int, previous.split('.'))):
|
||||
raise SystemExit('Native host version must increase')
|
||||
host_code += 1
|
||||
if host_code > 2100000000:
|
||||
raise SystemExit('Native Android versionCode is exhausted')
|
||||
# Validate all versions before writing either version source or the ledger.
|
||||
ledger_path = Path('apps/versions.json')
|
||||
if ledger_path.exists():
|
||||
@@ -59,4 +72,5 @@ if ledger_path.exists():
|
||||
Path('catalog/VERSION').write_text(catalog_version + '\n')
|
||||
if not catalog_only:
|
||||
Path('VERSION').write_text(host_version + '\n')
|
||||
host_code_path.write_text(str(host_code) + '\n')
|
||||
PY
|
||||
+130
-121
@@ -2,13 +2,13 @@
|
||||
"format": 1,
|
||||
"packages": [
|
||||
{
|
||||
"commit": "b31299434c785d0f2bd82f36b5bfd2fd36ba1216",
|
||||
"dependencies": {},
|
||||
"id": "p09fa77e94b0dfc6c",
|
||||
"name": "rini",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/rini.git"
|
||||
"commit": "a02feeb703192f1481e72160b1ccff401d17ef9d",
|
||||
"dependencies": {"raylib": "pcc7aa76725f2fb2f"},
|
||||
"dependency_refs": {"raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e"},
|
||||
"id": "p0797a2ec7b9d9b0e",
|
||||
"name": "kryon",
|
||||
"ref": "a02feeb703192f1481e72160b1ccff401d17ef9d",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "2944b2e668e735438d8ce24e47a39be3f5c36af5",
|
||||
@@ -20,25 +20,16 @@
|
||||
},
|
||||
{
|
||||
"commit": "d74348c2e288ac55740461f7e106cda365b4db4a",
|
||||
"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"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "crypto": "pc23fbf455e97614d", "curl": "p8da229d15597ab5c", "daochi_client": "p89503086b39ba0fb", "entity": "p22476639990592a5", "game2d": "pf2f54c7603f6e861", "kryon": "pb1ba3b1950f642b9", "kss": "p1b13dda539ed2a39", "liboqs": "p983c695d118b6109", "mingcute": "pe1027b9d16704793", "monocypher": "p6c9f89ec97d929eb", "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",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/inbe.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": "pe5e9983467e15f53"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"dependency_refs": {"kryon": "master"},
|
||||
"id": "p1b13dda539ed2a39",
|
||||
"name": "Kss",
|
||||
@@ -46,27 +37,72 @@
|
||||
"url": "https://github.com/kryonlabs/kss.git"
|
||||
},
|
||||
{
|
||||
"commit": "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd",
|
||||
"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",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
"commit": "dc47384266d96aaa0f86b8fe104404878179e90b",
|
||||
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p0797a2ec7b9d9b0e", "monocypher": "p6c9f89ec97d929eb", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
|
||||
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "monocypher": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
|
||||
"id": "p22476639990592a5",
|
||||
"name": "Entity",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
|
||||
"commit": "2fa52f64eb0c29e8351b437176e896b938ece8e8",
|
||||
"dependencies": {},
|
||||
"id": "p1ca0e8d3c19dbe4c",
|
||||
"name": "curl",
|
||||
"id": "p276ae0189cfc10bc",
|
||||
"name": "wurm_art",
|
||||
"ref": "2fa52f64eb0c29e8351b437176e896b938ece8e8",
|
||||
"source": true,
|
||||
"url": "https://github.com/waozixyz/wurm.git"
|
||||
},
|
||||
{
|
||||
"commit": "970d5e44b1702158cb16469892da6ff50f142427",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
|
||||
"dependency_refs": {"crypto": "master", "oqs": "master"},
|
||||
"id": "p6af0b5bd9fd0cd31",
|
||||
"name": "DaochiClient",
|
||||
"ref": "970d5e44b1702158cb16469892da6ff50f142427",
|
||||
"url": "https://github.com/ziranlang/daochi-client.git"
|
||||
},
|
||||
{
|
||||
"commit": "f5f0a19a5dc6c14a49adb3cd63ea79a60f6ba77b",
|
||||
"dependencies": {},
|
||||
"id": "p6c9f89ec97d929eb",
|
||||
"name": "monocypher",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/curl/curl.git"
|
||||
"url": "https://github.com/LoupVaillant/Monocypher.git"
|
||||
},
|
||||
{
|
||||
"commit": "51f8cc62a9ab61d114d246897b7b2ba76c4e3766",
|
||||
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p0797a2ec7b9d9b0e", "monocypher": "p6c9f89ec97d929eb", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
|
||||
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "monocypher": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
|
||||
"id": "p70971d078c43aca3",
|
||||
"name": "Entity",
|
||||
"ref": "51f8cc62a9ab61d114d246897b7b2ba76c4e3766",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
|
||||
"dependencies": {"liboqs": "p983c695d118b6109"},
|
||||
"dependency_refs": {"liboqs": "main"},
|
||||
"id": "p7098ac9cd92f7e5f",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/oqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "8b81994303400255ddb0ee2da49044dbaef4397f",
|
||||
"dependencies": {},
|
||||
"id": "p71f489a3ce887de0",
|
||||
"name": "practices",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/waozixyz/practices.git"
|
||||
},
|
||||
{
|
||||
"commit": "5d1ee888094efc63d1fb25a58af93478b103d441",
|
||||
"dependencies": {},
|
||||
"id": "p1d80baafaa5fa18a",
|
||||
"id": "p810dc0509cd1b75d",
|
||||
"name": "sqlite",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
@@ -75,48 +111,12 @@
|
||||
{
|
||||
"commit": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
|
||||
"dependencies": {},
|
||||
"id": "p1dff88558141400b",
|
||||
"id": "p82dbc05081cd4d96",
|
||||
"name": "zlib",
|
||||
"ref": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
|
||||
"source": true,
|
||||
"url": "https://github.com/madler/zlib.git"
|
||||
},
|
||||
{
|
||||
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"dependencies": {},
|
||||
"id": "p5a77c9c35110e925",
|
||||
"name": "raylib",
|
||||
"ref": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/raylib.git"
|
||||
},
|
||||
{
|
||||
"commit": "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pe5e9983467e15f53"},
|
||||
"dependency_refs": {"crypto": "master", "kryon": "master"},
|
||||
"id": "p6a59d2d6364debd6",
|
||||
"name": "Apps",
|
||||
"ref": "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
|
||||
"dependencies": {"liboqs": "pf9af593c157b8edf"},
|
||||
"dependency_refs": {"liboqs": "main"},
|
||||
"id": "p7098ac9cd92f7e5f",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/oqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "f5f0a19a5dc6c14a49adb3cd63ea79a60f6ba77b",
|
||||
"dependencies": {},
|
||||
"id": "p809b4d31a48625a3",
|
||||
"name": "monocypher",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/LoupVaillant/Monocypher.git"
|
||||
},
|
||||
{
|
||||
"commit": "256fe6ff049d48a25dfe2a8b0db7ad84477fd282",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
|
||||
@@ -127,53 +127,62 @@
|
||||
"url": "https://github.com/ziranlang/daochi-client.git"
|
||||
},
|
||||
{
|
||||
"commit": "8b81994303400255ddb0ee2da49044dbaef4397f",
|
||||
"commit": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
|
||||
"dependencies": {},
|
||||
"id": "p9079dde0fcc11248",
|
||||
"name": "practices",
|
||||
"id": "p8da229d15597ab5c",
|
||||
"name": "curl",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/waozixyz/practices.git"
|
||||
"url": "https://github.com/curl/curl.git"
|
||||
},
|
||||
{
|
||||
"commit": "5b67236a8e355e67ce4f8cc0389b9ce3805b874b",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pe5e9983467e15f53"},
|
||||
"dependency_refs": {"crypto": "master", "kryon": "master"},
|
||||
"id": "p9928fc15e7b93288",
|
||||
"name": "Apps",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
"commit": "b31299434c785d0f2bd82f36b5bfd2fd36ba1216",
|
||||
"dependencies": {},
|
||||
"id": "p8ea355e8cb04093e",
|
||||
"name": "rini",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/rini.git"
|
||||
},
|
||||
{
|
||||
"commit": "e77d81dab791c13bf1c4e5d9a7160c403be9bbe0",
|
||||
"dependencies": {},
|
||||
"id": "p983c695d118b6109",
|
||||
"name": "liboqs",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/open-quantum-safe/liboqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
|
||||
"dependencies": {"kryon": "pe5e9983467e15f53"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"dependency_refs": {"kryon": "master"},
|
||||
"id": "pab5377a2950368a2",
|
||||
"name": "plot",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/plot.git"
|
||||
},
|
||||
{
|
||||
"commit": "849eb903e5b6fb9aed996c530ab82f94c4371ee5",
|
||||
"dependencies": {"raylib": "pcc7aa76725f2fb2f"},
|
||||
"dependency_refs": {"raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e"},
|
||||
"id": "pb1ba3b1950f642b9",
|
||||
"name": "kryon",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "99d9ad777325e9dfc15cd8610056948819dc1f07",
|
||||
"dependencies": {"apps": "p9928fc15e7b93288", "crypto": "pc23fbf455e97614d", "entity": "p18beca948f69fa8d", "kryon": "pe5e9983467e15f53", "mingcute": "pe1027b9d16704793"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "crypto": "pc23fbf455e97614d", "entity": "p22476639990592a5", "kryon": "pb1ba3b1950f642b9", "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": "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": "78a79e8bf19d72f6afd1a941bc410b75d08854a3",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "528618898db605b0f2960759d49871cde2209086",
|
||||
"dependencies": {"apps": "p9928fc15e7b93288", "entity": "p18beca948f69fa8d", "game2d": "pf2f54c7603f6e861", "kryon": "pe5e9983467e15f53", "mingcute": "pe1027b9d16704793"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "entity": "p22476639990592a5", "game2d": "pf2f54c7603f6e861", "kryon": "pb1ba3b1950f642b9", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "master", "entity": "master", "game2d": "master", "kryon": "master", "mingcute": "master"},
|
||||
"id": "pba7b4d6a4dcf84ae",
|
||||
"name": "Choano",
|
||||
@@ -188,6 +197,15 @@
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/crypto.git"
|
||||
},
|
||||
{
|
||||
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"dependencies": {},
|
||||
"id": "pcc7aa76725f2fb2f",
|
||||
"name": "raylib",
|
||||
"ref": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/raylib.git"
|
||||
},
|
||||
{
|
||||
"commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0",
|
||||
"dependencies": {},
|
||||
@@ -196,18 +214,9 @@
|
||||
"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": "pe5e9983467e15f53"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"dependency_refs": {"kryon": "master"},
|
||||
"id": "pe878ed78ee9f8300",
|
||||
"name": "Game2D",
|
||||
@@ -215,41 +224,41 @@
|
||||
"url": "https://github.com/kryonlabs/game2d.git"
|
||||
},
|
||||
{
|
||||
"commit": "2fa52f64eb0c29e8351b437176e896b938ece8e8",
|
||||
"dependencies": {},
|
||||
"id": "pef8c9ab30363ef38",
|
||||
"name": "wurm_art",
|
||||
"ref": "2fa52f64eb0c29e8351b437176e896b938ece8e8",
|
||||
"source": true,
|
||||
"url": "https://github.com/waozixyz/wurm.git"
|
||||
"commit": "c152526893b92e75c82f55b0adf2c684e47fdbc2",
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "entity": "p22476639990592a5", "kryon": "p0797a2ec7b9d9b0e", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "master", "entity": "master", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "mingcute": "master"},
|
||||
"id": "peb73114e93098006",
|
||||
"name": "Shovey",
|
||||
"ref": "c152526893b92e75c82f55b0adf2c684e47fdbc2",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
},
|
||||
{
|
||||
"commit": "47ce0302664fe2f87f3cb05407eac7aa09066c96",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p0797a2ec7b9d9b0e"},
|
||||
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d"},
|
||||
"id": "pf1707c15f1b95b28",
|
||||
"name": "Apps",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "cee04692f3461dcb098833472f071c434980debb",
|
||||
"dependencies": {"kryon": "pe5e9983467e15f53"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"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": "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"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "choano": "pba7b4d6a4dcf84ae", "daochi_client": "p6af0b5bd9fd0cd31", "entity": "p70971d078c43aca3", "game2d": "pe878ed78ee9f8300", "inbe": "p183b01bccc6424e7", "kryon": "p0797a2ec7b9d9b0e", "mingcute": "pe1027b9d16704793", "shovey": "peb73114e93098006", "wurm": "pb4256918f4b7855d", "wurm_art": "p276ae0189cfc10bc"},
|
||||
"dependency_refs": {"apps": "47ce0302664fe2f87f3cb05407eac7aa09066c96", "choano": "528618898db605b0f2960759d49871cde2209086", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "entity": "51f8cc62a9ab61d114d246897b7b2ba76c4e3766", "game2d": "d32e4b606ece83e8869c954f66c334f44f7b4838", "inbe": "master", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "mingcute": "master", "shovey": "c152526893b92e75c82f55b0adf2c684e47fdbc2", "wurm": "99d9ad777325e9dfc15cd8610056948819dc1f07", "wurm_art": "2fa52f64eb0c29e8351b437176e896b938ece8e8"},
|
||||
"name": "Arcade"
|
||||
},
|
||||
"toolchain": {
|
||||
"commit": "3f6234e9a181cdad20fac4fad1d1afb1b8ccf054",
|
||||
"ref": "3f6234e9a181cdad20fac4fad1d1afb1b8ccf054",
|
||||
"commit": "b8d0ac17eb1e2d2d9997729a769dbea681cc74ac",
|
||||
"ref": "b8d0ac17eb1e2d2d9997729a769dbea681cc74ac",
|
||||
"url": "https://github.com/ziranlang/ziran.git"
|
||||
}
|
||||
}
|
||||
+9
-5
@@ -7,7 +7,7 @@ bridge_modules = ["app"]
|
||||
|
||||
[toolchain]
|
||||
git = "https://github.com/ziranlang/ziran.git"
|
||||
ref = "3f6234e9a181cdad20fac4fad1d1afb1b8ccf054"
|
||||
ref = "b8d0ac17eb1e2d2d9997729a769dbea681cc74ac"
|
||||
|
||||
[install]
|
||||
bin = "arcade"
|
||||
@@ -29,17 +29,17 @@ abis = "arm64-v8a,x86_64"
|
||||
|
||||
[dependencies.kryon]
|
||||
git = "https://github.com/kryonlabs/kryon.git"
|
||||
ref = "master"
|
||||
ref = "a02feeb703192f1481e72160b1ccff401d17ef9d"
|
||||
|
||||
[dependencies.apps]
|
||||
git = "https://github.com/waozixyz/apps.git"
|
||||
# Use the shared controller reviewed with the supported collection host.
|
||||
ref = "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a"
|
||||
ref = "47ce0302664fe2f87f3cb05407eac7aa09066c96"
|
||||
|
||||
# Shovey's editions and editor are available as separate downloads.
|
||||
[dependencies.shovey]
|
||||
git = "https://github.com/waozixyz/shovey.git"
|
||||
ref = "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd"
|
||||
ref = "c152526893b92e75c82f55b0adf2c684e47fdbc2"
|
||||
|
||||
# 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 = "78a79e8bf19d72f6afd1a941bc410b75d08854a3"
|
||||
ref = "51f8cc62a9ab61d114d246897b7b2ba76c4e3766"
|
||||
|
||||
[dependencies.mingcute]
|
||||
git = "https://github.com/kryonlabs/mingcute.git"
|
||||
@@ -71,3 +71,7 @@ ref = "528618898db605b0f2960759d49871cde2209086"
|
||||
git = "https://github.com/waozixyz/wurm.git"
|
||||
ref = "2fa52f64eb0c29e8351b437176e896b938ece8e8"
|
||||
source = true
|
||||
|
||||
[dependencies.daochi_client]
|
||||
git = "https://github.com/ziranlang/daochi-client.git"
|
||||
ref = "970d5e44b1702158cb16469892da6ff50f142427"
|
||||
Reference in new issue
Block a user