Compare commits

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

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

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

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

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

arcade --check opens that collection without a window. make, make test and
the install run it, so a binary is never left beside a collection it refuses.
2026-11-15 21:51:26 -03:00
waozi 35ae14131c Fix Arcade profile dismissal, icon and backup reminders 2026-11-08 11:58:09 -03:00
waozi 91819cf7b2 Sample each named game cover in website smoke test 2026-11-07 20:10:03 -03:00
waozi 148b6f7d84 Synchronize website smoke test with console install and launch flow 2026-11-07 19:39:21 -03:00
waozi 24fc03b7c8 Pin Choano AVIF with CSS theming 2026-11-07 18:36:31 -03:00
waozi 02912c2ac3 Release Arcade catalog 0.7.125 with the latest game releases 2026-11-07 20:45:00 +00:00
39 changed files with 1001 additions and 666 deletions

No files matched your search

+5
View File
@@ -45,7 +45,12 @@ jobs:
-q '[.[] | select(.isDraft | not) | .tagName | select(startswith("node-arcade-"))][0]')
test -n "$tag"
git fetch --force origin "refs/tags/$tag:refs/tags/$tag"
# Keep the current smoke gate while building the release's exact host.
smoke_test=$(mktemp)
cp tests/web_site_test.mjs "$smoke_test"
git checkout --detach "refs/tags/$tag"
cp "$smoke_test" tests/web_site_test.mjs
rm "$smoke_test"
echo "tag=$tag" >> "$GITHUB_OUTPUT"
echo "version=${tag#node-arcade-}" >> "$GITHUB_OUTPUT"
- name: Read the locked toolchain
+19
View File
@@ -2,6 +2,25 @@
## [Unreleased]
- Open the full Arcade catalog in Breeze and keep Choano progress available in the hosted game.
- Build on Ziran 0.5.0 and Kryon b45cc524 with its namespaced widgets. Game
exports are read as one-format ZX 28 through `build/zx-metadata`, which
verifies a bundle without running it. Add-ons carry their game's code, so
collections no longer mark `shared_code` and `apps.json` no longer accepts
`shared_code` or `library_entries`. The unused game module-path helper is
removed, and the Profile bundle comes from Entity's own `native-profile`
artifact.
- `arcade --check` opens the collection beside the binary without a window.
`make`, `make test` and the install run it, so a binary is never left next
to a collection it refuses; Arcade had closed right after opening from
Harmony's Apps when its build folder held a binary and a collection from
two different toolchains.
- Close Profile directly from its X button while keeping Back navigation through account pages.
- Use a neutral profile icon instead of the Shovey portrait.
- Remember completed account backups when reopening Arcade or using the same desktop account in another app.
- Runs games built for the latest Inner Breeze.
## 0.7.120
+20 -5
View File
@@ -19,9 +19,9 @@ LIB_DIR ?= $(HOME)/.local/lib/arcade
DATA_DIR ?= $(if $(XDG_DATA_HOME),$(XDG_DATA_HOME),$(HOME)/.local/share)
.PHONY: all build/arcade build/shovey standalone-ui-test collection-ui-test scroll-ui-test navigation-ui-test games collection collection-test run test chess-engine-test chess-app-test ui-test inbe-ui-test compatibility-test install
all: collection build/entity.zx build/arcade build/shovey
all: collection build/entity.zx build/arcade build/shovey collection-check
games:
games: build/zx-metadata
python3 scripts/check-games.py --ziran '$(ZIRAN)' $(LOCK_FLAGS)
python3 scripts/build-games.py --ziran '$(ZIRAN)' $(LOCK_FLAGS) $(if $(GAME_ARTIFACT_MANIFEST),--artifact-manifest '$(GAME_ARTIFACT_MANIFEST)')
@@ -35,8 +35,16 @@ collection: games $(APPS_BUNDLE)
python3 scripts/build-collection.py --ziran '$(ZIRAN)' $(LOCK_FLAGS) \
--apps-bundle '$(APPS_BUNDLE)' --apps-sha256 '$(APPS_SHA256)'
# Reads a game export's entry and assets for build-games.py; nothing runs.
build/zx-metadata: scripts/zx_metadata.zi ziran.lock build/ziran/libziran.a
rm -rf build/zx-metadata-c
$(ZIRAN) build $(PROJECT) --target=c --root scripts --entry zx_metadata:main \
-o build/zx-metadata-c scripts/zx_metadata.zi
$(CC) -std=c11 -O1 -Wno-main -I'$(ZIRAN_ROOT)/include' -Ibuild/zx-metadata-c \
build/zx-metadata-c/*.c build/ziran/libziran.a -lm -lpthread -o $@
.PHONY: game-artifacts-test
game-artifacts-test:
game-artifacts-test: build/zx-metadata
python3 tests/game_artifacts_test.py
python3 tests/wurm_export_test.py
@@ -48,6 +56,13 @@ collection-notifications-test:
python3 tests/game_host_compatibility_test.py
python3 tests/collection_notifications_test.py
# The desktop binary opens the collection beside it and refuses one that a
# newer toolchain built (owner, 2026-11-15: Arcade closed right after opening
# from Harmony's Apps). Build and check the pair together, with private data.
.PHONY: collection-check
collection-check: collection build/arcade
ARCADE_DATA='$(CURDIR)/build/collection-check' ./build/arcade --check
src/catalog.zi: games
build/entity.zx: ziran.lock $(wildcard $(ENTITY_DIR)/src/*.zi)
@@ -71,7 +86,6 @@ test: all
python3 tests/wurm_export_test.py
python3 tests/game_host_compatibility_test.py
python3 tests/collection_notifications_test.py
python3 tests/game_module_paths_test.py
python3 tests/game_resource_packing_test.py
python3 tests/game_translation_keys_test.py
python3 tests/android_catalog_test.py
@@ -130,7 +144,7 @@ navigation-ui-test: all
--binary '$(CURDIR)/build/arcade' --binary '$(CURDIR)/build/shovey' --inbe-source '$(INBE_SOURCE)'
.PHONY: install-arcade
install-arcade: collection build/entity.zx build/arcade
install-arcade: collection build/entity.zx build/arcade collection-check
mkdir -p '$(BIN_DIR)' '$(LIB_DIR)' '$(DATA_DIR)/applications'
install -m 0755 build/arcade '$(LIB_DIR)/arcade.new'
mv -f '$(LIB_DIR)/arcade.new' '$(LIB_DIR)/arcade'
@@ -140,6 +154,7 @@ install-arcade: collection build/entity.zx build/arcade
install -m 0644 build/assets/hud/profile.webp build/assets/hud/dew.webp '$(LIB_DIR)/assets/hud/'
ln -sfn '$(LIB_DIR)/arcade' '$(BIN_DIR)/arcade'
install -m 0644 packaging/xyz.waozi.arcade.desktop '$(DATA_DIR)/applications/'
ARCADE_DATA='$(CURDIR)/build/collection-check' '$(LIB_DIR)/arcade' --check
install: all install-arcade
mkdir -p '$(BIN_DIR)' '$(LIB_DIR)/games' '$(DATA_DIR)/applications'
+1 -1
View File
@@ -34,7 +34,7 @@ add-on. Its named install dialog lists Shovey when needed and shows the total
download size. The Island editor stays private. Once Shovey is installed, only
the editor’s additions download. The editor reuses the original game’s art
and sounds, and both remain available offline. The top-right HUD uses the shared
painted Dew jewel and profile medallion in one frame. Its two icons ship with the
painted Dew jewel and a neutral profile icon in one frame. Its two icons ship with the
host independently of the remote library, so they also work offline.
Chess’s retained implementation can choose a side and one of four computer
+1 -1
View File
@@ -1 +1 @@
72fcca7bdf1264c77e44a45c30d6d5dd32c137b5ab985d4335941aef4c0ab148
0dc9b6f9ae8a11731d51fa4e118f9a545cee0575d742517f209413fdfa93df95
+8 -8
View File
@@ -20,29 +20,29 @@
"shovey": {
"id": "arcade.shovey",
"title": "Shovey",
"version": "0.6.169",
"sequence": 175,
"version": "0.6.171",
"sequence": 176,
"host_api": 43
},
"shovey-editor": {
"id": "arcade.shovey-editor",
"title": "Shovey Editor",
"version": "0.2.149",
"sequence": 151,
"version": "0.2.150",
"sequence": 152,
"host_api": 43
},
"arcade": {
"id": "inbe.arcade",
"title": "Arcade",
"version": "0.7.124",
"sequence": 203,
"version": "0.7.126",
"sequence": 205,
"host_api": 43
},
"wurm": {
"id": "xyz.waozi.wurm",
"title": "Apfelwurm",
"version": "0.2.33",
"sequence": 27,
"version": "0.2.34",
"sequence": 28,
"host_api": 43
},
"wurm-editor": {
Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 KiB

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

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

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 926 B

+10
View File
@@ -1,5 +1,15 @@
# Arcade catalog changelog
## 0.7.126
- Shovey 0.6.171: Runs in the latest Inner Breeze and Arcade.
- Apfelwurm 0.2.34: Replace campaign levels 1–50 with authored gardens that teach route planning, growth, portals, keys, switches and readable patrols in a paced progression.
- Choano, Shovey and Apfelwurm run as one-format ZX 28 on Ziran 0.6.0 in the current Inner Breeze.
## 0.7.125
- Shovey 0.6.169: Runs in the latest Inner Breeze and Arcade.
## 0.7.124
- Apfelwurm 0.2.33: Runs in the latest Inner Breeze and Arcade.
+1 -1
View File
@@ -1 +1 @@
0.7.124
0.7.126
+13
View File
@@ -0,0 +1,13 @@
# Arcade on the released graph — open work
- The raylib-free lane left uncommitted native work in this checkout: Ziran
515449986e40, Kryon 028d42cb157a, and changes to the Android, packaging,
app, main, sound and Windows sources, the game-updates workflow, the
README, `mk/` and the game-update commit script and test. It builds on
newer Ziran and Kryon than the graph the catalog now uses (Ziran 0.6.0
d17c7aa1, Kryon 1b290f19, Apps 7854da88). Move those pins onto that graph,
or onto a new Ziran release, before committing that work.
- `scripts/android_catalog.py` reads only the ZX 26 and 27 bundle layout, so
`tests/android_catalog_test.py` rejects the ZX 28 catalog. Read the seed
catalog's assets through the Ziran runtime, as `build/zx-metadata` reads
their index, before the next Android host release.
+5 -5
View File
@@ -148,9 +148,6 @@ def stage(root, controller, expected_controller_digest, output):
bytes=len(bundle_bytes),
preview=f"assets/arcade/previews/{name}{preview_suffix}",
icon=f"assets/arcade/previews/{name}{preview_suffix}")
# A thin add-on links its required games' verified code as libraries.
if app.get('shared_code'):
child['shared_code'] = True
if app.get('shared_records'):
child['shared_records'] = app['shared_records']
if app.get('requires'):
@@ -168,7 +165,7 @@ def stage(root, controller, expected_controller_digest, output):
if key not in cover:
continue
relative = Path(cover[key])
if relative.is_absolute() or ".." in relative.parts or relative.suffix not in {".png", ".jpg"}:
if relative.is_absolute() or ".." in relative.parts or relative.suffix not in {".png", ".jpg", ".avif"}:
raise ValueError("Invalid cover asset path")
contents, suffix = library_art(root, name, key, (app["art_source"] / relative).read_bytes(), app.get("cover_crops", {}).get(key, 0))
destination = Path("arcade/covers") / f"{name}-{key}{suffix}"
@@ -336,7 +333,10 @@ def main():
bundle(command, ROOT, "art.zi", "art:Main", art_assets / "assets", node_apps / "arcade-art.zx", env)
art = add_art(catalog_assets, game_downloads, node_apps / "arcade-art.zx")
archive_downloads(game_downloads, node_apps / "arcade.games.tar")
bundle(command, ROOT, "collection.zi", "collection:Main", catalog_assets / "assets", node_apps / "arcade.zx", env)
# The node catalog is hosted by the consumer's trusted Apps controller.
# Compile its bootstrap without Kryon's standalone UI implementation.
bundle([*command, "--define", "KRYON_HOSTED_UI"], ROOT, "collection.zi", "collection:Main",
catalog_assets / "assets", node_apps / "arcade.zx", env)
shutil.copyfile(node_apps / "arcade.zx", ROOT / "build/arcade.zx")
# The desktop host supplies its controller from beside the collection.
shutil.copyfile(args.apps_bundle, ROOT / "build/apps.zx")
+16 -23
View File
@@ -1,32 +1,25 @@
#!/usr/bin/env python3
"""Build Entity once for the outer native host; never pack it into a game."""
"""Build Entity once for the outer native host; never pack it into a game.
Entity owns its Profile bundle and the assets embedded in it: the locked
toolchain's artifact helper asks Entity's project tool for
entity:native-profile, as Shovey's player does.
"""
from pathlib import Path
import argparse
import importlib.util
import shutil
import subprocess
ROOT = Path(__file__).resolve().parents[1]
ZIRAN = str(ROOT / 'scripts/ziran.sh')
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--locked', action='store_true')
args = parser.parse_args()
flags = ['--locked'] if args.locked or not (ROOT / 'ziran.local.toml').exists() else []
def package(name):
return Path(subprocess.check_output([ZIRAN, 'pkg', 'path', name, *flags], cwd=ROOT, text=True).strip())
entity, kryon, toolchain, qrcode = map(package, ('entity', 'kryon', 'ziran', 'qrcode'))
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'),
'--module-path', 'kryon=' + str(kryon / 'src/ui'),
'--module-path', 'kryon=' + str(kryon / 'src/backend'),
'--module-path', 'qrcode=' + str(qrcode / 'src'),
'--module-path', str(toolchain / 'std'),
'--define', 'KRYON_HOSTED_UI', '--asset-dir', 'assets=' + str(staged / 'assets'),
'--entry', 'entity:Main', '-o', str(ROOT / 'build/entity.zx'), str(entity / 'src/entity.zi')],
cwd=entity, check=True)
ZIRAN = ROOT / 'scripts/ziran.sh'
flags = [] if (ROOT / 'ziran.local.toml').exists() else ['--locked']
toolchain = Path(subprocess.check_output([str(ZIRAN), 'pkg', 'path', 'ziran', *flags],
cwd=ROOT, text=True).strip().splitlines()[-1])
spec = importlib.util.spec_from_file_location('ziran_artifacts', toolchain / 'scripts/ziran_artifacts.py')
artifacts = importlib.util.module_from_spec(spec)
spec.loader.exec_module(artifacts)
profile = artifacts.request('entity:native-profile', 'linux-x86_64-gnu', project=ROOT, ziran=ZIRAN)
shutil.copyfile(profile.output('entity.zx'), ROOT / 'build/entity.zx')
assets = ROOT / 'build/entity-assets'
assets.mkdir(parents=True, exist_ok=True)
+33 -64
View File
@@ -6,7 +6,7 @@ import json
import os
import re
import shutil
import struct
import subprocess
import tempfile
from pathlib import Path
from game_packages import declared_apps, portable_artifacts
@@ -16,6 +16,8 @@ ROOT = Path(__file__).resolve().parents[1]
MAX_PAYLOAD_BYTES = 64 * 1024 * 1024
MAX_ASSET_BYTES = 16 * 1024 * 1024
METADATA_LIMIT = 1024 * 1024
# Built by `make build/zx-metadata` from scripts/zx_metadata.zi.
METADATA_TOOL = Path(__file__).resolve().parents[1] / 'build/zx-metadata'
def digest(path):
@@ -27,72 +29,39 @@ def digest(path):
def bundle_metadata(path, name):
"""Read bounded metadata and the asset index of ZX 26/27; execute nothing."""
"""Read a ZX 28 export's entry, asset index and bounded metadata.
build/zx-metadata opens and verifies the bundle with the Ziran runtime;
none of its code runs.
"""
size = path.stat().st_size
if not 0 < size <= MAX_PAYLOAD_BYTES:
raise ValueError(f'{path}: exceeds the host payload limit')
with path.open('rb') as source:
def skip(count):
if count > size - source.tell():
raise ValueError(f'{path}: truncated bundle')
source.seek(count, 1)
def take(count):
if count > size - source.tell():
raise ValueError(f'{path}: truncated bundle')
data = source.read(count)
if len(data) != count:
raise ValueError(f'{path}: truncated bundle')
return data
def number():
return struct.unpack('<I', take(4))[0]
def text():
length = number()
if length > METADATA_LIMIT:
raise ValueError(f'{path}: oversized metadata')
return take(length).decode('utf-8')
def count():
value = number()
if value > 100000:
raise ValueError(f'{path}: oversized bundle index')
return value
if take(8) not in (b'ZX\0\0\x1a\0\0\0', b'ZX\0\0\x1b\0\0\0'):
raise ValueError(f'{path}: unsupported bundle')
entry = text() + ':' + text()
for _ in range(count()):
text(); text()
for _ in range(count()):
for _ in range(7):
text()
skip(8); text(); skip(4)
for _ in range(count()):
text(); text(); text()
skip(number())
metadata, paths = {}, set()
wanted = {f'assets/{name}/catalog.json', f'assets/{name}/requirements.json'}
asset_count = count()
if not 1 <= asset_count <= 2048:
raise ValueError(f'{path}: invalid game asset count')
for _ in range(asset_count):
asset, length = text(), number()
if length > MAX_ASSET_BYTES:
raise ValueError(f'{path}: asset exceeds the host asset limit')
if asset in paths or asset.startswith('/') or '..' in Path(asset).parts:
raise ValueError(f'{path}: invalid or duplicate bundle asset {asset}')
paths.add(asset)
if asset in wanted:
if length > METADATA_LIMIT:
raise ValueError(f'{path}: oversized metadata')
metadata[asset.rsplit('/', 1)[1]] = json.loads(take(length))
else:
skip(length)
if source.tell() != size:
raise ValueError(f'{path}: trailing bundle bytes')
return entry, metadata, paths
if not METADATA_TOOL.is_file():
raise ValueError(f'{METADATA_TOOL} is missing; run make build/zx-metadata')
result = subprocess.run([str(METADATA_TOOL), str(path), name], capture_output=True, text=True)
if result.returncode:
raise ValueError(f'{path}: truncated or invalid bundle')
report = json.loads(result.stdout)
assets = report['assets']
if not 1 <= len(assets) <= 2048:
raise ValueError(f'{path}: invalid game asset count')
paths = set()
for asset, length in assets:
if length > MAX_ASSET_BYTES:
raise ValueError(f'{path}: asset exceeds the host asset limit')
if asset in paths or asset.startswith('/') or '..' in Path(asset).parts:
raise ValueError(f'{path}: invalid or duplicate bundle asset {asset}')
paths.add(asset)
metadata = {}
for key in ('catalog.json', 'requirements.json'):
length = next((size for asset, size in assets if asset == f'assets/{name}/{key}'), None)
if length is None:
continue
if length > METADATA_LIMIT or key not in report['metadata']:
raise ValueError(f'{path}: oversized metadata')
metadata[key] = json.loads(report['metadata'][key])
return report['entry'], metadata, paths
def validate_artifact(app, bundle, resources, imported):
-41
View File
@@ -1,41 +0,0 @@
"""Select Kryon namespaces from a game's own source imports."""
import re
from pathlib import Path
_TOKENS = re.compile(r'//[^\n]*|/\*.*?\*/|"(?:\\.|[^"\\])*"|#import\b|\S', re.DOTALL)
def _imports(text):
previous = None
for match in _TOKENS.finditer(text):
token = match.group()
if token.startswith(('//', '/*')):
continue
if previous == '#import' and token.startswith('"'):
yield token[1:-1]
previous = token
def _module_names(root):
return ({path.stem for path in root.glob('*.zi')} |
{path.parent.name for path in root.glob('*/module.zi')})
def kryon_module_paths(source: Path, descriptor: dict, kryon: Path) -> list[str]:
"""Keep qualified UI imports scoped unless game code needs short imports.
Registering the UI directory both plain and named makes Ziran load Kryon
into the application's flat namespace. Only direct imports of UI modules
the application does not own justify that legacy mode.
"""
ui = kryon / 'src/ui'
roots = {source / 'src' if (source / 'src').is_dir() else source,
(source / descriptor['source']).parent}
owned = set().union(*(_module_names(root) for root in roots))
shared = _module_names(ui) - owned
needs_plain = any(name in shared for root in roots for path in root.rglob('*.zi')
for name in _imports(path.read_text()))
paths = [str(ui)] if needs_plain else []
paths += ['kryon=' + str(ui), 'kryon=' + str(kryon / 'src/backend')]
return [flag for path in paths for flag in ('--module-path', path)]
+3 -13
View File
@@ -9,7 +9,7 @@ import re
from pathlib import Path
import subprocess
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_code', 'library_entries', 'shared_records', 'external', 'standalone_bundle'}
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_records', 'external', 'standalone_bundle'}
COVER_KEYS = {'portrait', 'landscape', 'logo', 'caption', 'action'}
@@ -59,20 +59,11 @@ def declared_packages(root, ziran=None, lock_flags=()):
any(not isinstance(item, str) or not item for item in requires) or \
len(set(requires)) != len(requires):
raise ValueError(f'{name}: invalid app dependencies')
shared_code = app.get('shared_code', False)
if type(shared_code) is not bool or (shared_code and not requires):
raise ValueError(f'{name}: shared code needs declared dependencies')
shared_records = app.get('shared_records', [])
if not isinstance(shared_records, list) or len(shared_records) > 8 or any(
not isinstance(item, str) or not re.fullmatch(r'[A-Za-z0-9_.-]{1,63}', item) or
item in ('.', '..') for item in shared_records) or len(set(shared_records)) != len(shared_records):
raise ValueError(f'{name}: invalid shared records')
library_entries = app.get('library_entries', [])
if not isinstance(library_entries, list) or len(library_entries) > 64 or \
any(not isinstance(item, str) or len(item) > 253 or
not re.fullmatch(r'[A-Za-z_][A-Za-z0-9_]*:[A-Za-z_][A-Za-z0-9_]*', item)
for item in library_entries) or len(set(library_entries)) != len(library_entries):
raise ValueError(f'{name}: invalid portable library entries')
app_art_source = art_source
descriptor = json.loads(manifest.read_text())
cover_crops = {}
@@ -84,9 +75,8 @@ def declared_packages(root, ziran=None, lock_flags=()):
cover['action'] = 'internal'
apps.append(dict(package=name, source=source, art_source=app_art_source, manifest=manifest,
descriptor=descriptor,
cover=cover, cover_crops=cover_crops, internal=internal, requires=requires, shared_code=shared_code,
shared_records=shared_records,
library_entries=library_entries, enabled=app.get('enabled', True)))
cover=cover, cover_crops=cover_crops, internal=internal, requires=requires,
shared_records=shared_records, enabled=app.get('enabled', True)))
packages.append(dict(name=name, source=source, id=declaration['id'],
title=declaration['title'], apps=apps))
return packages
+9 -3
View File
@@ -1,4 +1,4 @@
"""The two shared painted HUD icons shipped with the host, independent of catalogs."""
"""Host HUD icons, independent of downloaded catalogs."""
import hashlib
from pathlib import Path
import shutil
@@ -6,12 +6,18 @@ import shutil
HUD_PATHS = ('assets/hud/profile.webp', 'assets/hud/dew.webp')
def hud_source(apps, name):
if name == "assets/hud/profile.webp":
return Path(__file__).resolve().parents[1] / name
return Path(apps) / name
def hud_asset_hashes(apps):
return {name: hashlib.sha256((Path(apps) / name).read_bytes()).hexdigest() for name in HUD_PATHS}
return {name: hashlib.sha256(hud_source(apps, name).read_bytes()).hexdigest() for name in HUD_PATHS}
def stage_hud_assets(apps, output):
for name in HUD_PATHS:
target = Path(output) / name
target.parent.mkdir(parents=True, exist_ok=True)
shutil.copyfile(Path(apps) / name, target)
shutil.copyfile(hud_source(apps, name), target)
+60
View File
@@ -0,0 +1,60 @@
// Prints a game export's entry and asset index as JSON for
// scripts/build-games.py:
// zx-metadata BUNDLE NAME
// Opening verifies the whole bundle; none of its code runs. The texts of
// assets/NAME/catalog.json and assets/NAME/requirements.json are included.
#import "std/bundle_host"
#import "std/byte_text_linux"
#import "std/c_string"
#import "std/json_quote"
#import "std/stdio_linux"
#import "std/text_buffer"
#import "std/vec"
METADATA_LIMIT :: 1048576
AssetText :: (bundle: *void, index: u64) -> string {
return TextFromBytes(BytesFromPointer(BundleAssetBytes(bundle, index), BundleAssetLength(bundle, index)))
}
#program_export
main :: (argc: s32, argv: **u8) -> s32 {
if argc != 3 {
unused PrintError("usage: zx-metadata BUNDLE NAME\n")
return 2
}
bundle := OpenBundle(argv[1])
if bundle == null {
unused PrintError("zx-metadata: not a valid bundle\n")
return 1
}
defer { CloseBundle(bundle) }
name := TextFromCString(argv[2])
catalog: Vec(u8)
BuilderPrint(*catalog, "assets/%/catalog.json", name)
catalog_path := BuilderFinish(catalog)
requirements: Vec(u8)
BuilderPrint(*requirements, "assets/%/requirements.json", name)
requirements_path := BuilderFinish(requirements)
entry: Vec(u8)
BuilderPrint(*entry, "%:%", TextFromCString(BundleEntryModule(bundle)),
TextFromCString(BundleEntryFunction(bundle)))
output: Vec(u8)
BuilderPrint(*output, "{\"entry\":%,\"assets\":[", JsonQuote(BuilderFinish(entry)))
metadata: Vec(u8)
count := BundleAssets(bundle)
index: u64 = 0
while index < count {
path := TextFromCString(BundleAssetPath(bundle, index))
length := BundleAssetLength(bundle, index)
if index > 0 { BuilderPrint(*output, ",") }
BuilderPrint(*output, "[%,%]", JsonQuote(path), length)
if (path == catalog_path || path == requirements_path) && length <= cast(u64)METADATA_LIMIT {
if metadata.count > 0 { BuilderPrint(*metadata, ",") }
BuilderPrint(*metadata, "%:%", JsonQuote(path[name.count + 8:]), JsonQuote(AssetText(bundle, index)))
}
index += 1
}
BuilderPrint(*output, "],\"metadata\":{%}}\n", BuilderFinish(metadata))
return ifx WriteOutput(BuilderFinish(output)) then 0 else 1
}
+39 -27
View File
@@ -14,12 +14,9 @@
#import "kryon/geometry"
#import "kryon/drawing_props"
#import "kryon/control_props"
#import "kryon/box_widget"
#import "kryon/box_props"
#import "kryon/text_widget"
#import "kryon/text_props"
#import "kryon/button_widget"
#import "kryon/button_props"
Box :: #import "kryon/box";
Text :: #import "kryon/text";
Button :: #import "kryon/button";
#import "kryon/hosted_values"
#import "kryon/hosted_app"
#import "kryon/widget_host"
@@ -58,7 +55,7 @@ Codec :: #import "apps/node_codec";
#if #defined(ANDROID_BUILD) {
#import "kryon/app_asset"
}
#import "kryon/loading_indicator"
LoadingIndicator :: #import "kryon/loading_indicator";
#import, file "collection_loading.zi";
#import "apps/connection"
#import "apps/remote_catalog"
@@ -202,6 +199,19 @@ CollectionAllows :: (context: *void, node: *AppNode, name: string) -> bool {
(name == COLLECTION_INPUT_DESKTOP && CollectionInputDesktop())
}
// The old Choano document shares this game's record directory. Only the
// current linked account may read its original 64-hex key for migration.
CollectionChoanoLegacyRecord :: (node: *AppNode, record: string, owner: string) -> bool {
if node == null || node.collection || TextUntilNul(node.identity.id[:]) != "xyz.waozi.choano" ||
record.count != 81 || record[:14] != "choano.earned." || record[78:] != ".v1" ||
owner.count != 64 || record[14:78] != owner { return false }
for byte: owner {
if !((byte >= #char "a" && byte <= #char "f") ||
(byte >= #char "0" && byte <= #char "9")) { return false }
}
return true
}
CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
arguments: *HostValue, count: s32, result: *HostValue) -> s32 {
name := TextFromCString(function)
@@ -235,8 +245,10 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
if name == "AppRecordHost" && count == 1 &&
HostScalarValid(arguments[0], "string", cast(s32)HostString) {
record := AppArgumentText(arguments[0])
if record.count >= 64 && !CollectionChoanoLegacyRecord(node, record, RecordsOwnerNow()) { return 0 }
if !AppFileNameValid(record) { return 0 }
saved := CollectionRecordsFor(TextUntilNul(node.identity.id[:]))
if saved == null || !AppFileNameValid(record) || record.count >= 64 { return 0 }
if saved == null { return 0 }
AppFileFree(saved.text)
saved.text = AppFileRead(*saved.files, record)
if saved.files.status == -1 || saved.text.count >= 65536 { return 0 }
@@ -835,26 +847,26 @@ CollectionUpdatesSet :: (on: bool) -> bool {
// input until it is answered.
CollectionUpdatesQuestion :: (session: Session, viewport: Rectangle) {
question := "Download new levels when they come out?"
Box(session, BoxProps.{.key = cast(u64)49300, .bounds = viewport, .fill = Color.{0, 0, 0, 160}})
unused Button(session, ButtonProps.{.key = cast(u64)49301, .id = 49301, .label = question,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49300, .bounds = viewport, .fill = Color.{0, 0, 0, 160}})
unused Button.Draw(session, Button.Props.{.key = cast(u64)49301, .id = 49301, .label = question,
.bounds = viewport, .invisible = true})
width := ifx viewport.width - 24.0 < 480.0 then viewport.width - 24.0 else 480.0
height: float32 = 200.0
x := viewport.x + (viewport.width - width) / 2.0
y := viewport.y + (viewport.height - height) / 2.0
Box(session, BoxProps.{.key = cast(u64)49302, .bounds = Rectangle.{x, y, width, height},
unused Box.Draw(session, Box.Props.{.key = cast(u64)49302, .bounds = Rectangle.{x, y, width, height},
.fill = Color.{59, 64, 63, 255}, .border = Color.{93, 98, 97, 255}, .radius = 18.0})
Text(session, TextProps.{.key = cast(u64)49303, .text = question, .font = 20, .wrap = TextWrap.TextWrapAuto,
Text.Draw(session, Text.Props.{.key = cast(u64)49303, .text = question, .size = 20, .wrap = Text.Wrap.TextWrapAuto,
.bounds = Rectangle.{x + 16.0, y + 16.0, width - 32.0, 60.0}})
Text(session, TextProps.{.key = cast(u64)49304, .text = "You can change this anytime in a game's Help.", .font = 14,
.wrap = TextWrap.TextWrapAuto, .bounds = Rectangle.{x + 16.0, y + 80.0, width - 32.0, 44.0}})
Text.Draw(session, Text.Props.{.key = cast(u64)49304, .text = "You can change this anytime in a game's Help.", .size = 14,
.wrap = Text.Wrap.TextWrapAuto, .bounds = Rectangle.{x + 16.0, y + 80.0, width - 32.0, 44.0}})
button_width := (width - 48.0 - 12.0) / 2.0
if Button(session, ButtonProps.{.key = cast(u64)49305, .id = 49305, .label = "Not now",
if Button.Draw(session, Button.Props.{.key = cast(u64)49305, .id = 49305, .label = "Not now",
.bounds = Rectangle.{x + 24.0, y + 136.0, button_width, 44.0},
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
unused CollectionUpdatesSet(false)
}
if Button(session, ButtonProps.{.key = cast(u64)49306, .id = 49306, .label = "Download",
if Button.Draw(session, Button.Props.{.key = cast(u64)49306, .id = 49306, .label = "Download",
.bounds = Rectangle.{x + 36.0 + button_width, y + 136.0, button_width, 44.0},
.tone = ButtonTone.ButtonToneAccent}) != 0 {
unused CollectionUpdatesSet(true)
@@ -893,7 +905,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
// The guest paints only its bounds below this host-owned bar. Paint an
// opaque base before its controls and any translucent navigation surface.
if top > 0 {
Box(session, BoxProps.{.key = cast(u64)49190,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49190,
.bounds = Rectangle.{viewport.x, viewport.y, viewport.width, cast(float32)top},
.fill = ColorFromPacked(ifx entity_shovey then ShoveyHostPalette().background else AppCoversPalette().background)})
}
@@ -959,11 +971,11 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
if CollectionNeedsCover(*collection_loading, collection_host.tree.active.slot,
collection_host.tree.active.generation, pictures_ready) {
collection_toolbar_visible = false
Box(session, BoxProps.{.key = cast(u64)49400, .bounds = viewport,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49400, .bounds = viewport,
.fill = ColorFromPacked(ifx entity_shovey then ShoveyHostPalette().background else AppCoversPalette().background)})
unused Button(session, ButtonProps.{.key = cast(u64)49401, .id = 49401,
unused Button.Draw(session, Button.Props.{.key = cast(u64)49401, .id = 49401,
.bounds = viewport, .invisible = true})
LoadingIndicator(session, LoadingIndicatorProps.{.key = cast(u64)49402,
LoadingIndicator.Draw(session, LoadingIndicator.Props.{.key = cast(u64)49402,
.bounds = viewport, .now = now, .scale = 1.5})
return true
}
@@ -981,10 +993,10 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
BuilderPrint(*title_bytes, "%", TextUntilNul(runtime.node.entry.title[:]))
title := BuilderFinish(title_bytes)
if !VecPush(collection_frame_paths, title) { AppFileFree(title); return false }
Box(session, BoxProps.{.key = cast(u64)6, .bounds = Rectangle.{viewport.x, viewport.y, viewport.width, 56.0},
unused Box.Draw(session, Box.Props.{.key = cast(u64)6, .bounds = Rectangle.{viewport.x, viewport.y, viewport.width, 56.0},
.fill = Color.{128, 140, 136, 40}})
Text(session, TextProps.{.key = cast(u64)8,
.text = title, .font = 20,
Text.Draw(session, Text.Props.{.key = cast(u64)8,
.text = title, .size = 20,
.bounds = Rectangle.{viewport.x + 150.0, viewport.y + 12.0, viewport.width - 166.0, 36.0}})
}
return true
@@ -1195,10 +1207,10 @@ CollectionNodeScreen :: (session: Session, viewport: Rectangle) -> bool {
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,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49510, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
Text.Draw(session, Text.Props.{.key = cast(u64)49511, .text = Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "loading_library"),
.size = 20, .bounds = Rectangle.{viewport.x + 24.0, viewport.y + viewport.height / 2.0, viewport.width - 48.0, 64.0}})
if Button.Draw(session, Button.Props.{.key = cast(u64)49512, .id = 49512,
.label = Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "stay_offline"),
.bounds = Rectangle.{viewport.x + 24.0, viewport.y + viewport.height / 2.0 + 72.0, viewport.width - 48.0, 44.0},
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
+29 -21
View File
@@ -1,8 +1,13 @@
#import "std/c_string"
#import "std/byte_text_linux"
#import "std/timer_linux"
#import "kryon/Desktop"
#import "kryon/Widgets"
#import "kryon/desktop_runtime"
#import "kryon/Cairo"
#import "kryon/session"
#import "kryon/geometry"
#import "kryon/drawing_props"
#import "kryon/tree"
#import "kryon/tree_input"
#import "kryon/Frame"
#import "kryon/test_driver"
#import "kryon/ScrollDevice"
@@ -11,10 +16,11 @@
#import "collection_host"
#import "entity_host"
#import "entity/model"
#import "kryon/carousel"
Carousel :: #import "kryon/carousel";
#import "apps/appearance"
#import "kryon/widget_palette"
#import "kryon/loading_indicator"
Box :: #import "kryon/box";
LoadingIndicator :: #import "kryon/loading_indicator";
sdl :: #system_library "SDL2";
SetTitle :: (window: *void, title: *u8) #foreign sdl "SDL_SetWindowTitle";
@@ -31,11 +37,11 @@ DrawStartup :: (session: Session, directory: string, standalone: bool = true) ->
defer { EntityFree(art); EntityFree(logo) }
if BeginFrame(session, cast(u64)1, viewport) != FrameStatus.FrameOk { return false }
if standalone {
unused CarouselArtwork(session, viewport, cast(u64)48000, art, logo, "Shovey")
unused Carousel.CarouselArtwork(session, viewport, cast(u64)48000, art, logo, "Shovey")
} else {
unused WidgetPaletteUse(session, AppCoversPalette())
Box(session, BoxProps.{.key = cast(u64)48000, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
LoadingIndicator(session, LoadingIndicatorProps.{.key = cast(u64)48001,
unused Box.Draw(session, Box.Props.{.key = cast(u64)48000, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
LoadingIndicator.Draw(session, LoadingIndicator.Props.{.key = cast(u64)48001,
.bounds = viewport, .now = cast(float64)MonotonicMilliseconds() / 1000.0})
unused WidgetPaletteRestore(session)
}
@@ -47,19 +53,10 @@ DrawStartup :: (session: Session, directory: string, standalone: bool = true) ->
Draw :: (session: Session) -> bool {
BeginDesktopFrame()
KeyboardModifiersSend(session, DesktopModifiers())
key := DesktopPressedKey()
for candidate: cast(s32)0..511 {
if TestDriverKeyPressed(candidate) { key = candidate; break }
}
key, modifiers := DesktopInputTake(session)
KeyboardModifiersSend(session, modifiers)
if key == 256 && CollectionBack() { key = 0 }
KeyboardSend(session, key)
// Text typed on the keyboard reaches the game's focused field.
codepoint := DesktopTypedCodepoint()
while codepoint != 0 {
unused TypedCodepointSend(session, codepoint)
codepoint = DesktopTypedCodepoint()
}
if key != 0 { KeyboardSend(session, key) }
viewport := DesktopViewport()
pointer := TestDriverPointer(session, PollPointer())
TreePointerUpdate(session, pointer)
@@ -70,7 +67,7 @@ Draw :: (session: Session) -> bool {
pointer.down, pointer.released, wheel,
cast(float64)MonotonicMilliseconds() / 1000.0)
if BeginFrame(session, cast(u64)1, viewport) != FrameStatus.FrameOk { return false }
collection := CollectionFrame(session, viewport, key, DesktopModifiers())
collection := CollectionFrame(session, viewport, key, modifiers)
if !collection {
TreeCancel(session)
Report("collection frame returned false\n")
@@ -115,10 +112,21 @@ main :: (argc: s32, argv: **u8) -> s32 {
}
return 0
}
// --check opens the collection beside this binary without a window, so a
// build or install proves the two match: a binary cannot read a
// collection that a newer toolchain built.
if argc == 2 && TextFromCString(argv[1]) == "--check" {
data := DataDirectory()
opened := data != "" && (ifx standalone then CollectionOpenShovey(ExecutableDirectory(), data) else CollectionOpenFiles(ExecutableDirectory(), data))
unused CollectionClose()
Report(product)
Report(ifx opened then ": the collection opens with this binary\n" else ": this binary cannot open the collection beside it\n")
return ifx opened then 0 else 1
}
first: s32 = -1
if argc != 1 {
if argc != 3 || TextFromCString(argv[1]) != "--app" {
Report(ifx standalone then "Usage: shovey [--list | --app GAME]\n" else "Usage: arcade [--list | --app GAME]\n")
Report(ifx standalone then "Usage: shovey [--list | --check | --app GAME]\n" else "Usage: arcade [--list | --check | --app GAME]\n")
return 1
}
for index: cast(s32)0..GameCount - 1 {
+21 -13
View File
@@ -9,19 +9,15 @@
#import "kryon/session"
#import "kryon/geometry"
#import "kryon/key_input"
#import "kryon/button_props"
#import "kryon/button_widget"
Button :: #import "kryon/button";
#import "platform"
#import "profile_palette"
#import "kryon/widget_palette"
#import "apps/appearance"
#import "kryon/drawing_props"
#import "kryon/box_widget"
#import "kryon/box_props"
#import "kryon/text_widget"
#import "kryon/text_props"
#import "kryon/modal_props"
#import "kryon/modal_frame_widget"
Box :: #import "kryon/box";
Text :: #import "kryon/text";
Modal :: #import "kryon/modal";
#import "kryon/tree"
entity_bundle: string;
@@ -84,25 +80,37 @@ EntityBack :: () -> bool {
return true
}
EntityDismiss :: () -> bool {
if !EntityHostSave() { return false }
// Clear secure fields and cancel any pending device-link/import route as
// ordinary Back would, after preserving the profile edits.
for depth: cast(s32)0..15 { if !EntityHostBack() { break } }
entity_visible = false
return true
}
EntityFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers: s32,
connection_label: string = "", connection: *bool = null) -> bool {
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyHostPalette() else AppCoversPalette())
defer { unused WidgetPaletteRestore(session) }
Box(session, BoxProps.{.key = cast(u64)49010, .bounds = viewport,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49010, .bounds = viewport,
.fill = StyleTokenColorOr("canvas", Color.{239, 246, 244, 255})})
width := viewport.width - 32.0
height := viewport.height - 32.0
if width > 560.0 { width = 560.0 }
if height > 720.0 { height = 720.0 }
modal := ModalFrame(session, ModalFrameProps.{.key = cast(u64)49000, .id = 49000,
modal := Modal.Draw(session, Modal.Props.{.key = cast(u64)49000, .id = 49000,
.title = "Profile", .width = cast(s32)width, .height = cast(s32)height, .scale = 1.0,
.has_left_action = connection != null, .left_label = connection_label,
.has_right_action = true, .right_label = "Back"})
if modal.left_clicked && connection != null && EntityHostSave() {
entity_visible = false
if modal.left_clicked && connection != null && EntityDismiss() {
connection.* = true
}
if modal.dismissed || modal.right_clicked { unused EntityBack() }
// The frame's X/outside dismissal closes the whole profile. System Back
// still walks Entity's pages through EntityBack before leaving.
if modal.dismissed || modal.right_clicked {
unused EntityDismiss()
}
if !modal.opened { return true }
input := TextFieldInputFor(key, modifiers, TypedTextTake(session, entity_typed[:]))
ok := EntityHostFrame(session, modal.layout.content, key, modifiers, input, true)
+1 -1
View File
@@ -65,7 +65,7 @@ def main():
ir = WORK / f'ir-{game}-{protocol}'
run(ZIRAN, 'ir', *common, '-o', ir, source)
saved = WORK / f'{game}-{protocol}-saved.zx'
run(zx, 'bundle', '--root', ir, '--module-path', ir,
run(zx, '--root', ir, '--module-path', ir,
'--entry', 'collection_notifications_guest:Main', '--asset-dir', 'assets=' + str(assets.parent),
'-o', saved, ir / 'collection_notifications_guest.zir')
if path.read_bytes() != saved.read_bytes():
@@ -1,4 +1,5 @@
#import, file "../src/collection_host.zi";
#import "apps/tree"
#import "entity/publications"
#import "entity/publications_read"
#import "std/bundle_host"
@@ -23,8 +24,24 @@ BorrowedText :: (value: HostValue) -> string {
return TextFromBytes(BytesFromPointer(value.data, cast(u64)value.length))
}
CheckChoanoLegacyRecord :: () -> bool {
owner := "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
record := "choano.earned.0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef.v1"
traversal := "choano.earned./123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef.v1"
node: AppNode
if !CopyText("xyz.waozi.choano", node.identity.id[:]) || !CollectionChoanoLegacyRecord(*node, record, owner) { return false }
if CollectionChoanoLegacyRecord(*node, record, "") || CollectionChoanoLegacyRecord(*node, traversal, traversal[14:78]) ||
CollectionChoanoLegacyRecord(*node, record, "1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef") { return false }
node.collection = true
if CollectionChoanoLegacyRecord(*node, record, owner) { return false }
node.collection = false
if !CopyText("arcade.shovey", node.identity.id[:]) { return false }
return !CollectionChoanoLegacyRecord(*node, record, owner)
}
#program_export
Check :: () -> s32 {
if !CheckChoanoLegacyRecord() { return 7 }
if !CollectionAllows(null, null, PUBLICATIONS_SERVICE) { return 1 }
if !CollectionAllows(null, null, PUBLICATIONS_READ_SERVICE) { return 2 }
function: [32]u8
+5 -2
View File
@@ -1,4 +1,4 @@
"""Check that Arcade routes writable publications through Entity's account gate."""
"""Check Arcade’s account-scoped publication and legacy record guards."""
import fcntl
import os
from pathlib import Path
@@ -37,7 +37,10 @@ def main():
"collection_publications_host_behavior:Check", "-o", str(generated),
"tests/collection_publications_host_behavior.zi")
main_c = generated / "main.c"
# The account checks link the collection dispatcher without a UI backend.
main_c.write_text('#include "collection_publications_host_behavior.h"\n'
'int32_t ImageWidth(String path) { (void)path; return 0; }\n'
'int32_t ImageHeight(String path) { (void)path; return 0; }\n'
'int main(void) { return Check(); }\n')
toolchain = Path(subprocess.check_output(
[ziran, "pkg", "path", "ziran", *lock], cwd=ROOT, text=True,
@@ -83,7 +86,7 @@ def main():
if result.returncode != 42:
raise SystemExit(
f"collection publications host check returned {result.returncode}")
print("Arcade publications host: writable service dispatches through Entity's account gate")
print("Arcade collection host: publication and Choano legacy record account guards passed")
if __name__ == "__main__":
+17 -35
View File
@@ -23,39 +23,21 @@ spec.loader.exec_module(builder)
art_spec = importlib.util.spec_from_file_location("library_art", ROOT / "scripts/library-art.py")
artist = importlib.util.module_from_spec(art_spec)
art_spec.loader.exec_module(artist)
spec = importlib.util.spec_from_file_location("published_games", ROOT / "scripts/wait-published-games.py")
published_games = importlib.util.module_from_spec(spec)
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) not in (b"ZX\0\0\x1a\0\0\0", b"ZX\0\0\x1b\0\0\0"):
raise ValueError("Unsupported game bundle")
reader.text()
reader.text()
for _ in range(reader.number()):
reader.text()
reader.text()
for _ in range(reader.number()):
for _ in range(7):
reader.text()
reader.take(8)
reader.text()
reader.take(4)
for _ in range(reader.number()):
for _ in range(3):
reader.text()
reader.skip(reader.number())
paths = set()
for _ in range(reader.number()):
name = reader.text().decode()
if name in paths:
raise ValueError("Duplicate game asset: " + name)
paths.add(name)
reader.skip(reader.number())
reader.finish()
"""Read the actual bundle index without loading its images or executing it.
build/zx-metadata opens and verifies the ZX 28 bundle with the Ziran
runtime; none of its code runs.
"""
result = subprocess.run([str(ROOT / "build/zx-metadata"), str(path), path.stem],
capture_output=True, text=True, check=True)
paths = set()
for name, _ in json.loads(result.stdout)["assets"]:
if name in paths:
raise ValueError("Duplicate game asset: " + name)
paths.add(name)
return paths
@@ -64,8 +46,8 @@ class CollectionTests(unittest.TestCase):
# Fixed runtime references catch a doubled namespace in the real
# compiled payload, independently of the packaging declaration.
assets = bundle_asset_paths(ROOT / "build/games/choano.zx")
for path in ("assets/choano/background-inside.png", "assets/choano/organisms-hd.png",
"assets/choano/title-landscape.jpg", "assets/choano/fish/sea.png"):
for path in ("assets/choano/background-inside.avif", "assets/choano/organisms-hd.avif",
"assets/choano/title-landscape.avif", "assets/choano/fish/sea.avif"):
self.assertTrue(path in assets, "Choano runtime image missing from its bundle: " + path)
def setUp(self):
@@ -261,12 +243,12 @@ class CollectionTests(unittest.TestCase):
expected_children.append((
descriptor["id"], descriptor["title"], descriptor["name"],
ledger[descriptor["name"]]["version"], cover.get("caption", ""),
cover.get("action"), tuple(app["requires"]), app["shared_code"],
cover.get("action"), tuple(app["requires"]),
))
self.assertEqual([(
child["id"], child["title"], child["expected_id"], child["version"],
child.get("cover", {}).get("caption", ""), child.get("cover", {}).get("action"),
tuple(child.get("dependencies", [])), child.get("shared_code", False),
tuple(child.get("dependencies", [])),
) for child in catalog["children"]], expected_children)
self.assertEqual([(p["name"], p["id"], p["children"]) for p in packages],
[(package["name"], package["id"],
@@ -404,7 +386,7 @@ class CollectionTests(unittest.TestCase):
self.assertEqual(children["xyz.waozi.wurm"]["cover"]["caption"], "Classic")
self.assertEqual(children["xyz.waozi.wurm-editor"]["cover"]["caption"], "Editor")
self.assertEqual(children["xyz.waozi.wurm-editor"]["dependencies"], ["xyz.waozi.wurm"])
self.assertFalse(children["xyz.waozi.wurm-editor"].get("shared_code", False))
self.assertNotIn("shared_code", children["xyz.waozi.wurm-editor"])
self.assertEqual(children["xyz.waozi.wurm-editor"]["resources"], [{
"dependency": "xyz.waozi.wurm", "path": "assets/wurm/classic/",
"source": "assets/wurm-preview.png"}])
+18 -6
View File
@@ -13,7 +13,7 @@ def arcade_profile(binary, inbe_source, root):
"""Exercise the production Arcade entry without accounts or public services."""
sys.path.insert(0, str(inbe_source / 'tests'))
from ui_driver import UiDriver
out = root / 'work/entity-ui-test'
out = root / 'backup/entity-ui-test'
out.mkdir(parents=True, exist_ok=True)
with tempfile.TemporaryDirectory(dir=out) as temporary:
data = Path(temporary)
@@ -84,8 +84,14 @@ def arcade_profile(binary, inbe_source, root):
keyboard('ctrl+a')
# Arcade forwards the physical SDL text/modifier path;
# its entry does not consume UiDriver's typed-text queue.
subprocess.run(['xdotool', 'type', '--clearmodifiers', '--delay', '20', text],
env=env, check=True)
if text.isascii():
subprocess.run(['xdotool', 'type', '--clearmodifiers', '--delay', '20', text],
env=env, check=True)
else:
# Xvfb has no Unicode keyboard layout. Exercise native
# clipboard paste rather than synthesizing unmapped keys.
subprocess.run(['xclip', '-selection', 'clipboard'], input=text.encode(), env=env, check=True)
keyboard('ctrl+v')
image = field_image(name)
groups = star_count(image)
assert groups == len(text), (name, groups, len(text))
@@ -101,14 +107,20 @@ def arcade_profile(binary, inbe_source, root):
driver.press(label='Password', role='text_field')
subprocess.run(['xdotool', 'type', '--clearmodifiers', 'Ab3-not-retained'], env=env, check=True)
driver.press(label='Back', role='button')
driver.press(label='Back', role='button')
driver.wait(label='Profile', role='button')
driver.press(label='Profile', role='button')
driver.press(label='Sign in', role='button')
assert driver.wait(label='Password', role='text_field')['cursor'] == 0
assert star_count(field_image('reopened')) == 0, 'Returning must not prefill the old password'
driver.press(label='Back', role='button')
driver.press(label='Back', role='button')
driver.wait(label='Profile', role='button')
# Escape goes back one page, then exits from the profile root.
driver.press(label='Profile', role='button')
driver.press(label='Sign in', role='button')
driver.key('escape')
driver.wait_gone(label='Password', role='text_field')
assert not driver.find(label='Profile', role='button'), 'Back must stay inside Profile first'
driver.key('escape')
driver.wait(label='Profile', role='button')
(out / 'result.json').write_text(json.dumps({'rendered_stars': counts,
'empty_initially': True, 'empty_after_clear': True,
@@ -117,7 +129,7 @@ def arcade_profile(binary, inbe_source, root):
if child.poll() is None:
child.terminate()
child.wait(timeout=10)
print('Arcade native Profile: empty password, 12/32/Unicode stars, editing and return navigation passed')
print('Arcade native Profile: empty password, 12/32/Unicode stars, editing and direct close from sign-in passed')
parser = argparse.ArgumentParser()
parser.add_argument('--binary', type=Path, required=True)
+39 -23
View File
@@ -3,7 +3,8 @@ import hashlib
import importlib.util
import json
from pathlib import Path
import struct
import shutil
import subprocess
import sys
import tempfile
import unittest
@@ -17,22 +18,32 @@ importer = importlib.util.module_from_spec(spec)
spec.loader.exec_module(importer)
def zx(descriptor, requirements=None, extra=(), version=27):
def number(value):
return struct.pack('<I', value)
TOOLCHAIN = Path(subprocess.check_output([str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', 'ziran', '--locked'],
cwd=ROOT, text=True).strip().splitlines()[-1])
EXPORTS = {}
def text(value):
value = value.encode() if isinstance(value, str) else value
return number(len(value)) + value
def zx(descriptor, requirements=None, extra=(), catalog='catalog.json'):
"""A real ZX 28 export, entry portable:Main, of the game's packed assets."""
public = {k: v for k, v in descriptor.items() if k not in ('build_defines', 'prepare_assets')}
name = descriptor['name']
assets = [(f'assets/{name}/catalog.json', json.dumps(public).encode()),
assets = [(f'assets/{name}/{catalog}', json.dumps(public).encode()),
(f'assets/{name}/picture.png', b'unchanged resource'), *extra]
if requirements is not None:
assets.append((f'assets/{name}/requirements.json', json.dumps(requirements).encode()))
return (b'ZX\0\0' + number(version) + text('portable') + text('Main') + number(0) * 4
+ number(len(assets)) + b''.join(text(k) + text(v) for k, v in assets))
key = hashlib.sha256(json.dumps([[path, data.hex()] for path, data in assets]).encode()).hexdigest()
if key not in EXPORTS:
work = ROOT / 'work/game-artifacts-test' / key
shutil.rmtree(work, ignore_errors=True)
for path, data in assets:
(work / path).parent.mkdir(parents=True, exist_ok=True)
(work / path).write_bytes(data)
(work / 'portable.zi').write_text('#program_export\nMain :: () -> s32 { return 0 }\n')
subprocess.run([str(TOOLCHAIN / 'build/bin/zi2zx'), '--root', str(work), '--asset-dir',
'assets=' + str(work / 'assets'), '--entry', 'portable:Main',
'-o', str(work / 'export.zx'), str(work / 'portable.zi')], check=True)
EXPORTS[key] = (work / 'export.zx').read_bytes()
return EXPORTS[key]
class ArtifactTests(unittest.TestCase):
@@ -81,8 +92,15 @@ class ArtifactTests(unittest.TestCase):
for folder in ('src', 'build') for p in (self.root / folder).rglob('*') if p.is_file()}
def run_import(self):
run = subprocess.run
def metadata_only(arguments, *rest, **options):
# Only the bundle verifier runs; no game is compiled or executed.
if Path(arguments[0]) != importer.METADATA_TOOL:
raise AssertionError('No game subprocess')
return run(arguments, *rest, **options)
with patch.object(importer, 'ROOT', self.root), patch.object(importer, 'declared_apps', return_value=self.apps), \
patch('subprocess.run', side_effect=AssertionError('No game subprocess')), \
patch('subprocess.run', side_effect=metadata_only), \
patch('subprocess.check_output', side_effect=AssertionError('No compiler/resolver needed with fixtures')):
importer.build('must-not-run', [], self.manifest)
@@ -130,8 +148,7 @@ class ArtifactTests(unittest.TestCase):
self.reject('embedded catalog/entry mismatch')
def test_missing_catalog(self):
data = zx(self.apps[1]['descriptor']).replace(b'catalog.json', b'ignored.json')
(self.source / 'base-editor.zx').write_bytes(data)
(self.source / 'base-editor.zx').write_bytes(zx(self.apps[1]['descriptor'], catalog='ignored.json'))
self.reject('embedded catalog/entry mismatch')
def test_wrong_dependency_id(self):
@@ -157,12 +174,9 @@ class ArtifactTests(unittest.TestCase):
with patch.object(importer, 'MAX_PAYLOAD_BYTES', 32):
self.reject('payload limit')
def test_truncated_and_duplicate_zx(self):
for data in (zx(self.apps[0]['descriptor'])[:-1],
zx(self.apps[0]['descriptor'], extra=[('assets/base/picture.png', b'duplicate')])):
with self.subTest(length=len(data)):
(self.source / 'base.zx').write_bytes(data)
self.reject('truncated|duplicate')
def test_truncated_zx(self):
(self.source / 'base.zx').write_bytes(zx(self.apps[0]['descriptor'])[:-1])
self.reject('truncated or invalid bundle')
def test_manifest_rejects_external_private_id(self):
manifest = json.loads(self.manifest.read_text())
@@ -206,10 +220,12 @@ class ArtifactTests(unittest.TestCase):
self.assertEqual(locations['bundle'], self.source / path)
self.assertIn('build-queue --', guidance)
def test_zx26_supported_without_running_payload(self):
bundle = self.source / 'v26.zx'
bundle.write_bytes(zx(self.apps[0]['descriptor'], version=26))
self.assertEqual(importer.bundle_metadata(bundle, 'base')[0], 'portable:Main')
def test_zx28_read_and_older_formats_refused(self):
self.assertEqual(importer.bundle_metadata(self.source / 'base.zx', 'base')[0], 'portable:Main')
older = self.source / 'older.zx'
older.write_bytes(b'ZX\0\0\x1b\0\0\0' + bytes(64))
with self.assertRaisesRegex(ValueError, 'truncated or invalid bundle'):
importer.bundle_metadata(older, 'base')
def test_base_app_can_omit_resource_sidecar(self):
manifest = json.loads(self.manifest.read_text())
-152
View File
@@ -1,152 +0,0 @@
#!/usr/bin/env python3
"""Game imports select scoped Kryon paths; real bundles cover theme collisions."""
import os
from pathlib import Path
import subprocess
import sys
import tempfile
import unittest
ROOT = Path(__file__).resolve().parents[1]
sys.path.insert(0, str(ROOT / 'scripts'))
from game_module_paths import kryon_module_paths
class SourceFixture(unittest.TestCase):
def setUp(self):
scratch = ROOT / 'work/game-module-path-tests'
subprocess.run(['git', 'check-ignore', '-q', str(scratch)], cwd=ROOT, check=True)
scratch.mkdir(parents=True, exist_ok=True)
self.folder = tempfile.TemporaryDirectory(dir=scratch)
self.addCleanup(self.folder.cleanup)
self.root = Path(self.folder.name)
self.source = self.root / 'game'
self.ui = self.root / 'kryon/src/ui'
self.ui.mkdir(parents=True)
for name in ('scroll', 'theme', 'geometry'):
(self.ui / (name + '.zi')).touch()
def write(self, path, text=''):
path.parent.mkdir(parents=True, exist_ok=True)
path.write_text(text)
def paths(self, entry='src/app.zi'):
return kryon_module_paths(self.source, {'source': entry}, self.root / 'kryon')
class ModulePathsTest(SourceFixture):
def test_qualified_imports_and_owned_theme_stay_scoped(self):
self.write(self.source / 'src/app.zi', '#import "theme"\n#import "kryon/scroll"')
self.write(self.source / 'src/theme.zi')
self.assertEqual(self.paths(), ['--module-path', 'kryon=' + str(self.ui),
'--module-path', 'kryon=' + str(self.ui.parent / 'backend')])
def test_short_import_in_nested_source_needs_plain_path(self):
self.write(self.source / 'src/app.zi', '#import "theme"')
self.write(self.source / 'src/theme.zi')
self.write(self.source / 'src/views/game.zi', 'Geometry :: #import /* reason */ "geometry";')
self.assertEqual(self.paths()[:2], ['--module-path', str(self.ui)])
def test_entry_outside_src_and_package_without_src(self):
self.write(self.source / 'src/host.zi')
self.write(self.source / 'apps/chess/view.zi', '#import "geometry"')
self.assertEqual(self.paths('apps/chess/view.zi')[:2], ['--module-path', str(self.ui)])
self.write(self.source / 'view.zi', '#import "scroll"')
(self.source / 'src/host.zi').unlink()
(self.source / 'src').rmdir()
self.assertEqual(self.paths('view.zi')[:2], ['--module-path', str(self.ui)])
def test_only_owned_root_names_shadow_shared_modules(self):
self.write(self.source / 'src/app.zi', '#import "geometry"')
self.write(self.source / 'src/nested/geometry.zi')
self.assertIn(str(self.ui), self.paths())
self.write(self.source / 'src/geometry/module.zi')
self.assertNotIn(str(self.ui), self.paths())
def test_comments_strings_file_imports_and_other_packages_do_not_flatten(self):
self.write(self.source / 'src/app.zi', '''
// #import "scroll"
/* #import "geometry" */
Text :: "#import \\"scroll\\""
#import, file "scroll.zi";
#import "other/geometry"
#import "not_a_ui_module"
''')
self.assertNotIn(str(self.ui), self.paths())
class BundleTest(SourceFixture):
@classmethod
def setUpClass(cls):
wrapper = str(ROOT / 'scripts/ziran.sh')
flags = [] if (ROOT / 'ziran.local.toml').exists() else ['--locked']
def package(name):
return Path(subprocess.check_output([wrapper, 'pkg', 'path', name, *flags], cwd=ROOT, text=True).strip())
cls.toolchain = Path(os.environ['ZIRAN_SOURCE']) if 'ZIRAN_SOURCE' in os.environ else package('ziran')
cls.kryon = Path(os.environ['KRYON_SOURCE']) if 'KRYON_SOURCE' in os.environ else package('kryon')
cls.compiler = os.environ.get('ZIRAN', str(cls.toolchain / 'build/bin/ziran'))
def compiler_run(self, *args):
env = os.environ.copy()
for key in ('DISPLAY', 'WAYLAND_DISPLAY', 'XAUTHORITY', 'DBUS_SESSION_BUS_ADDRESS'):
env.pop(key, None)
return subprocess.run([self.compiler, *map(str, args)],
cwd=ROOT, env=env, text=True, capture_output=True, timeout=180)
def bundle(self, imports, local_theme=False, old_paths=False):
entry = self.source / 'src/guest.zi'
self.write(entry, imports + '''
using ButtonState;
#program_export
Answer :: () -> s32 {
thumb := ScrollFace(StyleKindScrollThumb(), 0, false,
cast(s32)ButtonStateNormal, 10.0)
''' + (' if AppTheme.LocalTheme() != cast(u32)0xaabbccdd { return 1 }\n' if local_theme else '') + '''
if thumb.value.background != cast(u32)0x889faaff { return 2 }
return 42
}
''')
if local_theme:
self.write(entry.with_name('theme.zi'), '''
#program_export
LocalTheme :: () -> u32 { return cast(u32)0xaabbccdd }
''')
paths = kryon_module_paths(self.source, {'source': 'src/guest.zi'}, self.kryon)
if old_paths:
paths = ['--module-path', str(self.kryon / 'src/ui'), *paths]
output = self.root / 'guest.zx'
result = self.compiler_run('bundle', '--root', entry.parent, *paths,
'--module-path', self.toolchain / 'std',
'--entry', 'guest:Answer', '-o', output, entry)
return result, output
def test_scoped_bundle_preserves_app_theme_and_kryon_palette(self):
imports = '''AppTheme :: #import "theme";
#import "kryon/scroll"
#import "kryon/style_sheet"
#import "kryon/control_props"
'''
old, _ = self.bundle(imports, local_theme=True, old_paths=True)
self.assertNotEqual(old.returncode, 0, old.stdout)
self.assertIn('LightBorderStrong', old.stderr + old.stdout)
result, output = self.bundle(imports, local_theme=True)
self.assertEqual(result.returncode, 0, (result.stderr + result.stdout)[-8000:])
run = self.compiler_run('run', output)
self.assertEqual(run.returncode, 0, run.stderr)
self.assertEqual(run.stdout.strip(), '42')
def test_legacy_short_import_bundle_keeps_shared_path(self):
result, output = self.bundle('''#import "scroll"
#import "style_sheet"
#import "control_props"
''')
self.assertEqual(result.returncode, 0, (result.stderr + result.stdout)[-8000:])
run = self.compiler_run('run', output)
self.assertEqual(run.returncode, 0, run.stderr)
self.assertEqual(run.stdout.strip(), '42')
if __name__ == '__main__':
unittest.main()
+6 -8
View File
@@ -12,13 +12,12 @@ from game_packages import declared_apps
class GameResourcesTest(unittest.TestCase):
def test_shared_code_requires_explicit_dependencies_and_valid_library_entries(self):
def test_dependencies_and_shared_records_are_validated(self):
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
(root / 'games.json').write_text(json.dumps({'packages': []}))
(root / 'catalog.json').write_text(json.dumps({'id': 'editor', 'name': 'editor'}))
app = {'manifest': 'catalog.json', 'requires': ['game'], 'shared_code': True,
'library_entries': ['engine:Step'], 'shared_records': ['local.campaign']}
app = {'manifest': 'catalog.json', 'requires': ['game'], 'shared_records': ['local.campaign']}
def declare(value):
(root / 'apps.json').write_text(json.dumps(
@@ -26,12 +25,11 @@ class GameResourcesTest(unittest.TestCase):
return declared_apps(root)[0]
parsed = declare(app)
self.assertTrue(parsed['shared_code'])
self.assertEqual(parsed['library_entries'], ['engine:Step'])
self.assertEqual(parsed['requires'], ['game'])
self.assertEqual(parsed['shared_records'], ['local.campaign'])
for invalid in [app | {'requires': []}, app | {'shared_code': 1},
app | {'library_entries': ['engine:../Step']},
app | {'library_entries': ['engine:Step', 'engine:Step']},
# Code is built into each add-on; the retired library fields are refused.
for invalid in [app | {'shared_code': True}, app | {'library_entries': ['engine:Step']},
app | {'requires': ['game', 'game']},
app | {'shared_records': ['../campaign']},
app | {'shared_records': ['local.campaign', 'local.campaign']},
app | {'shared_records': ['..']}, app | {'shared_records': 'campaign'}]:
+2 -2
View File
@@ -1,6 +1,6 @@
{
"choano-landscape": "1ca6e31c1062a7cca41bace4cf1bb221291988aea4a1dd61271899c2f5f28307",
"choano-portrait": "47b07722c474a67ee4a06b7644a3aff211503674391e363c17eb06a34ce60d6c",
"choano-landscape": "dfea1e328a0f386d0b5e323a59bbbc3cfa926f1dbdceaa09a9858a43b0949091",
"choano-portrait": "10be8a3d9251deeede9080c715a7a5dadc1b1641db16aa3a04b874a266302ea9",
"shovey-landscape": "40c01eb8300e4c5db52b2d75373e17cdaf7f68140c33c0a225613fc174660747",
"shovey-portrait": "ddcbf989eab5971157d8cdc73494ed03660bb4c7a7679543248f45be260777e3",
"wurm-landscape": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30",
+53 -26
View File
@@ -189,22 +189,37 @@ try {
const position = { x: node.visible_x + node.visible_width / 2, y: node.visible_y + node.visible_height / 2 };
await command('Input.dispatchMouseEvent', { type: 'mouseMoved', ...position });
await command('Input.dispatchMouseEvent', { type: 'mousePressed', ...position, button: 'left', buttons: 1, clickCount: 1 });
await delay(80);
// Keep a canvas press down until the game has processed a frame.
if (node.kind === 'button') await tree();
else await delay(80);
await command('Input.dispatchMouseEvent', { type: 'mouseReleased', ...position, button: 'left', buttons: 0, clickCount: 1 });
await delay(250);
};
const button = (nodes, label) => nodes.find(node => node.kind === 'button' && node.label === label && node.visible);
const waitButton = async label => {
const waitButton = async (label, settled = false, selected = false) => {
const labels = Array.isArray(label) ? label : [label];
let nodes;
let nodes, previous;
for (const end = Date.now() + 60000; Date.now() < end;) {
nodes = await tree();
const found = nodes.find(node => node.kind === 'button' && labels.includes(node.label) && node.visible);
if (found) return found;
const found = nodes.find(node => node.kind === 'button' && labels.includes(node.label) && node.visible && (!selected || (node.selected && node.height > 100)));
if (found && (!settled || (found.enabled &&
found.visible_width >= found.width - .5 && found.visible_height >= found.height - .5))) {
if (!settled || (previous?.key === found.key &&
Math.abs(previous.visible_x - found.visible_x) < .5 &&
Math.abs(previous.visible_y - found.visible_y) < .5)) return found;
previous = found;
} else previous = undefined;
await delay(150);
}
throw new Error('Game did not show ' + labels.join(' or ') + ': ' + nodes.filter(node => node.kind === 'button').map(node => node.label).join(', '));
};
const openInstalled = async () => {
const cover = button(await tree(), game);
if (!cover) throw new Error('Installed cover missing');
// A neighbouring cover's first activation selects it; the focused cover opens it.
if (!cover.selected || cover.height <= 100) await click(cover);
await click(await waitButton(game, true, true));
};
const pageReady = async () => {
for (const end = Date.now() + 60000; Date.now() < end;) {
if (await evaluate('!!(window.Module && Module.profileReady)')) return;
@@ -212,28 +227,36 @@ try {
}
throw new Error('The library did not reopen');
};
// The covers' own pixels: art has far more colours than an empty tile.
// Sample only named game covers. The shelf also exposes a large unnamed
// input button whose bounds include decorations and all of the covers.
// Counting that whole shelf can mistake empty covers for painted art.
const coverColours = async () => {
const covers = (await tree()).filter(node => node.kind === 'button' && node.visible &&
node.visible_width >= 100 && node.visible_height >= 100);
return evaluate(`(() => {
const canvas = document.getElementById('canvas'), context = canvas.getContext('2d');
const scale = canvas.width / canvas.clientWidth;
return ${JSON.stringify(covers)}.map(node => {
const colours = [];
// Neighbouring covers can be clipped or off screen. Select each title
// and sample its settled main cover so every game is checked.
for (const title of requiredTitles) {
const cover = button(await tree(), title);
if (!cover) throw new Error('Game cover missing: ' + title);
if (!cover.selected || cover.height <= 100) await click(cover);
const node = await waitButton(title, true, true);
colours.push(await evaluate(`(() => {
const canvas = document.getElementById('canvas'), context = canvas.getContext('2d');
const scale = canvas.width / canvas.clientWidth, node = ${JSON.stringify(node)};
const pixels = context.getImageData(Math.round(node.visible_x * scale), Math.round(node.visible_y * scale),
Math.round(node.visible_width * scale), Math.round(node.visible_height * scale)).data;
const colours = new Set();
for (let at = 0; at < pixels.length; at += 8) colours.add(pixels[at] << 16 | pixels[at + 1] << 8 | pixels[at + 2]);
return colours.size;
});
})()`);
})()`));
}
return colours;
};
const DRAWN = 1500;
const coversDrawn = async () => {
let colours = [];
for (const end = Date.now() + 15000; Date.now() < end;) {
colours = await coverColours();
if (colours.length && colours.every(count => count >= DRAWN)) return colours;
if (colours.length === requiredTitles.length && colours.every(count => count >= DRAWN)) return colours;
await delay(250);
}
throw new Error('The library covers did not draw: ' + JSON.stringify(colours));
@@ -282,14 +305,18 @@ try {
await delay(700);
await click(button(await tree(), game));
}
const download = (await tree()).findLast(node => node.kind === 'button' && node.label === 'Download');
if (!download) throw new Error('The cover did not offer its download');
// Selecting a neighbouring cover animates its action into view. Sample
// stable geometry before sending real pointer events to that action.
const download = await waitButton('Download', true);
await click(download);
await waitButton(game === 'Apfelwurm' ? 'Play' : ['Play', 'Back']);
// Downloads install in the background; opening requires a fresh cover activation.
await waitButton('App options', true);
await click(button(await tree(), game));
await waitButton(game === 'Apfelwurm' ? 'Play' : ['Play', 'Back'], true);
const play = button(await tree(), 'Play');
if (play) await click(play);
const swipe = button(await tree(), 'Swipe');
if (swipe) await click(swipe);
const swipe = play && game === 'Apfelwurm' ? await waitButton(['Swipe', 'Pause'], true) : button(await tree(), 'Swipe');
if (swipe?.label === 'Swipe') await click(swipe);
if (play || game === 'Apfelwurm') await waitButton('Pause');
// Flush the actual control record before a cold restart.
await evaluate(`new Promise((resolve,reject) => FS.syncfs(false,error => error ? reject(error) : resolve(true)))`);
@@ -298,8 +325,8 @@ try {
const reloaded = await tree();
const installed = button(reloaded, game);
if (!installed) throw new Error('Installed cover missing after reload');
await click(installed);
await waitButton(game === 'Apfelwurm' ? 'Play' : ['Play', 'Back']);
await openInstalled();
await waitButton(game === 'Apfelwurm' ? 'Play' : ['Play', 'Back'], true);
console.log(game + ' downloaded, opened its game and reopened from its installed cover');
if (game === 'Apfelwurm') {
await command('Page.reload');
@@ -324,7 +351,7 @@ try {
return original.call(this,path,...args);
};
})()`);
await click(installed);
await openInstalled();
// Depending on the game version it first reads records on its title
// or on Play. Either path must expose a usable recovery control.
if (!await evaluate('!!Module.arcadeFailed')) {
@@ -358,8 +385,8 @@ try {
await pageReady();
if (await evaluate(`FS.readFile(${JSON.stringify(saved.path)},{encoding:'utf8'})`) !== saved.text)
throw new Error('Recovering from a failed game changed its saved record');
await click(button(await tree(),game));
await waitButton('Play');
await openInstalled();
await waitButton('Play', true);
console.log('The reported ReadLevel failure showed recovery; returning reopened the installed game and retained its saved record');
}
if (library) {
@@ -377,7 +404,7 @@ try {
await pageReady();
await delay(3000);
const empty = await coverColours();
if (!refusedArt.length || !empty.length || empty.some(count => count >= DRAWN))
if (!refusedArt.length || empty.length !== requiredTitles.length || empty.some(count => count >= DRAWN))
throw new Error('The cover check did not tell empty covers apart: ' + JSON.stringify({ empty, refusedArt }));
console.log(`Without the site's art the covers stayed empty (colours ${empty}) and the API art request was refused`);
libraryMode = 'site';
+321 -169
View File
@@ -19,6 +19,24 @@
"source": true,
"url": "https://github.com/waozixyz/wurm.git"
},
{
"commit": "8d5d2e752a219674f993473c8410847ba42fad48",
"dependencies": {"audio": "p59deb49c7f103127", "avif": "pb203529d803e73a4", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db", "libwebp": "p3b3c785a0e17e605", "sdl3": "p16cd0434af3dff7b", "webp": "p2af20e0c835b1c63"},
"dependency_refs": {"audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "avif": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "sdl3": "829a65d769d935c4852f8159e964312c0957260a", "webp": "ec6ed304767e10c125ab2820f3b01d6fd773e147"},
"id": "p09ea4e5550e9f459",
"name": "kryon",
"ref": "8d5d2e752a219674f993473c8410847ba42fad48",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "c96f5e3de9c4488f4e6c97f59f5245f22fda22f7",
"dependencies": {},
"id": "p0dd67588478f9a3e",
"name": "libsamplerate",
"ref": "c96f5e3de9c4488f4e6c97f59f5245f22fda22f7",
"source": true,
"url": "https://github.com/libsndfile/libsamplerate.git"
},
{
"commit": "2944b2e668e735438d8ce24e47a39be3f5c36af5",
"dependencies": {},
@@ -28,13 +46,22 @@
"url": "https://github.com/ziranlang/qrcode.git"
},
{
"commit": "8b5a989dea686250078da2d209fde1cd2946fc77",
"dependencies": {"kryon": "pe42819128210d99c"},
"dependency_refs": {"kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c"},
"id": "p0e63706817d43aba",
"name": "Game2D",
"ref": "8b5a989dea686250078da2d209fde1cd2946fc77",
"url": "https://github.com/kryonlabs/game2d.git"
"commit": "106be8ab7e915f618fa3fd3a6df296dc0a319beb",
"dependencies": {"apps": "p333db0ddd841f1ec", "crypto": "pc23fbf455e97614d", "css": "p6269d7141b731fe4", "entity": "pb3958804740a96f2", "game2d": "pcad095808686987d", "kryon": "p09ea4e5550e9f459", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "b95d19334ab4338d3611ec9d44db62b50694e464", "crypto": "master", "css": "9ee24b3f70b9c7d776dc391cba15ba97533db227", "entity": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279", "game2d": "fcacb49c1e128e9eb100884e6029b24b4e608d38", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "mingcute": "master"},
"id": "p1081a753e68847db",
"name": "Choano",
"ref": "106be8ab7e915f618fa3fd3a6df296dc0a319beb",
"url": "https://git.waozi.xyz/waozi/choano.git"
},
{
"commit": "b1e9b025121adba80b931b9ec30754917815584b",
"dependencies": {"kryon": "p8f647d8005d4c2a7"},
"dependency_refs": {"kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658"},
"id": "p137c96bd0c9223a3",
"name": "plot",
"ref": "b1e9b025121adba80b931b9ec30754917815584b",
"url": "https://github.com/kryonlabs/plot.git"
},
{
"commit": "829a65d769d935c4852f8159e964312c0957260a",
@@ -46,49 +73,49 @@
"url": "https://github.com/libsdl-org/SDL.git"
},
{
"commit": "d74348c2e288ac55740461f7e106cda365b4db4a",
"dependencies": {"apps": "p2bf10414e9201651", "crypto": "pc23fbf455e97614d", "curl": "p8da229d15597ab5c", "daochi_client": "p89503086b39ba0fb", "entity": "peb3fb337c2b79068", "game2d": "pf2f54c7603f6e861", "kryon": "pe4419a225f95e507", "kss": "p1b13dda539ed2a39", "liboqs": "p5c52c96443a2bf32", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p71f489a3ce887de0", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "p810dc0509cd1b75d"},
"dependency_refs": {"apps": "master", "crypto": "master", "curl": "master", "daochi_client": "master", "entity": "master", "game2d": "master", "kryon": "master", "kss": "master", "liboqs": "main", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "master", "practices": "master", "qrcode": "master", "rini": "main", "sqlite": "master"},
"id": "p183b01bccc6424e7",
"name": "Inbe",
"ref": "master",
"url": "https://github.com/waozixyz/inbe.git"
"commit": "f26a552247e2cd367fd33def6860d903cac6ab8a",
"dependencies": {"av1": "p5d7d12505a42f7b3", "dav1d": "pb24767b9eb34d961", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db"},
"dependency_refs": {"av1": "bd278217e2bac754d868b3d6502eac4257658d4b", "dav1d": "54706fc6bc0cdecab7e9593974a4039cc038fca7", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199"},
"id": "p274c2dd6d03a7c0c",
"name": "avif",
"ref": "f26a552247e2cd367fd33def6860d903cac6ab8a",
"url": "https://github.com/ziranlang/avif.git"
},
{
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
"dependencies": {"kryon": "pe4419a225f95e507"},
"dependency_refs": {"kryon": "master"},
"id": "p1b13dda539ed2a39",
"name": "Kss",
"ref": "master",
"url": "https://github.com/kryonlabs/kss.git"
},
{
"commit": "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc",
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pbb0d432304fad5c6"},
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13"},
"id": "p2b1c0e80f47c3873",
"commit": "7b826f4928cda2bc96c72fd75d710b516f06ebdf",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pd19aad4bd0cc7753", "mesh_client": "p8204ae87a845c1c3"},
"dependency_refs": {"crypto": "master", "kryon": "6816ed78665e10525a3a0a7a43e182f2fa51a0ac", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449"},
"id": "p29c0b4b857b055e5",
"name": "Apps",
"ref": "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc",
"ref": "7b826f4928cda2bc96c72fd75d710b516f06ebdf",
"url": "https://github.com/waozixyz/apps.git"
},
{
"commit": "7364520deacb9ead8b46771a24a066220dedf144",
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pe4419a225f95e507"},
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "7865957626e67e6c291e3db3b474c6082691d6c6"},
"id": "p2bf10414e9201651",
"name": "Apps",
"ref": "master",
"url": "https://github.com/waozixyz/apps.git"
"commit": "ec6ed304767e10c125ab2820f3b01d6fd773e147",
"dependencies": {"image_codec": "p69c0e968ae5735d9", "libwebp": "p3b3c785a0e17e605"},
"dependency_refs": {"image_codec": "360553150917f352e49e1beb78917370792ccaef", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339"},
"id": "p2af20e0c835b1c63",
"name": "webp",
"ref": "ec6ed304767e10c125ab2820f3b01d6fd773e147",
"url": "https://github.com/ziranlang/webp.git"
},
{
"commit": "eada9baf35b45a7ebea4fb93728403dcca34cb41",
"dependencies": {"apps": "pf7f4c26f3cf01fbe", "entity": "p507e86a4cf18dc9c", "game2d": "p0e63706817d43aba", "kryon": "pe42819128210d99c", "kss": "pa3347b028712cc32", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "3515cdf3af20e79001f7774eed224e94180540ed", "entity": "075784438af94fe4a0aba48ed4d8c7208c161bf1", "game2d": "8b5a989dea686250078da2d209fde1cd2946fc77", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c", "kss": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62", "mingcute": "master"},
"id": "p2f197edc2542d0f6",
"name": "Choano",
"ref": "eada9baf35b45a7ebea4fb93728403dcca34cb41",
"url": "https://github.com/waozixyz/choano.git"
"commit": "d9c0c38bf041e97959170c48d1fc408524445a34",
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p8f647d8005d4c2a7", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "p2d4cf957ef890a17",
"name": "Entity",
"ref": "d9c0c38bf041e97959170c48d1fc408524445a34",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "b95d19334ab4338d3611ec9d44db62b50694e464",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p09ea4e5550e9f459", "mesh_client": "p8204ae87a845c1c3"},
"dependency_refs": {"crypto": "master", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449"},
"id": "p333db0ddd841f1ec",
"name": "Apps",
"ref": "b95d19334ab4338d3611ec9d44db62b50694e464",
"url": "https://github.com/waozixyz/apps.git"
},
{
"commit": "1844042d1ca751e62e61df7617dba19c98588339",
@@ -100,44 +127,124 @@
"url": "https://github.com/webmproject/libwebp.git"
},
{
"commit": "075784438af94fe4a0aba48ed4d8c7208c161bf1",
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pe42819128210d99c", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "p507e86a4cf18dc9c",
"name": "Entity",
"ref": "075784438af94fe4a0aba48ed4d8c7208c161bf1",
"url": "https://github.com/waozixyz/entity.git"
"commit": "712e99ed57a0b1f03ddb21dcd02d9ecd8b7d82e7",
"dependencies": {},
"id": "p3bbb7ef5867e6b62",
"name": "arcade",
"ref": "712e99ed57a0b1f03ddb21dcd02d9ecd8b7d82e7",
"source": true,
"url": "https://github.com/waozixyz/arcade.git"
},
{
"commit": "7bf154f197696f5bf04be2ea4c576db86bb6a238",
"commit": "5b8007aefac5518564c61aec7409d87d87e5c0ac",
"dependencies": {"kryon": "p8f647d8005d4c2a7"},
"dependency_refs": {"kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658"},
"id": "p449499e1e80e72a7",
"name": "Game2D",
"ref": "5b8007aefac5518564c61aec7409d87d87e5c0ac",
"url": "https://github.com/kryonlabs/game2d.git"
},
{
"commit": "56d19eca78b304630961c2ab180ba880b304f741",
"dependencies": {"kryon": "pd19aad4bd0cc7753"},
"dependency_refs": {"kryon": "6816ed78665e10525a3a0a7a43e182f2fa51a0ac"},
"id": "p4f2415439a56f364",
"name": "Game2D",
"ref": "56d19eca78b304630961c2ab180ba880b304f741",
"url": "https://github.com/kryonlabs/game2d.git"
},
{
"commit": "395d2aa8c7a0cf578b8086c6853baca9df56be5b",
"dependencies": {},
"id": "p5c52c96443a2bf32",
"id": "p52c1ebf1bba9ea88",
"name": "liboqs",
"ref": "main",
"source": true,
"url": "https://github.com/open-quantum-safe/liboqs.git"
},
{
"commit": "2c56268db0b270ad53e51af9cae5dc46876a65d9",
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pbb0d432304fad5c6", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "p6ab8e2a733002786",
"commit": "1aadfad932c98c069a1204261b1856f81f3bc199",
"dependencies": {},
"id": "p57c0272208aae8db",
"name": "libavif",
"ref": "1aadfad932c98c069a1204261b1856f81f3bc199",
"source": true,
"url": "https://github.com/AOMediaCodec/libavif.git"
},
{
"commit": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2",
"dependencies": {"libopus": "pe1fe9bbe80bf1d6d", "libsamplerate": "p0dd67588478f9a3e"},
"dependency_refs": {"libopus": "ddbe48383984d56acd9e1ab6a090c54ca6b735a6", "libsamplerate": "c96f5e3de9c4488f4e6c97f59f5245f22fda22f7"},
"id": "p59deb49c7f103127",
"name": "audio",
"ref": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2",
"url": "https://github.com/ziranlang/audio.git"
},
{
"commit": "7bf154f197696f5bf04be2ea4c576db86bb6a238",
"dependencies": {},
"id": "p5c52c96443a2bf32",
"name": "liboqs",
"ref": "7bf154f197696f5bf04be2ea4c576db86bb6a238",
"source": true,
"url": "https://github.com/open-quantum-safe/liboqs.git"
},
{
"commit": "e743dedc40b6f39b7b6d093d06e870d6c43920ef",
"dependencies": {"curl": "p8da229d15597ab5c", "kryon": "pd19aad4bd0cc7753", "mesh_client": "p8204ae87a845c1c3", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "kryon": "6816ed78665e10525a3a0a7a43e182f2fa51a0ac", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "p5c5e82eaccd6199e",
"name": "Entity",
"ref": "2c56268db0b270ad53e51af9cae5dc46876a65d9",
"ref": "e743dedc40b6f39b7b6d093d06e870d6c43920ef",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "bd278217e2bac754d868b3d6502eac4257658d4b",
"dependencies": {"dav1d": "pb24767b9eb34d961", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa"},
"dependency_refs": {"dav1d": "54706fc6bc0cdecab7e9593974a4039cc038fca7", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937"},
"id": "p5d7d12505a42f7b3",
"name": "av1",
"ref": "bd278217e2bac754d868b3d6502eac4257658d4b",
"url": "https://github.com/ziranlang/av1.git"
},
{
"commit": "9ee24b3f70b9c7d776dc391cba15ba97533db227",
"dependencies": {"kryon": "p09ea4e5550e9f459"},
"dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"},
"id": "p6269d7141b731fe4",
"name": "Css",
"ref": "9ee24b3f70b9c7d776dc391cba15ba97533db227",
"url": "https://github.com/kryonlabs/css.git"
},
{
"commit": "360553150917f352e49e1beb78917370792ccaef",
"dependencies": {},
"id": "p69c0e968ae5735d9",
"name": "image-codec",
"ref": "360553150917f352e49e1beb78917370792ccaef",
"url": "https://github.com/ziranlang/image-codec.git"
},
{
"commit": "970d5e44b1702158cb16469892da6ff50f142427",
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
"dependency_refs": {"crypto": "master", "oqs": "master"},
"id": "p6af0b5bd9fd0cd31",
"name": "DaochiClient",
"ref": "970d5e44b1702158cb16469892da6ff50f142427",
"ref": "master",
"url": "https://github.com/ziranlang/daochi-client.git"
},
{
"commit": "3d0c703e3d18b05099d90163189bca51e6820526",
"dependencies": {},
"id": "p6f2473c21fd36924",
"name": "sqlite",
"ref": "master",
"source": true,
"url": "https://github.com/sqlite/sqlite.git"
},
{
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
"dependencies": {"liboqs": "p5c52c96443a2bf32"},
"dependencies": {"liboqs": "p52c1ebf1bba9ea88"},
"dependency_refs": {"liboqs": "main"},
"id": "p7098ac9cd92f7e5f",
"name": "Oqs",
@@ -145,31 +252,31 @@
"url": "https://github.com/ziranlang/oqs.git"
},
{
"commit": "8b81994303400255ddb0ee2da49044dbaef4397f",
"commit": "b141d9c45db236335351c8a4b2a14b3ade27c937",
"dependencies": {},
"id": "p71f489a3ce887de0",
"name": "practices",
"ref": "master",
"id": "p74ab3cb6eb3b86fa",
"name": "libaom",
"ref": "b141d9c45db236335351c8a4b2a14b3ade27c937",
"source": true,
"url": "https://github.com/waozixyz/practices.git"
"url": "https://aomedia.googlesource.com/aom"
},
{
"commit": "a9c85df73fa1ed7af55da8a6ab3ca7d3cdf5e6a8",
"dependencies": {"kryon": "pbb0d432304fad5c6"},
"dependency_refs": {"kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13"},
"id": "p7e2abf6e63acf588",
"name": "Game2D",
"ref": "a9c85df73fa1ed7af55da8a6ab3ca7d3cdf5e6a8",
"url": "https://github.com/kryonlabs/game2d.git"
"commit": "71a1b9f397a0941fc1bac58545f7fdb287c15c56",
"dependencies": {"kryon": "p8f647d8005d4c2a7"},
"dependency_refs": {"kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658"},
"id": "p778e65a802124e34",
"name": "Css",
"ref": "71a1b9f397a0941fc1bac58545f7fdb287c15c56",
"url": "https://github.com/kryonlabs/css.git"
},
{
"commit": "5d1ee888094efc63d1fb25a58af93478b103d441",
"dependencies": {},
"id": "p810dc0509cd1b75d",
"name": "sqlite",
"ref": "master",
"source": true,
"url": "https://github.com/sqlite/sqlite.git"
"commit": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449",
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
"dependency_refs": {"crypto": "master", "oqs": "master"},
"id": "p8204ae87a845c1c3",
"name": "mesh_client",
"ref": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449",
"url": "https://github.com/ziranlang/mesh-client.git"
},
{
"commit": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
@@ -180,21 +287,12 @@
"source": true,
"url": "https://github.com/madler/zlib.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": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
"dependencies": {},
"id": "p8da229d15597ab5c",
"name": "curl",
"ref": "master",
"ref": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
"source": true,
"url": "https://github.com/curl/curl.git"
},
@@ -208,49 +306,85 @@
"url": "https://github.com/raysan5/rini.git"
},
{
"commit": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62",
"dependencies": {"kryon": "pe42819128210d99c"},
"dependency_refs": {"kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c"},
"id": "pa3347b028712cc32",
"name": "Kss",
"ref": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62",
"url": "https://github.com/kryonlabs/kss.git"
"commit": "1b290f19aa1a4069c908a4687f04458c58a2b658",
"dependencies": {"audio": "pb46a53117b2530ce", "avif": "p274c2dd6d03a7c0c", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db", "libwebp": "p3b3c785a0e17e605", "raylib": "pcc7aa76725f2fb2f", "sdl3": "p16cd0434af3dff7b", "webp": "pa068bd09450b2a80"},
"dependency_refs": {"audio": "ce5837f80e8ce6cb8d2d9f77915095d764da3485", "avif": "f26a552247e2cd367fd33def6860d903cac6ab8a", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e", "sdl3": "829a65d769d935c4852f8159e964312c0957260a", "webp": "02145a00a1f0df2a111da04a75f3fef260883897"},
"id": "p8f647d8005d4c2a7",
"name": "kryon",
"ref": "1b290f19aa1a4069c908a4687f04458c58a2b658",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
"dependencies": {"kryon": "pe4419a225f95e507"},
"dependency_refs": {"kryon": "master"},
"id": "pab5377a2950368a2",
"name": "plot",
"ref": "master",
"url": "https://github.com/kryonlabs/plot.git"
"commit": "02145a00a1f0df2a111da04a75f3fef260883897",
"dependencies": {"image_codec": "p69c0e968ae5735d9", "libwebp": "p3b3c785a0e17e605"},
"dependency_refs": {"image_codec": "360553150917f352e49e1beb78917370792ccaef", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339"},
"id": "pa068bd09450b2a80",
"name": "webp",
"ref": "02145a00a1f0df2a111da04a75f3fef260883897",
"url": "https://github.com/ziranlang/webp.git"
},
{
"commit": "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5",
"dependencies": {"apps": "pb91195370ac0cb93", "crypto": "pc23fbf455e97614d", "entity": "p6ab8e2a733002786", "game2d": "p7e2abf6e63acf588", "kryon": "pbb0d432304fad5c6", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8", "crypto": "master", "entity": "2c56268db0b270ad53e51af9cae5dc46876a65d9", "game2d": "a9c85df73fa1ed7af55da8a6ab3ca7d3cdf5e6a8", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "mingcute": "master"},
"id": "pb0ffd96a1a0f002c",
"name": "Apfelwurm",
"ref": "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5",
"url": "https://github.com/waozixyz/wurm.git"
},
{
"commit": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8",
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pbb0d432304fad5c6"},
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13"},
"id": "pb91195370ac0cb93",
"commit": "7854da88e219f98264dc41f1e614e4c9d292dded",
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p8f647d8005d4c2a7"},
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658"},
"id": "pa25b96ccf3b8fa6f",
"name": "Apps",
"ref": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8",
"ref": "7854da88e219f98264dc41f1e614e4c9d292dded",
"url": "https://github.com/waozixyz/apps.git"
},
{
"commit": "b5ac5d1a303326009012d68016c1d8859b6b3a13",
"dependencies": {"libwebp": "p3b3c785a0e17e605", "raylib": "pcc7aa76725f2fb2f", "sdl3": "p16cd0434af3dff7b"},
"dependency_refs": {"libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e", "sdl3": "829a65d769d935c4852f8159e964312c0957260a"},
"id": "pbb0d432304fad5c6",
"name": "kryon",
"ref": "b5ac5d1a303326009012d68016c1d8859b6b3a13",
"url": "https://github.com/kryonlabs/kryon.git"
"commit": "64aa16fcbba720dac3b1ad65f608a5f2bf02c5b9",
"dependencies": {"apps": "p29c0b4b857b055e5", "crypto": "pc23fbf455e97614d", "entity": "p5c5e82eaccd6199e", "game2d": "p4f2415439a56f364", "kryon": "pd19aad4bd0cc7753", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "7b826f4928cda2bc96c72fd75d710b516f06ebdf", "crypto": "master", "entity": "e743dedc40b6f39b7b6d093d06e870d6c43920ef", "game2d": "56d19eca78b304630961c2ab180ba880b304f741", "kryon": "6816ed78665e10525a3a0a7a43e182f2fa51a0ac", "mingcute": "master"},
"id": "paa7bd5492e81d3ac",
"name": "Apfelwurm",
"ref": "64aa16fcbba720dac3b1ad65f608a5f2bf02c5b9",
"url": "https://git.waozi.xyz/waozi/wurm.git"
},
{
"commit": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30",
"dependencies": {"av1": "p5d7d12505a42f7b3", "dav1d": "pb24767b9eb34d961", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db"},
"dependency_refs": {"av1": "bd278217e2bac754d868b3d6502eac4257658d4b", "dav1d": "54706fc6bc0cdecab7e9593974a4039cc038fca7", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199"},
"id": "pb203529d803e73a4",
"name": "avif",
"ref": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30",
"url": "https://github.com/ziranlang/avif.git"
},
{
"commit": "54706fc6bc0cdecab7e9593974a4039cc038fca7",
"dependencies": {},
"id": "pb24767b9eb34d961",
"name": "dav1d",
"ref": "54706fc6bc0cdecab7e9593974a4039cc038fca7",
"source": true,
"url": "https://github.com/videolan/dav1d.git"
},
{
"commit": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279",
"dependencies": {"curl": "p8da229d15597ab5c", "kryon": "p09ea4e5550e9f459", "mesh_client": "p8204ae87a845c1c3", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "pb3958804740a96f2",
"name": "Entity",
"ref": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "ce5837f80e8ce6cb8d2d9f77915095d764da3485",
"dependencies": {"dr_libs": "pb7c2dd1c09da0c1c", "libopus": "pe1fe9bbe80bf1d6d", "libsamplerate": "p0dd67588478f9a3e", "stb": "pe4a63e2d6e0424e7"},
"dependency_refs": {"dr_libs": "f12e197fd462e4c22873fbd70d11b1d2f2c1dc3c", "libopus": "ddbe48383984d56acd9e1ab6a090c54ca6b735a6", "libsamplerate": "c96f5e3de9c4488f4e6c97f59f5245f22fda22f7", "stb": "9600522de53973336fa033a289858a4354cbb04c"},
"id": "pb46a53117b2530ce",
"name": "audio",
"ref": "ce5837f80e8ce6cb8d2d9f77915095d764da3485",
"url": "https://github.com/ziranlang/audio.git"
},
{
"commit": "f12e197fd462e4c22873fbd70d11b1d2f2c1dc3c",
"dependencies": {},
"id": "pb7c2dd1c09da0c1c",
"name": "dr_libs",
"ref": "f12e197fd462e4c22873fbd70d11b1d2f2c1dc3c",
"source": true,
"url": "https://github.com/mackron/dr_libs.git"
},
{
"commit": "944826f70779a6b6cd53f6b06a75b36f4d8a2558",
@@ -260,6 +394,24 @@
"ref": "master",
"url": "https://github.com/ziranlang/crypto.git"
},
{
"commit": "fb6f021d9a5744aa800da17bb9c0ec5b6238c088",
"dependencies": {},
"id": "pc2505b60ef1baedd",
"name": "curl",
"ref": "master",
"source": true,
"url": "https://github.com/curl/curl.git"
},
{
"commit": "fcacb49c1e128e9eb100884e6029b24b4e608d38",
"dependencies": {"kryon": "p09ea4e5550e9f459"},
"dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"},
"id": "pcad095808686987d",
"name": "Game2D",
"ref": "fcacb49c1e128e9eb100884e6029b24b4e608d38",
"url": "https://github.com/kryonlabs/game2d.git"
},
{
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
"dependencies": {},
@@ -269,6 +421,15 @@
"source": true,
"url": "https://github.com/raysan5/raylib.git"
},
{
"commit": "6816ed78665e10525a3a0a7a43e182f2fa51a0ac",
"dependencies": {"audio": "p59deb49c7f103127", "avif": "pb203529d803e73a4", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db", "libwebp": "p3b3c785a0e17e605", "sdl3": "p16cd0434af3dff7b", "webp": "p2af20e0c835b1c63"},
"dependency_refs": {"audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "avif": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "sdl3": "829a65d769d935c4852f8159e964312c0957260a", "webp": "ec6ed304767e10c125ab2820f3b01d6fd773e147"},
"id": "pd19aad4bd0cc7753",
"name": "kryon",
"ref": "6816ed78665e10525a3a0a7a43e182f2fa51a0ac",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0",
"dependencies": {},
@@ -278,68 +439,59 @@
"url": "https://github.com/kryonlabs/mingcute.git"
},
{
"commit": "1cd873fda5d12cd4dd562956da94cee33c3e364c",
"dependencies": {"libwebp": "p3b3c785a0e17e605", "raylib": "pcc7aa76725f2fb2f", "sdl3": "p16cd0434af3dff7b"},
"dependency_refs": {"libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e", "sdl3": "829a65d769d935c4852f8159e964312c0957260a"},
"id": "pe42819128210d99c",
"name": "kryon",
"ref": "1cd873fda5d12cd4dd562956da94cee33c3e364c",
"url": "https://github.com/kryonlabs/kryon.git"
"commit": "ddbe48383984d56acd9e1ab6a090c54ca6b735a6",
"dependencies": {},
"id": "pe1fe9bbe80bf1d6d",
"name": "libopus",
"ref": "ddbe48383984d56acd9e1ab6a090c54ca6b735a6",
"source": true,
"url": "https://github.com/xiph/opus.git"
},
{
"commit": "7865957626e67e6c291e3db3b474c6082691d6c6",
"dependencies": {"libwebp": "p3b3c785a0e17e605", "raylib": "pcc7aa76725f2fb2f", "sdl3": "p16cd0434af3dff7b"},
"dependency_refs": {"libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e", "sdl3": "829a65d769d935c4852f8159e964312c0957260a"},
"id": "pe4419a225f95e507",
"name": "kryon",
"commit": "9600522de53973336fa033a289858a4354cbb04c",
"dependencies": {},
"id": "pe4a63e2d6e0424e7",
"name": "stb",
"ref": "9600522de53973336fa033a289858a4354cbb04c",
"source": true,
"url": "https://github.com/nothings/stb.git"
},
{
"commit": "1a18c5976aec4c9bbe873ecd98048820c3881a60",
"dependencies": {"apps": "pa25b96ccf3b8fa6f", "arcade": "p3bbb7ef5867e6b62", "crypto": "pc23fbf455e97614d", "css": "p778e65a802124e34", "curl": "pc2505b60ef1baedd", "daochi_client": "p6af0b5bd9fd0cd31", "entity": "p2d4cf957ef890a17", "game2d": "p449499e1e80e72a7", "kryon": "p8f647d8005d4c2a7", "liboqs": "p5c52c96443a2bf32", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "p137c96bd0c9223a3", "practices": "pf6b6695162f3781e", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "p6f2473c21fd36924"},
"dependency_refs": {"apps": "7854da88e219f98264dc41f1e614e4c9d292dded", "arcade": "712e99ed57a0b1f03ddb21dcd02d9ecd8b7d82e7", "crypto": "master", "css": "71a1b9f397a0941fc1bac58545f7fdb287c15c56", "curl": "master", "daochi_client": "master", "entity": "d9c0c38bf041e97959170c48d1fc408524445a34", "game2d": "5b8007aefac5518564c61aec7409d87d87e5c0ac", "kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658", "liboqs": "7bf154f197696f5bf04be2ea4c576db86bb6a238", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "b1e9b025121adba80b931b9ec30754917815584b", "practices": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d", "qrcode": "master", "rini": "main", "sqlite": "master"},
"id": "pe8884574da361bff",
"name": "Inbe",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
"url": "https://github.com/waozixyz/inbe.git"
},
{
"commit": "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7",
"dependencies": {"apps": "pb91195370ac0cb93", "crypto": "pc23fbf455e97614d", "entity": "p6ab8e2a733002786", "kryon": "pbb0d432304fad5c6", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "3c0a7d9e7f941381a7c07169f94240b9fe801bb8", "crypto": "944826f70779a6b6cd53f6b06a75b36f4d8a2558", "entity": "2c56268db0b270ad53e51af9cae5dc46876a65d9", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "mingcute": "master"},
"id": "pe5f45d325747aa4d",
"commit": "5d93a77a67b5f1cb799ffb59684fdb143af50264",
"dependencies": {"apps": "pa25b96ccf3b8fa6f", "crypto": "pc23fbf455e97614d", "entity": "p2d4cf957ef890a17", "kryon": "p8f647d8005d4c2a7", "mingcute": "pe1027b9d16704793"},
"dependency_refs": {"apps": "7854da88e219f98264dc41f1e614e4c9d292dded", "crypto": "944826f70779a6b6cd53f6b06a75b36f4d8a2558", "entity": "d9c0c38bf041e97959170c48d1fc408524445a34", "kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658", "mingcute": "master"},
"id": "pf3361a46d93f0525",
"name": "Shovey",
"ref": "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7",
"ref": "5d93a77a67b5f1cb799ffb59684fdb143af50264",
"url": "https://github.com/waozixyz/shovey.git"
},
{
"commit": "7e39f9fa43e0bde4bcc2426c79579e4f16c3749a",
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pe4419a225f95e507", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "7865957626e67e6c291e3db3b474c6082691d6c6", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
"id": "peb3fb337c2b79068",
"name": "Entity",
"ref": "master",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "cee04692f3461dcb098833472f071c434980debb",
"dependencies": {"kryon": "pe4419a225f95e507"},
"dependency_refs": {"kryon": "master"},
"id": "pf2f54c7603f6e861",
"name": "Game2D",
"ref": "master",
"url": "https://github.com/kryonlabs/game2d.git"
},
{
"commit": "3515cdf3af20e79001f7774eed224e94180540ed",
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "pe42819128210d99c"},
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "1cd873fda5d12cd4dd562956da94cee33c3e364c"},
"id": "pf7f4c26f3cf01fbe",
"name": "Apps",
"ref": "3515cdf3af20e79001f7774eed224e94180540ed",
"url": "https://github.com/waozixyz/apps.git"
"commit": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d",
"dependencies": {},
"id": "pf6b6695162f3781e",
"name": "practices",
"ref": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d",
"source": true,
"url": "https://github.com/waozixyz/practices.git"
}
],
"root": {
"dependencies": {"apps": "p2b1c0e80f47c3873", "choano": "p2f197edc2542d0f6", "daochi_client": "p6af0b5bd9fd0cd31", "entity": "p6ab8e2a733002786", "game2d": "p0e63706817d43aba", "inbe": "p183b01bccc6424e7", "kryon": "pbb0d432304fad5c6", "kss": "pa3347b028712cc32", "mingcute": "pe1027b9d16704793", "shovey": "pe5f45d325747aa4d", "wurm": "pb0ffd96a1a0f002c", "wurm_art": "p02e33d091b212961"},
"dependency_refs": {"apps": "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc", "choano": "eada9baf35b45a7ebea4fb93728403dcca34cb41", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "entity": "2c56268db0b270ad53e51af9cae5dc46876a65d9", "game2d": "8b5a989dea686250078da2d209fde1cd2946fc77", "inbe": "master", "kryon": "b5ac5d1a303326009012d68016c1d8859b6b3a13", "kss": "e3536e6d056961d2ba7fa5f18af81f75c80e8f62", "mingcute": "master", "shovey": "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7", "wurm": "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5", "wurm_art": "5e609079d1e91699a627b5d938d1fffa4a31ac07"},
"dependencies": {"apps": "pa25b96ccf3b8fa6f", "choano": "p1081a753e68847db", "css": "p778e65a802124e34", "daochi_client": "p6af0b5bd9fd0cd31", "entity": "p2d4cf957ef890a17", "game2d": "p449499e1e80e72a7", "inbe": "pe8884574da361bff", "kryon": "p8f647d8005d4c2a7", "liboqs": "p5c52c96443a2bf32", "mingcute": "pe1027b9d16704793", "shovey": "pf3361a46d93f0525", "wurm": "paa7bd5492e81d3ac", "wurm_art": "p02e33d091b212961"},
"dependency_refs": {"apps": "7854da88e219f98264dc41f1e614e4c9d292dded", "choano": "106be8ab7e915f618fa3fd3a6df296dc0a319beb", "css": "71a1b9f397a0941fc1bac58545f7fdb287c15c56", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "entity": "d9c0c38bf041e97959170c48d1fc408524445a34", "game2d": "5b8007aefac5518564c61aec7409d87d87e5c0ac", "inbe": "master", "kryon": "1b290f19aa1a4069c908a4687f04458c58a2b658", "liboqs": "7bf154f197696f5bf04be2ea4c576db86bb6a238", "mingcute": "master", "shovey": "5d93a77a67b5f1cb799ffb59684fdb143af50264", "wurm": "64aa16fcbba720dac3b1ad65f608a5f2bf02c5b9", "wurm_art": "5e609079d1e91699a627b5d938d1fffa4a31ac07"},
"name": "Arcade"
},
"toolchain": {
"commit": "0e91eb43bd665f02db86eb9b9cdd875b5436a066",
"ref": "0e91eb43bd665f02db86eb9b9cdd875b5436a066",
"commit": "d17c7aa1e093066ef03f307a45f6966dd9b29d4b",
"ref": "d17c7aa1e093066ef03f307a45f6966dd9b29d4b",
"url": "https://github.com/ziranlang/ziran.git"
}
}
+20 -13
View File
@@ -7,7 +7,7 @@ bridge_modules = ["app"]
[toolchain]
git = "https://github.com/ziranlang/ziran.git"
ref = "0e91eb43bd665f02db86eb9b9cdd875b5436a066"
ref = "d17c7aa1e093066ef03f307a45f6966dd9b29d4b"
[install]
bin = "arcade"
@@ -29,17 +29,17 @@ abis = "arm64-v8a,x86_64"
[dependencies.kryon]
git = "https://github.com/kryonlabs/kryon.git"
ref = "b5ac5d1a303326009012d68016c1d8859b6b3a13"
ref = "1b290f19aa1a4069c908a4687f04458c58a2b658"
[dependencies.apps]
git = "https://github.com/waozixyz/apps.git"
# Use the shared controller reviewed with the supported collection host.
ref = "cd72a242f8cdfd3ec3fc839fc11d9e7d7fc3b8fc"
ref = "7854da88e219f98264dc41f1e614e4c9d292dded"
# Shovey's editions and editor are available as separate downloads.
[dependencies.shovey]
git = "https://github.com/waozixyz/shovey.git"
ref = "6a8206d4b5615c1c8bc5cbc39ac27fb4a27f5ae7"
ref = "5d93a77a67b5f1cb799ffb59684fdb143af50264"
# Compatibility tooling runs Inner Breeze's host checks; releases check its publisher pins.
[dependencies.inbe]
@@ -48,23 +48,23 @@ ref = "master"
[dependencies.entity]
git = "https://github.com/waozixyz/entity.git"
ref = "2c56268db0b270ad53e51af9cae5dc46876a65d9"
ref = "d9c0c38bf041e97959170c48d1fc408524445a34"
[dependencies.mingcute]
git = "https://github.com/kryonlabs/mingcute.git"
ref = "master"
[dependencies.wurm]
git = "https://github.com/waozixyz/wurm.git"
ref = "3b7fbaf580d3c7e2a729a6f3d133737d8167f7b5"
git = "https://git.waozi.xyz/waozi/wurm.git"
ref = "64aa16fcbba720dac3b1ad65f608a5f2bf02c5b9"
[dependencies.game2d]
git = "https://github.com/kryonlabs/game2d.git"
ref = "8b5a989dea686250078da2d209fde1cd2946fc77"
ref = "5b8007aefac5518564c61aec7409d87d87e5c0ac"
[dependencies.choano]
git = "https://github.com/waozixyz/choano.git"
ref = "eada9baf35b45a7ebea4fb93728403dcca34cb41"
git = "https://git.waozi.xyz/waozi/choano.git"
ref = "106be8ab7e915f618fa3fd3a6df296dc0a319beb"
# Library art can advance independently of the tested game payload.
[dependencies.wurm_art]
@@ -76,6 +76,13 @@ source = true
git = "https://github.com/ziranlang/daochi-client.git"
ref = "970d5e44b1702158cb16469892da6ff50f142427"
[dependencies.kss]
git = "https://github.com/kryonlabs/kss.git"
ref = "e3536e6d056961d2ba7fa5f18af81f75c80e8f62"
[dependencies.css]
git = "https://github.com/kryonlabs/css.git"
ref = "71a1b9f397a0941fc1bac58545f7fdb287c15c56"
# Native hosts build with the liboqs Inner Breeze tests; its graph also
# carries an older liboqs pin, so name this one directly.
[dependencies.liboqs]
git = "https://github.com/open-quantum-safe/liboqs.git"
ref = "7bf154f197696f5bf04be2ea4c576db86bb6a238"
source = true