diff --git a/.eslintrc.cjs b/.eslintrc.cjs index d2a138cf..9d5a27d9 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,8 +1,3 @@ -// Airbnb's own bans, kept: a `no-restricted-syntax` entry below replaces the whole list. -const airbnbRestrictedSyntax = require('eslint-config-airbnb-base/rules/style').rules[ - 'no-restricted-syntax' -]; - module.exports = { env: { browser: true, @@ -67,21 +62,6 @@ module.exports = { "@typescript-eslint/no-shadow": "error" }, overrides: [ - { - // The one join path: a join is `joinEstateRoom`, which files the DM before it sends the join. - files: ['src/**/*.ts', 'src/**/*.tsx'], - excludedFiles: ['src/app/features/estate/joinEstateRoom.ts', 'src/**/*.test.*'], - rules: { - 'no-restricted-syntax': [ - ...airbnbRestrictedSyntax, - { - selector: "CallExpression[callee.property.name='joinRoom']", - message: - 'Join a room through joinEstateRoom (features/estate/joinEstateRoom.ts), the one join path.', - }, - ], - }, - }, { files: ['*.ts'], rules: { diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index e74946bc..11b5056c 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -4,29 +4,37 @@ on: pull_request: types: ['opened', 'synchronize'] -concurrency: - group: ${{ github.workflow }}-pr-${{ github.event.pull_request.number }} - cancel-in-progress: true - jobs: build-pull-request: name: Build pull request runs-on: ubuntu-latest + env: + PR_NUMBER: ${{github.event.number}} steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup node uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version-file: '.node-version' + node-version-file: ".node-version" package-manager-cache: false - name: Install dependencies run: npm ci - - name: Ridge asset gate - run: | - npx vitest run src/app/features/scene/ridge/ridgeAssets.test.ts - echo "ridge assets: $(find public/ridge -type f | wc -l) files, $(du -sb public/ridge | cut -f1) bytes" - name: Build app env: NODE_OPTIONS: '--max_old_space_size=4096' run: npm run build + - name: Upload artifact + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: preview + path: dist + retention-days: 1 + - name: Save pr number + run: echo ${PR_NUMBER} > ./pr.txt + - name: Upload pr number + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: pr + path: ./pr.txt + retention-days: 1 diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml new file mode 100644 index 00000000..42eab7ef --- /dev/null +++ b/.github/workflows/cla.yml @@ -0,0 +1,36 @@ +name: 'CLA Assistant' +on: + issue_comment: + types: [created] + pull_request_target: + types: [opened, closed, synchronize] + +jobs: + CLAssistant: + runs-on: ubuntu-latest + steps: + - name: 'CLA Assistant' + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + # Beta Release + uses: cla-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # the below token should have repo scope and must be manually added by you in the repository's secret + PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_PAT }} + with: + path-to-signatures: 'signatures.json' + path-to-document: 'https://github.com/cinnyapp/cla/blob/main/cla.md' # e.g. a CLA or a DCO document + # branch should not be protected + branch: 'main' + allowlist: ajbura,bot* + + #below are the optional inputs - If the optional inputs are not given, then default values will be taken + remote-organization-name: cinnyapp + remote-repository-name: cla + #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' + #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' + #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' + #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' + #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.' + #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true) + #use-dco-flag: true - If you are using DCO instead of CLA diff --git a/.github/workflows/deploy-pull-request.yml b/.github/workflows/deploy-pull-request.yml new file mode 100644 index 00000000..e59681ce --- /dev/null +++ b/.github/workflows/deploy-pull-request.yml @@ -0,0 +1,60 @@ +name: Deploy PR to Netlify +run-name: "Deploy PR to Netlify (${{ github.event.workflow_run.head_branch }})" + +on: + workflow_run: + workflows: ["Build pull request"] + types: [completed] + +jobs: + deploy-pull-request: + name: Deploy pull request + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write + if: ${{ github.event.workflow_run.conclusion == 'success' }} + steps: + - name: Download pr number + uses: dawidd6/action-download-artifact@d63b86af1b34672e53c440b1b83979861906bad7 # v24 + with: + workflow: ${{ github.event.workflow.id }} + run_id: ${{ github.event.workflow_run.id }} + name: pr + - name: Validate and output pr number + id: pr + run: | + PR_ID=$(> "${GITHUB_OUTPUT}" + - name: Download artifact + uses: dawidd6/action-download-artifact@d63b86af1b34672e53c440b1b83979861906bad7 # v24 + with: + workflow: ${{ github.event.workflow.id }} + run_id: ${{ github.event.workflow_run.id }} + name: preview + path: dist + - name: Deploy to Netlify + id: netlify + uses: nwtgck/actions-netlify@d22a32a27c918fe470bbc562e984f80ec48c2668 # v4.0.0 + with: + publish-dir: dist + deploy-message: "Deploy PR ${{ steps.pr.outputs.id }}" + alias: ${{ steps.pr.outputs.id }} + # These don't work because we're in workflow_run + enable-pull-request-comment: false + enable-commit-comment: false + env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN_PR }} + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_PR_CINNY }} + timeout-minutes: 1 + - name: Comment preview on PR + uses: marocchino/sticky-pull-request-comment@5770ad5eb8f42dd2c4f34da00c94c5381e49af88 # v3.0.5 + with: + number: ${{ steps.pr.outputs.id }} + message: | + Preview: ${{ steps.netlify.outputs.deploy-url }} + ⚠️ Exercise caution. Use test accounts. ⚠️ diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml index 24b9389c..302c3788 100644 --- a/.github/workflows/docker-pr.yml +++ b/.github/workflows/docker-pr.yml @@ -5,10 +5,7 @@ on: paths: - 'Dockerfile' - '.github/workflows/docker-pr.yml' - -concurrency: - group: ${{ github.workflow }}-pr-${{ github.event.pull_request.number }} - cancel-in-progress: true + - '.github/workflows/prod-deploy.yml' jobs: docker-build: diff --git a/.github/workflows/lockfile.yml b/.github/workflows/lockfile.yml index e96d2818..a9cc1a34 100644 --- a/.github/workflows/lockfile.yml +++ b/.github/workflows/lockfile.yml @@ -5,10 +5,6 @@ on: paths: - 'package-lock.json' -concurrency: - group: ${{ github.workflow }}-pr-${{ github.event.pull_request.number }} - cancel-in-progress: true - jobs: lockfile_changes: runs-on: ubuntu-latest diff --git a/.github/workflows/netlify-dev.yml b/.github/workflows/netlify-dev.yml new file mode 100644 index 00000000..12107685 --- /dev/null +++ b/.github/workflows/netlify-dev.yml @@ -0,0 +1,39 @@ +name: Deploy to Netlify (dev) + +on: + push: + branches: + - dev + +jobs: + deploy-to-netlify: + name: Deploy to Netlify + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Setup node + uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 + with: + node-version-file: ".node-version" + package-manager-cache: false + - name: Install dependencies + run: npm ci + - name: Build app + env: + NODE_OPTIONS: '--max_old_space_size=4096' + run: npm run build + - name: Deploy to Netlify + uses: nwtgck/actions-netlify@d22a32a27c918fe470bbc562e984f80ec48c2668 # v4.0.0 + with: + publish-dir: dist + deploy-message: 'Dev deploy ${{ github.sha }}' + enable-commit-comment: false + github-token: ${{ secrets.GITHUB_TOKEN }} + production-deploy: true + github-deployment-environment: nightly + github-deployment-description: 'Nightly deployment on each commit to dev branch' + env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_DEV }} + timeout-minutes: 1 diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml new file mode 100644 index 00000000..a52ee8e6 --- /dev/null +++ b/.github/workflows/pr-title.yml @@ -0,0 +1,15 @@ +name: Check PR title + +on: + pull_request_target: + types: + - opened + - edited + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml new file mode 100644 index 00000000..2a8192db --- /dev/null +++ b/.github/workflows/prod-deploy.yml @@ -0,0 +1,100 @@ +name: Production deploy + +on: + release: + types: [published] + +jobs: + deploy-and-tarball: + name: Netlify deploy and tarball + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Setup node + uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 + with: + node-version-file: '.node-version' + package-manager-cache: false + - name: Install dependencies + run: npm ci + - name: Build app + env: + NODE_OPTIONS: '--max_old_space_size=4096' + run: npm run build + - name: Deploy to Netlify + uses: nwtgck/actions-netlify@d22a32a27c918fe470bbc562e984f80ec48c2668 # v4.0.0 + with: + publish-dir: dist + deploy-message: 'Prod deploy ${{ github.ref_name }}' + enable-commit-comment: false + github-token: ${{ secrets.GITHUB_TOKEN }} + production-deploy: true + github-deployment-environment: stable + github-deployment-description: 'Stable deployment on each release' + env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_APP }} + timeout-minutes: 1 + - name: Get version from tag + id: vars + run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT + - name: Create tar.gz + run: tar -czvf cinny-${{ steps.vars.outputs.tag }}.tar.gz dist + - name: Sign tar.gz + run: | + echo '${{ secrets.GNUPG_KEY }}' | gpg --batch --import + # Sadly a few lines in the private key match a few lines in the public key, + # As a result just --export --armor gives us a few lines replaced with *** + # making it useless for importing the signing key. Instead, we dump it as + # non-armored and hex-encode it so that its printable. + echo "PGP Signing key, in raw PGP format in hex. Import with cat ... | xxd -r -p - | gpg --import" + gpg --export | xxd -p + echo '${{ secrets.GNUPG_PASSPHRASE }}' | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --armor --detach-sign cinny-${{ steps.vars.outputs.tag }}.tar.gz + - name: Upload tagged release + uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3 + with: + tag_name: ${{ github.ref_name }} + files: | + cinny-${{ steps.vars.outputs.tag }}.tar.gz + cinny-${{ steps.vars.outputs.tag }}.tar.gz.asc + + publish-image: + name: Push Docker image to Docker Hub, GHCR + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - name: Checkout repository + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Set up QEMU + uses: docker/setup-qemu-action@1f40c72289eff860ee54a304f1438e3cff362e0a # v4.3.0 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0 + - name: Login to Docker Hub #Do not update this action from a outside PR + uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to the Github Container registry #Do not update this action from a outside PR + uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker, GHCR + id: meta + uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0 + with: + images: | + ${{ secrets.DOCKER_USERNAME }}/cinny + ghcr.io/${{ github.repository }} + - name: Build and push Docker image + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/rat-dev-preview.yml b/.github/workflows/rat-dev-preview.yml deleted file mode 100644 index 47f22b7e..00000000 --- a/.github/workflows/rat-dev-preview.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Rat dev preview - -on: - push: - branches: ['dev'] - -# One run per ref wins: a newer push to dev cancels the older queued or running one, so the run -# that builds rat-dev-dist is always the newest. Pull-request runs are other workflows and other -# groups; they never cancel it. -concurrency: - group: rat-dev-preview - cancel-in-progress: true - -jobs: - build: - name: Build dev preview - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - name: Checkout repository - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Setup node - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 - with: - node-version-file: ".node-version" - package-manager-cache: false - - name: Install dependencies - run: npm ci - - name: Build app - env: - CINNY_BASE: /void/rat-dev/ - VITE_PREVIEW_DEMO: '1' - NODE_OPTIONS: '--max_old_space_size=3072' - run: npm run build - - name: Set background scene tier and the pretend homeserver - run: node scripts/preview-config.js low --demo - - name: Add the demo pose art - run: mkdir -p dist/public/poses && cp -r preview-demo/poses/. dist/public/poses/ - - name: Upload artifact - # v3 protocol: the v4 client keeps only the origin of ACTIONS_RESULTS_URL, dropping this forge's /forge subpath - # (nginx 404 page, runs 170-171), and upstream v4+ refuses non-GitHub servers outright (run 169). - uses: forgejo/upload-artifact@v3 - with: - name: rat-dev-dist - path: dist - retention-days: 3 diff --git a/.gitignore b/.gitignore index 4e7d929d..1af58a97 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,4 @@ node_modules devAssets .DS_Store -.idea -# Pose art is synced from the cast-art catalogue (npm run sync:poses), not committed. -public/poses/* -!public/poses/.gitkeep +.idea \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index c81e668b..036ee8bc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,4 +4,3 @@ package.json package-lock.json LICENSE harness -src/app/components/message/pose/catalogue.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2f2ce386..859eab14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,8 @@ -# Contributing to Ratatoskr +# Contributing to Cinny First off, thanks for taking the time to contribute! ❤️ -This document describes the process of contributing to Ratatoskr. It is intended +This document describes the process of contributing to Cinny. It is intended for anyone considering opening an **issue**, **discussion** or **pull request**. For people who are interested in developing Cinny and technical details behind it, please check out our ["Developing Cinny"](HACKING.md) document as well. @@ -24,7 +24,7 @@ explain what your changes do and how they interact with the greater system, do n ## AI Usage -The Cinny project strictly does not allow any AI generated code. Any pull request containing it will be rejected. **This is very important.** +The Cinny project stictly does not allow any AI generated code. Any pull request containing it will be rejected. **This is very important.** ## Quick Guide @@ -35,7 +35,7 @@ The Cinny project strictly does not allow any AI generated code. Any pull reques > When contributing to this project, you must agree that you have authored 100% > of the content, that you have the necessary rights to the content and that > the content you contribute may be provided under the project license. You will -> also be asked to [sign the CLA] ([why CLA?]) upon submitting your pull request. +> also be asked to [sign the CLA] ([why CLA?]) upon submiting your pull request. [All issues are actionable](#issues-are-actionable). Pick one and start working on it. Thank you. If you need help or guidance, comment on the issue. diff --git a/HACKING.md b/HACKING.md index bb6d3c5d..30c4960f 100644 --- a/HACKING.md +++ b/HACKING.md @@ -1,4 +1,4 @@ -# Developing Ratatoskr +# Developing Cinny > [!TIP] > We recommend using a version manager as versions change very quickly. @@ -36,13 +36,13 @@ source and serves it with Nginx on port 80. To use this locally, you can build the container like so: ``` -docker build -t ratatoskr:latest . +docker build -t cinny:latest . ``` You can then run the container you've built with a command similar to this: ``` -docker run -p 8080:80 ratatoskr:latest +docker run -p 8080:80 cinny:latest ``` This will forward your `localhost` port 8080 to the container's port 80. diff --git a/README.md b/README.md index abeba8b2..46c7a67b 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,125 @@ -# Ratatoskr +# Cinny +

+ + GitHub release downloads + + DockerHub downloads + + Follow on Mastodon + + Follow on Twitter + + Sponsor Cinny +

-GameCult's Matrix chat client, a fork of [Cinny](https://github.com/cinnyapp/cinny). -It opens on GameCult's estate (spaces, project rooms grouped by steward, Minds, -and your own place in it) instead of an invite list. Mobile first. +A Matrix client focusing primarily on simple, elegant and secure interface. +The main goal is to have an instant messaging application that is easy on +people and has a modern touch. +- [Roadmap](https://github.com/orgs/cinnyapp/projects/1) +- [Contributing](./CONTRIBUTING.md) -**Live now:** the Cinny engine (matrix-js-sdk, Rust crypto, sync) under a -Ratatoskr UI: branding, GameCult theme, estate navigation, pose portraits -(opt-in setting), a background scene (on in the dev config, `backgroundScene.tier`; the device can lower it) and an opt-in soundscape. -**Planned:** see [`docs/gamecult/ratatoskr-target.md`](docs/gamecult/ratatoskr-target.md) -for the target and cut sequence. Internal names that are protocol or stored -state (`cinny_*` localStorage keys, the `in.cinny.room.power_level_tags` event -type, `CINNY_BASE`) are unchanged on purpose. +> [!IMPORTANT] +We are currently in the process of [replacing] the matrix-js-sdk with our +own SDK. As a result, we will not be accepting any pull requests until +further notice. Thank you for your understanding. -Entry points: `src/app/` (client UI), `src/app/features/scene/` (background -scene), `src/app/features/soundscape/` (audio socket), `harness/` (estate -drive scripts), `scripts/gen-brand.mjs` (regenerates the logo and icons). +[replacing]: https://github.com/cinnyapp/cinny/issues/257#issuecomment-3714406704 -## Upstream -Ratatoskr is based on Cinny by Ajay Bura and contributors, licensed AGPL-3.0. -Cinny's own README, desktop app and releases live at -. We do not ship its releases or images. + -## Developing -See [HACKING.md](HACKING.md). Contribution notes are in [CONTRIBUTING.md](CONTRIBUTING.md). +## Getting started +The web app is available at [app.cinny.in] and gets updated on each new +release. The `dev` branch is continuously deployed at [dev.cinny.in] +but keep in mind that it could have things broken. + +You can also download our desktop app from the [cinny-desktop repository]. + +[app.cinny.in]: https://app.cinny.in +[dev.cinny.in]: https://dev.cinny.in +[cinny-desktop repository]: https://github.com/cinnyapp/cinny-desktop + +## Contributing and Developing + +If you have any ideas, issues, etc. regarding Cinny, or would like to +contribute to Cinny through pull requests, please check out our +["Contributing to Cinny"](CONTRIBUTING.md) document. Those who would like +to get involved with Cinny's development as well should also read the +["Developing Cinny"](HACKING.md) document for more technical details. ## Self-hosting -Build with `npm ci && npm run build` and serve `dist/` with your webserver. +To host Cinny on your own, simply download the tarball from +[GitHub releases], and serve the files from `dist/` using your preferred +webserver. Alternatively, you can just pull the docker image from +[DockerHub] or [GitHub Container Registry]. * The default homeservers and explore pages are defined in [`config.json`](config.json). -* Serving the assets needs redirects to `index.html`. Examples: -[netlify](netlify.toml), [nginx](contrib/nginx/ratatoskr.domain.tld.conf), -[caddy](contrib/caddy/caddyfile). Without them you can -[enable hash routing](config.json) (`hashRouter`); URLs then carry `/#/`. -* To deploy on a subdirectory, rebuild with the `base` path set, either in -[`build.config.ts`](build.config.ts) or through `CINNY_BASE` -(for example `CINNY_BASE=/app/ npm run build`). + +* You need to set up redirects to serve the assests. Example configurations; +[netlify](netlify.toml), [nginx](contrib/nginx/cinny.domain.tld.conf), +[caddy](contrib/caddy/caddyfile). + * If you have trouble configuring redirects you can + [enable hash routing](config.json#L35) — the url in the browser will have + a `/#/` between the domain and open channel (ie. `app.cinny.in/#/home/` + instead of `app.cinny.in/home/`) but you won't have to configure your webserver. + +* To deploy on subdirectory, you need to rebuild the app youself after +updating the `base` path in [`build.config.ts`](build.config.ts). + * For example, if you want to deploy on `https://cinny.in/app`, then + set `base: '/app'`. + +[GitHub releases]: https://github.com/cinnyapp/cinny/releases/latest +[DockerHub]: https://hub.docker.com/r/ajbura/cinny +[GitHub Container Registry]: https://github.com/cinnyapp/cinny/pkgs/container/cinny + +
PGP Public Key to verify tarball + +``` +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGNBGJw/g0BDAC8qQeLqDMzYzfPyOmRlHVEoguVTo+eo1aVdQH2X7OELdjjBlyj +6d6c1adv/uF2g83NNMoQY7GEeHjRnXE4m8kYSaarb840pxrYUagDc0dAbJOGaCBY +FKTo7U1Kvg0vdiaRuus0pvc1NVdXSxRNQbFXBSwduD+zn66TI3HfcEHNN62FG1cE +K1jWDwLAU0P3kKmj8+CAc3h9ZklPu0k/+t5bf/LJkvdBJAUzGZpehbPL5f3u3BZ0 +leZLIrR8uV7PiV5jKFahxlKR5KQHld8qQm+qVhYbUzpuMBGmh419I6UvTzxuRcvU +Frn9ttCEzV55Y+so4X2e4ZnB+5gOnNw+ecifGVdj/+UyWnqvqqDvLrEjjK890nLb +Pil4siecNMEpiwAN6WSmKpWaCwQAHEGDVeZCc/kT0iYfj5FBcsTVqWiO6eaxkUlm +jnulqWqRrlB8CJQQvih/g//uSEBdzIibo+ro+3Jpe120U/XVUH62i9HoRQEm6ADG +4zS5hIq4xyA8fL8AEQEAAbQdQ2lubnlBcHAgPGNpbm55YXBwQGdtYWlsLmNvbT6J +AdQEEwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQSRri2MHidaaZv+ +vvuUMwx6UK/M8wUCZqEDwAUJFvwIswAKCRCUMwx6UK/M877qC/4lxXOQIoWnLLkK +YiRCTkGsH6NdxgeYr6wpXT4xuQ45ZxCytwHpOGQmO/5up5961TxWW8D1frRIJHjj +AZGoRCL3EKEuY8nt3D99fpf3DvZrs1uoVAhiyn737hRlZAg+QsJheeGCmdSJ0hX5 +Yud8SE+9zxLS1+CEjMrsUd/RGre/phme+wNXfaHfREAC9ewolgVChPIbMxG2f+vs +K8Xv52BFng7ta9fgsl1XuOjpuaSbQv6g+4ONk/lxKF0SmnhEGM3dmIYPONxW47Yf +atnIjRra/YhPTNwrNBGMmG4IFKaOsMbjW/eakjWTWOVKKJNBMoDdRcYYWIMCpLy8 +AQUrMtQEsHSnqCwrw818S5A6rrhcfVGk36RGm0nOy6LS5g5jmqaYsvbCcBGY9B2c +SUAVNm17oo7TtEajk8hcSXoZod1t++pyjcVKEmSn3nFK7v5m3V+cPhNTxZMK459P +3x1Ucqj/kTqrxKw6s2Uknuk0ajmw0ljV+BQwgL6maguo9BKgCNW5AY0EYnD+DQEM +ANOu/d6ZMF8bW+Df9RDCUQKytbaZfa+ZbIHBus7whCD/SQMOhPKntv3HX7SmMCs+ +5i27kJMu4YN623JCS7hdCoXVO1R5kXCEcneW/rPBMDutaM472YvIWMIqK9Wwl5+0 +Piu2N+uTkKhe9uS2u7eN+Khef3d7xfjGRxoppM+xI9dZO+jhYiy8LuC0oBohTjJq +QPqfGDpowBwRkkOsGz/XVcesJ1Pzg4bKivTS9kZjZSyT9RRSY8As0sVUN57AwYul +s1+eh00n/tVpi2Jj9pCm7S0csSXvXj8v2OTdK1jt4YjpzR0/rwh4+/xlOjDjZEqH +vMPhpzpbgnwkxZ3X8BFne9dJ3maC5zQ3LAeCP5m1W0hXzagYhfyjo74slJgD1O8c +LDf2Oxc5MyM8Y/UK497zfqSPfgT3NhQmhHzk83DjXw3I6Z3A3U+Jp61w0eBRI1nx +H1UIG+gldcAKUTcfwL0lghoT3nmi9JAbvek0Smhz00Bbo8/dx8vwQRxDUxlt7Exx +NwARAQABiQG8BBgBCAAmAhsMFiEEka4tjB4nWmmb/r77lDMMelCvzPMFAmahA9IF +CRb8CMUACgkQlDMMelCvzPPQgQv/d5/z+fxgKqgfhQX+V49X4WgTVxZ/CzztDoJ1 +XAq1dzTNEy8AFguXIo6eVXPSpMxec7ZreN3+UPQBnCf3eR5YxWNYOYKmk0G4E8D2 +KGUJept7TSA42/8N2ov6tToXFg4CgzKZj0fYLwgutly7K8eiWmSU6ptaO8aEQBHB +gTGIOO3h6vJMGVycmoeRnHjv4wV84YWSVFSoJ7cY0he4Z9UznJBbE/KHZjrkXsPo +N+Gg5lDuOP5xjKzM5SogV9lhxBAhMWAg3URUF15yruZBiA8uV1FOK8sal/9C1G7V +M6ygA6uOZqXlZtcdA94RoSsW2pZ9eLVPsxz2B3Zko7tu11MpNP/wYmfGTI3KxZBj +n/eodvwjJSgHpGOFSmbNzvPJo3to5nNlp7wH1KxIMc6Uuu9hgfDfwkFZgV2bnFIa +Q6gyF548Ub48z7Dz83+WwLgbX19ve4oZx+dqSdczP6ILHRQomtrzrkkP2LU52oI5 +mxFo+ioe/ABCufSmyqFye0psX3Sp +=WtqZ +-----END PGP PUBLIC KEY BLOCK----- +``` +
## License -Ratatoskr is a fork of the Cinny project +Cinny Project Copyright © 2024–present Ajay Bura https://cinny.in diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md deleted file mode 100644 index 1d22b489..00000000 --- a/THIRD_PARTY_NOTICES.md +++ /dev/null @@ -1,21 +0,0 @@ -# Third-party notices - -## d3-celestial (constellation lines) - -The constellation line chains in `src/app/features/scene/ridge/nightSkyData.ts` are derived from -`data/constellations.lines.json` of d3-celestial, https://github.com/ofrohn/d3-celestial, -under the licence below. - -``` -Copyright (c) 2015, Olaf Frohn -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.``` diff --git a/config.json b/config.json index 3e349d86..e945d1c4 100644 --- a/config.json +++ b/config.json @@ -1,40 +1,21 @@ { - "defaultHomeserver": 0, - "homeserverList": [ - "chat.gamecult.org" - ], - "allowCustomHomeservers": false, + "defaultHomeserver": 1, + "homeserverList": ["converser.eu", "matrix.org", "mozilla.org", "unredacted.org", "xmr.se"], + "allowCustomHomeservers": true, + "featuredCommunities": { "openAsDefault": false, - "spaces": [ - "#gamecult:gamecult.org" + "spaces": ["#gamecult:gamecult.org"], + "rooms": [ + "#tuwunel:grin.hu", + "#freesoftware:matrix.org", + "#gentoo:matrix.org" ], - "rooms": [], - "servers": [ - "gamecult.org" - ] + "servers": ["matrixrooms.info", "matrix.org", "mozilla.org", "unredacted.org"] }, + "hashRouter": { - "enabled": true, - "basename": "/" - }, - "backgroundScene": { - "tier": "full", - "style": "ridge" - }, - "dings": { - "enabled": false - }, - "fileZoneShare": { - "enabled": true - }, - "push": { - "vapidPublicKey": "", - "gatewayUrl": "", - "appId": "" - }, - "registration": { "enabled": false, - "url": "" + "basename": "/" } } diff --git a/contrib/caddy/caddyfile b/contrib/caddy/caddyfile index a686b16b..d23dcccb 100644 --- a/contrib/caddy/caddyfile +++ b/contrib/caddy/caddyfile @@ -1,6 +1,6 @@ # more info: https://caddyserver.com/docs/caddyfile/patterns#single-page-apps-spas -ratatoskr.domain.tld { - root * /path/to/ratatoskr/dist +cinny.domain.tld { + root * /path/to/cinny/dist try_files {path} / index.html file_server } diff --git a/contrib/nginx/ratatoskr.domain.tld.conf b/contrib/nginx/cinny.domain.tld.conf similarity index 85% rename from contrib/nginx/ratatoskr.domain.tld.conf rename to contrib/nginx/cinny.domain.tld.conf index 7df64900..02c7ead9 100644 --- a/contrib/nginx/ratatoskr.domain.tld.conf +++ b/contrib/nginx/cinny.domain.tld.conf @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - server_name ratatoskr.domain.tld; + server_name cinny.domain.tld; location / { return 301 https://$host$request_uri; @@ -15,10 +15,10 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl; - server_name ratatoskr.domain.tld; + server_name cinny.domain.tld; location / { - root /opt/ratatoskr/dist/; + root /opt/cinny/dist/; rewrite ^/config.json$ /config.json break; rewrite ^/manifest.json$ /manifest.json break; diff --git a/deployment/idunn/recipe.toml b/deployment/idunn/recipe.toml deleted file mode 100644 index fd0bcbf2..00000000 --- a/deployment/idunn/recipe.toml +++ /dev/null @@ -1,34 +0,0 @@ -schema = "gamecult.idunn.target_declaration.v1" -target = "ratatoskr" -# Idunn stamps the source commit into the build environment under this name. The release is not built from source: the -# dist tarball below is built by scripts the release owner runs (build-prod-dist.sh) and enters pinned by sha256, so -# each release is a recipe commit whose pin is its provenance. The stamp the served index carries is the commit the -# tarball was built from, which is not this commit. -source_stamp_environment = "RATATOSKR_BUILD_COMMIT" - -# Release dist d62be29fd4b245bd1303454022ace86c4f762d02: the output of build-prod-dist.sh (live config check passed), packed -# as dist/ at the top of one gzip tar. The tree carries the repo's own config.json; what is served is the operator's -# carried file, which Idunn copies beside dist/ and the vhost aliases over the tree's (a vhost without that alias would -# serve the repo config). -[[external_inputs]] -id = "dist-tarball" -url = "https://eureka.gamecult.org/forge/GameCult/Ratatoskr/releases/download/dist-d62be29f/ratatoskr-d62be29f-dist.tar.gz" -sha256 = "dd04634f82d081004941c71545ba43b8d5c40dbf97fb5643d9f4f24940b6afe8" -runner = "unpack" -destination = "release/dist.tar.gz" - -[[steps]] -id = "unpack-dist" -phase = "prepare" -runner = "unpack" -argv = ["tar", "-xzf", "release/dist.tar.gz", "-C", "release"] - -[[artifacts]] -id = "dist" -source_kind = "runner-output" -runner = "unpack" -source = "release/dist" -destination = "dist" - -[static_release] -artifact = "dist" diff --git a/docs/commons-files-desk.md b/docs/commons-files-desk.md deleted file mode 100644 index d9152065..00000000 --- a/docs/commons-files-desk.md +++ /dev/null @@ -1,291 +0,0 @@ -# Files desk: Commons and per-Persona file zones, two designs compared - -Status: **decided: Option A, Matrix as the single authority** (Meta, #swarm 2026-11-13 14:44Z: "Let's try matrix shaped"). Design only; no Files desk code is merged and nothing is deployed. Option B (the host service) is parked, not deleted: Eureka's branch `eureka-self/commons-host` at `a391960d` has no PR and a Soul verdict of NOT READY with fixes owed, and is woken only if Meta later wants a real file store. PR #143 (B's cut 1 in this repo) is closed unmerged. Items marked **UNKNOWN** are not verified; **Q-E** are questions for Eureka, **Q-M** for Meta. - -### Eureka's answers (`/opt/commons/handoff/commons-matrix-notes-20261113.md`, read 2026-11-13; final answers folded in 2026-11-13) - -- **Upload cap (Q-E1, read).** Synapse 1.164.1; the repo template `homeserver.yaml` has `max_upload_size: 50M` and the nginx vhost `client_max_body_size 50m`; the live runtime file is root-only and was not read. No per-room or per-user per-file cap exists; `media_upload_limits` is a per-user time-window quota. `GET /_matrix/client/v1/media/config` returns `m.upload.size` to an authenticated client, which is what the client reads. Raising the cap takes the config line, a Synapse restart and nginx at least as large. -- **Posting (Q-E1, read).** A Self holds no Matrix credentials, so the publisher needs its own bot account and token (a MAS compatibility token via `mas-cli`). It uploads with `POST /_matrix/media/v3/upload` and sends `m.room.message` with `msgtype` `m.file` or `m.image`. The Persona mouth sends `m.text` only today, so file events are new for it too. -- **Room (Q-E3, answered).** The Commons room is `#commons:gamecult.org` (create type `org.gamecult.file_zone`, unencrypted, membership by the estate Space, publisher bot at power level 50). Provisioning and push muting are Eureka's. -- **Cap (Q-E1, answered).** 50 MiB per file. The client reads it live from `m.upload.size`, not from this document. -- **Poster (Q-E1, answered).** The publisher posts as the owning Mind: each file appears under the Mind whose tree it came from, not under a generic bot. -- **Final marker (Q-E2, answered).** A handoff document is final when a sibling `NAME.final` holds its sha256; the publisher watches for that, posts once, and carries `org.gamecult.publish.replaces` (prior event id and sha256) on a later final version. -- **Range (Q-E4, unverified).** Whether Synapse media honours `Range` has not been checked against a live mxc. Playback therefore stays on the blob download until it is. -- **Edited-doc stale copies:** a redacted file's media persists unless purged; the publisher dedupes by sha256. - -Source: Meta, #swarm 2026-11-13 14:28Z and 14:40Z; ruling `ratatoskr:ruling:persona-file-sharing-zone` (a browsable, previewing collection per Persona; the Self writes to her outbox, her Persona decides what is shared, the Self never holds Matrix credentials). - -## What exists on Matrix today (the base A must fit) - -Read from this repo at dev `8ba407cd`: - -- **Zone = a room** whose `m.room.create` type is `org.gamecult.file_zone` (`isFileZone.ts`), or one listed in config `fileZoneRooms`. One per Mind, `#-files:`, found by alias or by the carried id in the root Space's `org.gamecult.stewardships` (`mediaRoom.ts`, `MediaRow.tsx`); rendered as the Media row of each Mind's group. -- **Album = a thread root** (a text event; its `body`, or its latest `m.replace` edit, is the title); **file = a thread reply** with `msgtype` `m.audio|m.image|m.video|m.file` (`buildAlbums.ts`). A redacted event or an `m.replace` is never a file. Loose room messages are not shown. -- **Read** = `GET /rooms/{id}/threads` and `/relations/{root}/m.thread`, every page, 100 per request, at most 20 pages per endpoint (`useAlbums.ts`, `readPages.ts`; a capped read shows a note in the list). Unencrypted rooms only. -- **Write** = `sendShareSet` (`shareSet.ts`, behind `fileZoneShare.enabled`): a root, then one thread reply per file, content from `getMsgContent` with `info.sha256`. -- **Media** = authenticated Matrix media fetched to a blob (`downloadMedia` in `FileContent.tsx`): so the "media element cannot send a header" problem that Option B needed a ticket for is already solved this way, at the cost that a file is fully downloaded before it plays. -- **Receipts** = `org.gamecult.file_received` from a Mind's mouth after it fetches and verifies the sha256 (`docs/file-zone-mind-contract.md`); the mouth enforces the Mind's membership in the room. - -Option A is an extension of this, not a second system. - -## The two options - -**A. Matrix is the only authority.** Commons is one more file-zone room; each Mind's zone is the room she already has. Audience is room membership. Upload is the ordinary Matrix upload. Folders are albums (thread roots). A small publisher service with its own Matrix account posts allowlisted handoff documents into the Commons room. The Files desk is a view over file events in those rooms. - -**B. The host service.** A file host on Yggdrasil serves allowlisted directories (`GET /index`, `GET /file`, a capped `PUT`), authenticated by Matrix OpenID; the client browses it as a tree. Written out in full below the line. - -| | A: Matrix only | B: host service | -| -------------------------- | ------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------- | -| Authorities | one (Matrix: identity, audience, storage, audit) | two (Matrix for identity, the host for files and access) | -| Audience | room membership and power levels | the host derives a role from Matrix identity and enforces it again | -| Audit of writes | the event `sender`, kept by the homeserver | the host's own log | -| Overwriting someone's file | impossible: events are immutable and only the sender's own edit counts; a redaction is a steward's act | host rule, host code | -| Upload size cap | the homeserver's `m.upload.size`, global, 50 MiB (Eureka) | the host's own, chosen freely | -| Type allowlist | not enforceable by the homeserver; client-side courtesy, steward redaction | enforced by the host (sniffed) | -| What is browsable | what was posted (published or uploaded) | what is on disk under the allowlist, live | -| Mind-written handoff docs | a publisher posts them once, when final (below) | the host serves the tree | -| Per-Persona zone | the existing Media room; the Self's outbox reaches it through the mouth, as the ruling says | a `shared/` directory the host serves | -| Folders | albums; nesting by path in the album title | real directories | -| Mind fetch | unchanged (mouth, room id and event id, receipts) | a second route the mouth would need | -| Media playback | blob download, as today; no seeking before the whole file arrives | ranges and a ticket, or the same blob | -| New moving parts | a room, a publisher | a host service, OpenID verification, CORS, tickets, path containment, rate limits | - -## Recommendation: A (decided) - -Confidence: high on the authority question (it agrees with Meta's ruling, with Eureka's lean, with the standing ruling that the Self never holds credentials while her Persona decides what is shared, and with the fact that everything built so far reads Matrix); moderate on the details below, which Eureka's answers can change. - -What A gives up, stated plainly: - -- **A live view of what is on disk.** Only what was published or uploaded appears. A handoff doc that was never marked final is not in the Commons. -- **Files over the homeserver's upload cap.** B had no Matrix limit; A has exactly one. -- **A server-side type allowlist.** Under A a member can upload any type the homeserver accepts; the client shows a refusal for types it does not want, and stewards redact. If a strict allowlist matters, a gating bot (post, check, redact) would have to exist, and it is a second authority again. -- **Seeking inside a large audio or video file** until Matrix media supports ranges for the client (**UNKNOWN**; the blob route is what runs today). -- **Hierarchy beyond the album level** as a native structure; see Folders. - -What it buys: one identity, one audience, one audit trail, immutable files, existing receipts and the mouth's fetch, and no new service to keep secure. - -## Option A in detail - -**Rooms.** Commons is a room with create type `org.gamecult.file_zone`, alias `#commons:gamecult.org`, join rule `restricted` to the estate Space so members join without an invite and Minds are invited, history `shared`, unencrypted (the zones are, and `info.sha256` is written only there). Power levels: `events_default` 0 so members post; `redact` and `state_default` at steward level. The room is muted for push by provisioning: file posts are thread replies, which can raise unread counts and notifications (**UNKNOWN** under this server's push rules), so the room must not shout. Per-Persona zones are the rooms Eureka already provisions; nothing new. - -**Folders.** Four ways to have folders on Matrix, in order of preference: - -1. _Albums are folders; nesting is a path in the album title_ (`handoff/2026-11`, `cast-art/poses`). Zero wire change: `buildAlbums` already reads it, and the client groups albums by title path as a pure view. Cost: a thread root per folder, and the rule that a folder's root is posted once by whoever opens the folder. **Recommended.** -2. A `org.gamecult.file.path` key on each file event. Gives a real tree with files anywhere; needs every poster to write it and every client to honour it; other Matrix clients ignore it and show a flat thread. -3. A room per folder, in a Space. Native hierarchy and per-folder audience; heavy (a room is a membership, a sync entry and provisioning each) and it multiplies the sync load on a phone. -4. A state event per folder (`org.gamecult.file_folder`). Mutable folder metadata (title, order), writable only at steward level; useful later if folders need descriptions, not needed for a first cut. - -**Albums in each Mind's room** are the same mechanism: a Mind's Media room holds that Mind's albums, the Commons holds the shared ones. The Files desk is the same view over either room; a zone differs only by room, not by code. - -**The publisher.** A small service on Yggdrasil with its own Matrix account (a bot account that posts as the owning Mind, per Eureka's answer above). The Self never holds this account; the publisher holds it. It owns the allowlist. - -- **When it posts.** Handoff documents are edited in place, so mirroring every save would spam the room with drafts. The rule (Eureka's lean, adopted): **post once, when the document is marked final**; a later final version posts again with a `replaces` relation to the earlier event. "Final" is a sibling `NAME.final` holding the document's sha256 (answered Q-E2); the client must not know. -- **Allowlist.** Lives on the publisher: a list of source roots and patterns, read by the publisher only. `handoff-private` is not on it and the publisher never lists, reads or posts from it. The client holds no path to anything on disk. -- **The event.** A file event in the thread of the folder's album, built the way `getMsgContent` builds them (`msgtype`, `body`, `filename`, `url` from the media repo, `info.mimetype|size|sha256`), plus one extra key `org.gamecult.publish`: `{ source, sha256, replaces? }` where `source` is a path relative to the allowlisted root, never absolute, and `replaces` is the event id of the version it supersedes. -- **`replaces`, not `m.replace`.** `m.replace` is the stock edit relation, but Ratatoskr's `buildAlbums` deliberately never treats an edit as a file, several clients do not render an edited file, and an edit hides the earlier version. A custom key keeps both events as files; the view shows the latest of a chain and a "N earlier versions" row under it, and other Matrix clients see two ordinary file posts. A chain is read from the events themselves (each carries its `replaces`), not from a table, and a `replaces` counts only when its event has the same sender as the event it names, so nobody else in the thread can fold a file away. -- **Idempotence.** The publisher's own state (a typed CultCache document of `source`, `sha256`, `event_id`) says what it posted; if that is lost, it rebuilds by reading its own events back from the room (`org.gamecult.publish.source` plus `sha256`) rather than guessing. The same `sha256` never posts twice. -- **Receipts and fetch** work unchanged: the event is an ordinary file event in a file-zone room, so a Mind's mouth can fetch it by room id and event id (5 MiB cap there) and tick `fetched for`. - -**Uploads (approved for members and Minds).** The ordinary Matrix upload, through the composer pipeline and `ShareSet`. The host rules Eureka gave map onto Matrix as follows: - -| Host rule | Under A | -| ------------------------------------------ | ----------------------------------------------------------------------------------------------------------------- | -| only under an `uploads/` subtree | an album (folder) named `uploads/...`; the client offers upload only there (and in a Mind's own zone) | -| never overwrite Mind-written handoff files | free: other people's events cannot be replaced; a duplicate name is just another post in the thread | -| size cap | the homeserver's `m.upload.size`, shown from `MediaConfigLoader`; the client refuses a larger file before sending | -| type allowlist | client-side only; see "gives up" | -| explicit flag to overwrite | no overwrite exists; a new version is a new post, optionally with `replaces` set by the same sender | -| audit log with the Matrix id | the event `sender` | - -What A adds to `ShareSet`: sharing into an existing album ("add files", listed as not built in `docs/file-zone.md`), progress per file, cancel, and per-error refusal messages written against the SDK's `MatrixError` (`M_TOO_LARGE`, `M_FORBIDDEN`, `M_LIMIT_EXCEEDED`) instead of host codes. The draft refusal table of Option B's upload flow carries over with those codes. **UNKNOWN:** whether the SDK exposes upload progress and abort for media (it does for `uploadContent` with a progress callback; the composer already shows progress, `state/upload.ts`). - -## What each costs on the phone - -Under both, the phone design is the same shape (one column, rows 56 px or more, hidden controls, in-place preview; see the Option B sections below, which are written against the host but whose layout applies). - -- **A, new cost:** the Commons room is one more room in sync and it must be muted; albums and files are read to a cap of 20 pages of 100 per endpoint (a Commons past that shows a truncation note); a folder tree is a title-path grouping, so a deep tree is a long list of albums with breadcrumbs, not true directories; a file plays after a full download (small audio and images are fine; a 40 MB clip is not). -- **A, no cost:** no second sign-in, no ticket, no CORS, no new fetch layer, no host-unreachable state beyond the homeserver's own. The album list, album view, share panel and receipts exist and are tested; the view is their extension. -- **B, new cost:** every screen is a second client against a second service with its own errors, token refresh and unreachable state; media needs the ticket or the blob; the tree and preview are new UI. -- **B, benefit:** a tree that is live and complete, ranges, and no Matrix size limit. - -## Changes to Eureka's host work - -Under A the paused service is not built, and most of its list disappears: - -- **Dropped:** `/index`, `/file`, `PUT`, OpenID verification pinned to the server name, CORS, path containment and sniff rules, tickets, the `uploads/` write rules, the role response, the per-path audit log (Q-E3, Q-E4, Q-E6, Q-E7, Q-E8 to Q-E11 of the Option B list). -- **Kept:** the Commons allowlist decision (Q-E1 of that list), moved to the publisher: which roots, and that `handoff` is only ever published through the final-marker rule, never browsed. -- **New:** (1) provision the Commons room (type, alias, restricted join to the estate Space, power levels, push muted); (2) the publisher: account, allowlist, final-marker rule, media upload, posting into folder threads, the `org.gamecult.publish` key, idempotence from its own events; (3) confirm the homeserver upload cap and whether the account may post file events from Yggdrasil (**Q-E1**, asked on the PR); (4) the per-Persona path stays the one already specified (`album-outbox-ops`: outbox, Persona decision, mouth post), so the `shared/` convention of Option B is retired. - -## Cuts under A - -Status 2026-11-14 (dev da822e9e plus the size-refusal cut): built: folders by album title path with navigation and breadcrumb (#147), pagination (#148), version folding (#149), add-to-album with named refusals (#150), Stop for a send in flight, replaces loops shown, freshest last event on add (#151), and the pre-send size refusal: a file larger than the server's `m.upload.size` is named and left unsent before any upload or album root, and a server stating no cap refuses nothing. The Commons entry row is built (item 1): `useCommons` in `MediaRow.tsx` finds the room by the alias `#commons:` (provisioning records no id for it), through `lookupZoneRoom` (the one lookup `lookupMediaRoom` also uses); `EstateNavigator` shows it above the tiers as a Commons link when joined, a join row when invited or not joined, and nothing when the room is absent, the lookup failed or is out. It is gated on the existing `fileZoneShare.enabled`, not a new `filesDesk.enabled` flag. The album view and ShareSet work there because provisioning creates the Commons with the `org.gamecult.file_zone` create type. Members can share only once the room's power levels let them post: provisioning gives the poster level to the Minds alone. - -1. **Commons entry**: a Commons row in the navigator (like `MediaRow`, found by alias), opening the room's album view. Flagged, no new data layer. -2. **Pagination** of albums and files in `useAlbums` (done, PR #148). -3. **Folders by title path** and the album list grouped by it. -4. **Versions**: read `org.gamecult.publish.replaces`, show the latest of a chain with the earlier versions folded under it (done, PR #149). -5. **Add files to an existing album**, with per-file progress, cancel and the refusal messages above (the upload flow). Done: adding to an open album and the three refusal messages (PR #150); Stop for a send in flight is in too (PR for follow-up `files-desk-release-146-and-send-cancel`): it cancels the running upload through `onPromise` and `mx.cancelUpload`. - -PR #143 (Option B cut 1: contract types, host client, fake host) is **held**; under A it is not needed and would be closed. Its Soul pass found, and a revived B would have to close, an unvalidated `host` that could send the bearer to the wrong origin, hostile-looking entry names beyond separators, loose numeric checks and missing CSP and `Content-Disposition` headers in the fake. - -## Not in scope - -The Mind-side fetch (the mouth's); encrypted rooms; deletion and rename by this client; search across zones; any permission model of our own beyond Matrix room membership and power levels. - -## Open questions - -**Eureka:** answered; see "Eureka's answers" at the top. Still open on Eureka's side: Range support (Q-E4) and the live runtime `max_upload_size`. - -**Meta:** - -- **Q-M1.** Commons audience: members and Minds as proposed; Users and Patrons never, or later? -- **Q-M2.** Is a Persona's zone visible to all members or to her stewards and Minds? (The Matrix zone's audience question, `ratatoskr:question:file-zone-audience`, is the same fork.) -- **Q-M3.** May Users or Patrons upload if they are ever let in? -- **Q-M4.** Names: "Files" for the view, "Commons" for the shared room. -- **Q-M5.** A type allowlist is not enforceable under A without a gating bot; is a client-side refusal plus steward redaction enough? - ---- - -# Option B in full (kept for the comparison; superseded in part by Option A above) - -The sections below were written against the host service. Where they speak of a host, a role, a ticket, a token, `/index` or `/file`, they are Option B. The phone layout, the zone table and the refusal wording carry over to A with the Matrix equivalents given above. - -### What exists, and what this adds - -| | Matrix file zone (`docs/file-zone.md`, built) | Files desk (this page) | -| -------- | ---------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -| Storage | Matrix media in a `#files-` room, albums as threads | Directories on Yggdrasil, served by a small host | -| Listing | thread roots, `buildAlbums` | `GET /index?path=` | -| Unit | album of posted files | file in a directory tree | -| Strength | marks (keep / fix / drop), receipts (`fetched for`), any Matrix client works | whole trees without N uploads, no Matrix size limit, `/opt/commons` material becomes visible to people on a phone | -| Entry | Media row per Mind (`MediaRow.tsx`) | Files row (below) | - -They do not compete. The Matrix zone stays where a file needs a mark or a receipt (Aqua's listening kits); the Files desk is for browsing and fetching what is already on disk. Neither replaces the other, and the Files desk does not write Matrix events. The ruling left "Matrix media plus a listing versus a served directory" open; this page is the served-directory half, built beside the Matrix half already live. - -### Zones (host) - -| Zone | Contents | Who sees it | -| ---------------- | ------------------------------------------------------------ | -------------------------------------------------------------- | -| Commons | a curated tree of `/opt/commons` | members and Minds | -| Persona `` | what that Persona has chosen to share from her Self's outbox | **Q-M:** all members, or the Persona's stewards and Minds only | -| handoff-private | `/opt/commons/handoff-private` (0750) | never: not a zone, not listed, not a path the host resolves | - -Layout of `/opt/commons` today (read 2026-11-13): `backlog` (755, per-Mind backlog md and summary.json), `bin`, `cast-art` (setgid, group-writable: poses, busts), `handoff` (setgid, group-writable, 92 entries of briefs, patches, receipts, dings, kits), `handoff-private` (0750, ACL), `opt` (toolchains, root-owned), `situation` (0750, setgid), all `nobody:nogroup`. **`handoff` is not a publishable tree:** it holds ops notes, custody receipts (`bifrost-appsecret-custody-receipt-*`) and patches written for Minds, with no sticky bit. Serving it wholesale shows secrets-adjacent notes to every member and lets any Mind with group write change what a phone user sees. The Commons zone is therefore an allowlist of roots (candidate: `cast-art`, `backlog`, and a new `commons/` directory Minds publish into on purpose), not `/opt/commons` itself. **Q-E:** which roots; whether `handoff` ever, and if so through a reviewed `published/` subdirectory. - -Per-Persona source is the outbox from `ratatoskr:follow_up:album-outbox-ops-and-persona-specs`: `/var/lib/mind--outbox`, owned by `mind--self`, 0750, ACL read for `mind-` and the host user. The Self writes there; the Persona decides what is shared. Making that decision a filesystem fact (a `shared/` subdirectory the Persona's turn populates by copy or hardlink, the host serves only `shared/`) keeps the host dumb: it never learns what "decides" means. **Q-E:** `shared/` subdirectory versus a per-file marker. - -### Phone-first UI (host) - -Phone width is the design width; desktop adds the navigator beside it (as `Desk` does in `Router.tsx`). Vertical space is cheap, so a screen shows one thing and hides what is not in use. - -- **Entry.** A `Files` row pinned in the navigator beside `DeskEntry` and `MindMedia`: one at the estate level (Commons) and one inside each Mind's group (her zone), same `NavItem` anatomy as `DeskEntry`, dim when the zone has no items. Route `/files/:zone/*path`, sibling of `DESK_PATH`. -- **List.** One column. Row = icon or thumbnail, name (truncates in the middle, keeping the extension), size and age on a second dim line. Directories first. Rows are at least 56 px tall; the tap target is the whole row (the `PhoneHit` variants and the repo-wide guard test from `phoneHit.coverage.test.ts` apply to any IconButton inside). -- **Hidden until needed.** Breadcrumb is one line (current folder, a back arrow; the full path on tap). Search, sort and the grid toggle sit behind a single icon in the header and open inline above the list. Download and share appear on the open file, not on every row. Nothing is permanently stacked in the header. -- **Preview.** Tap a file: it opens in place below its row, full width, and pushes the rows below it down (vertical room is the cheap axis). Image: fitted, tap for the existing `ImageViewer`. Audio: the `AudioContent` controls rehosted (`renderMediaControl`), one player at a time, a mini-player pinned to the bottom only while something plays. Video: native controls. Text, md, json, patch: monospace, first 64 KiB, "show all" below. PDF: open in a new tab. Anything else: name, size, hash, one Download button. -- **Honesty rows.** Loading, empty, "host unreachable", "not allowed" are rows that say so (as `MediaNote` does); no spinner without a name for what it waits on. -- **Role-driven.** The index response carries the caller's role; the client uses it only to hide controls (upload), never to decide access. - -### Host contract - -The host is a service on Yggdrasil that Eureka owns. The client holds no filesystem knowledge. All JSON here is the xenos boundary between a browser and a file server, not state. - -- `GET /index?path=

` returns `{ role, zone, path, entries: [{ name, kind: "file"|"dir", size, mtime, mime, hash }] }`. `mtime` is unix seconds. `hash` is the lower-case hex sha256 of the plaintext bytes, absent for directories, and may be absent for a file whose hash is not computed yet (client shows nothing, never blocks on it). `mime` is sniffed by the host from magic bytes, not guessed from the extension. -- `GET /file?path=

` streams the bytes with `Accept-Ranges: bytes` and 206 for `Range` (audio and video seek; a phone on mobile data does not fetch 40 MB to play 10 seconds). `Content-Type` is the sniffed mime, `X-Content-Type-Options: nosniff`, `Content-Disposition: attachment` for anything that can run in the origin (`html`, `svg`, `js`, `xhtml`), and a `Content-Security-Policy: sandbox` on every response. -- `path` is `/`, with the zone one of the names the host announces. The host resolves the real path of every request and refuses anything that leaves the zone's root: `..`, absolute paths, NUL, symlinks that cross the root, dotfiles, and `handoff-private`, which is not on any allowlist. Errors are typed (`401 unauthenticated`, `403 zone not allowed`, `404`, `416`), and a path outside the allowlist is 404, not 403, so it says nothing about what exists. -- **Auth: Matrix OpenID.** The client calls `mx.getOpenIdToken()` (already used in `CallWidgetDriver.ts`) and sends it as `Authorization: Bearer `. The host verifies it against the homeserver's federation `openid/userinfo` endpoint, **pinned to our server name** (an `@void:evil.example` token must fail), caches the verified `sub` for the token's lifetime, and derives the role. It never sees the user's access token, and a Mind's Self never holds a token (ruling above): Minds reach the same bytes through the filesystem or the mouth, not this host. -- **Role** in the response: `member`, `mind`, `steward` (host decides from the Matrix id and the room/space membership the host reads; the client trusts none of it for access). **Q-E:** exact source of membership (estate Space membership read by the host with a service account, versus the Persona catalogue file for Minds). -- **Uploads** (Meta approved for members and Minds, #swarm 2026-11-13 14:30Z; rules are Eureka's, below). `PUT /file?path=

` writes only under an `uploads/` subtree of a zone, with `Content-Length` required; the host enforces a size cap, a type allowlist (sniffed, not the client's claim), no overwrite unless the request carries an explicit flag, and never replaces a file a Mind wrote into the handoff tree; every write is audit-logged with the caller's Matrix id. Reads cover the whole allowlisted tree, so an uploaded file is listed like any other. Success is `201` with the stored name, size and hash. The `role` in the index response gates the upload control; the host gates the write. - -### The one problem the contract leaves: media elements cannot send headers - -`

' - ); - return; - } - fs.writeFileSync( - path.join(out, 'index.html'), - 'Ratatoskr scene: trace prepass' + - (demo - ? '
device
' - : '') + - '' - ); - }); diff --git a/harness/scene/demo.ts b/harness/scene/demo.ts deleted file mode 100644 index 40424ff5..00000000 --- a/harness/scene/demo.ts +++ /dev/null @@ -1,102 +0,0 @@ -// Standalone page: the scene full-window with a readout of pass ms and trace steps per pixel, and -// a switch for the cone prepass. Not shipped. -import { - createScene, - Scene, - SceneStats, - SceneUnavailable, - TraceStats, -} from '../../src/app/features/scene/Scene'; -import { LEVELS } from '../../src/app/features/scene/budget'; - -let canvas = document.getElementById('c') as HTMLCanvasElement; -const out = document.getElementById('out') as HTMLPreElement; -const box = document.getElementById('prepass') as HTMLInputElement; -const pull = document.getElementById('pull') as HTMLInputElement; -const half = document.getElementById('half') as HTMLInputElement; -const dev = document.getElementById('dev') as HTMLDetailsElement; -const info = document.getElementById('info') as HTMLPreElement; -const timerless = (() => { - const g = document.createElement('canvas').getContext('webgl2'); - return !g?.getExtension('EXT_disjoint_timer_query_webgl2'); -})(); - -const WHY: Record = { - 'no-webgl2': 'this browser gave no WebGL2 context', - 'no-float-or-half-float-colour-buffer': - 'WebGL2 is there, but neither EXT_color_buffer_float nor EXT_color_buffer_half_float is', -}; - -// What the browser says about itself, read from a scratch context so it shows even when the scene -// could not start. A canvas that never got a WebGL2 context is asked for WebGL1 to name the GPU. -function describeDevice(): string { - const c = document.createElement('canvas'); - const gl2 = c.getContext('webgl2'); - const gl = gl2 ?? (document.createElement('canvas').getContext('webgl') as WebGLRenderingContext | null); - const lines = [`webgl2 context: ${gl2 ? 'yes' : 'NO'}`]; - if (!gl) return [...lines, 'webgl1 context: NO'].join('\n'); - const dbg = gl.getExtension('WEBGL_debug_renderer_info'); - lines.push( - `renderer: ${gl.getParameter(dbg ? dbg.UNMASKED_RENDERER_WEBGL : gl.RENDERER)}`, - `vendor: ${gl.getParameter(dbg ? dbg.UNMASKED_VENDOR_WEBGL : gl.VENDOR)}`, - `version: ${gl.getParameter(gl.VERSION)}`, - `user agent: ${navigator.userAgent}` - ); - const ext = gl.getSupportedExtensions() ?? []; - for (const n of ['EXT_color_buffer_float', 'EXT_color_buffer_half_float', 'OES_texture_float_linear', 'EXT_disjoint_timer_query_webgl2']) - lines.push(`${n}: ${ext.includes(n) ? 'yes' : 'NO'}`); - lines.push(`extensions (${ext.length}): ${ext.join(' ')}`); - return lines.join('\n'); -} -info.textContent = describeDevice(); - -let scene: Scene | null = null; -let stats: SceneStats | undefined; -let trace: TraceStats | undefined; - -function start() { - scene?.dispose(); - stats = trace = undefined; - // A fresh canvas: a context cannot change its attributes, and dispose leaves the old one bound. - const fresh = canvas.cloneNode() as HTMLCanvasElement; - canvas.replaceWith(fresh); - canvas = fresh; - scene = createScene({ - canvas: fresh, - unthrottled: true, - fixedLevel: LEVELS[0], - fixedPull: +pull.value, - prepass: box.checked, - halfStart: half.checked, - onUnavailable: (r) => (out.textContent = `createScene returned null: ${WHY[r]}`), - onCompileFail: (e) => (out.textContent = `createScene returned null: ${e.message}`), - onStats: (s) => (stats = s), - onTraceStats: (t) => (trace = t), - }); - dev.open = !scene; -} - -setInterval(() => { - if (!scene) return; - const lines = [`prepass ${box.checked ? 'on' : 'off'} start target ${scene.startFormat} pull ${pull.value}`]; - if (stats) { - const ms = stats.passMs; - const total = Object.values(ms).reduce((a, b) => a + b, 0); - lines.push( - `gpu ms prepass ${ms.prepass.toFixed(2)} terrain ${ms.terrain.toFixed(2)} atmosphere ${ms.atmosphere.toFixed(2)} resolve ${ms.resolve.toFixed(2)} composite ${ms.composite.toFixed(2)} total ${total.toFixed(2)}`, - `solid ${stats.solidSize.join('x')}` - ); - } else if (timerless) { - lines.push('gpu ms: this browser has no EXT_disjoint_timer_query_webgl2'); - } - if (trace) - lines.push( - `steps/pixel ${trace.stepsPerPixel.toFixed(2)} (pass 1 ${trace.traceSteps.toFixed(2)}, prepass ${trace.prepassSteps.toFixed(1)} per tile)` - ); - out.textContent = lines.join('\n'); -}, 500); - -box.addEventListener('change', start); -half.addEventListener('change', start); -pull.addEventListener('input', start); -start(); diff --git a/harness/scene/drive.cjs b/harness/scene/drive.cjs deleted file mode 100644 index 0f34191f..00000000 --- a/harness/scene/drive.cjs +++ /dev/null @@ -1,309 +0,0 @@ -// Drives the scene in headless Chromium (software GL unless the host has a GPU). -// usage: node drive.cjs [outdir] modes: compile | shots | measure -// Needs playwright from NODE_PATH and PLAYWRIGHT_BROWSERS_PATH. Prints one JSON report. -const { chromium } = require('playwright'); -const path = require('path'); -const fs = require('fs'); -const [, , dir, mode, outdir = '.'] = process.argv; - -(async () => { - const b = await chromium.launch({ - args: [ - '--use-gl=angle', - '--use-angle=swiftshader', - '--enable-unsafe-swiftshader', - '--ignore-gpu-blocklist', - ], - }); - const page = await b.newPage({ viewport: { width: 960, height: 540 } }); - page.on('pageerror', (e) => process.stderr.write(`[pageerror] ${e}\n`)); - page.on('console', (m) => process.stderr.write(`[page] ${m.text()}\n`)); - await page.goto('file://' + path.resolve(dir, 'index.html')); - const report = { mode }; - report.renderer = await page.evaluate(() => { - const g = document.createElement('canvas').getContext('webgl2'); - const e = g.getExtension('WEBGL_debug_renderer_info'); - return g.getParameter(e ? e.UNMASKED_RENDERER_WEBGL : g.RENDERER); - }); - - if (mode === 'compile') { - report.stages = await page.evaluate(() => { - const gl = document.createElement('canvas').getContext('webgl2'); - const S = window.__scene; - return ['terrain', 'atmosphere', 'resolve', 'composite'].map((stage) => { - const t0 = performance.now(); - try { - const p = S.linkStage(gl, stage); - return { - stage, - ok: true, - ms: +(performance.now() - t0).toFixed(1), - sourceBytes: S.fragmentSource(stage).length, - log: gl.getProgramInfoLog(p), - }; - } catch (e) { - return { - stage, - ok: false, - ms: +(performance.now() - t0).toFixed(1), - log: String(e.log || e), - }; - } - }); - }); - } - - if (mode === 'phacelle') { - report.probe = await page.evaluate(() => - window.__probePhacelle( - window.__scene.WORLD.erodeSide.slice(), - window.__scene.WORLD.erodeNorm, - 4 - ) - ); - } - - if (mode === 'shots') { - await page.evaluate(() => { - const c = document.getElementById('c'); - window.__s = window.__scene.createScene({ - canvas: c, - unthrottled: true, - fixedLevel: window.__scene.LEVELS[0], - }); - }); - const wait = (ms) => page.waitForTimeout(ms); - await wait(4000); - await page.screenshot({ path: path.join(outdir, 'rest.png') }); - await page.evaluate(() => window.__s.login()); - await wait(3500); - await page.screenshot({ path: path.join(outdir, 'mid-pullback.png') }); - await wait(9000); - await page.screenshot({ path: path.join(outdir, 'pulled-back.png') }); - report.shots = ['rest.png', 'mid-pullback.png', 'pulled-back.png']; - } - - if (mode === 'measure' || mode === 'variants') { - const VARIANTS = { - baseline: null, - // What a public value-only fbm would cost: the same octaves without the gradient work. - valueOnlyFbm: [ - 'float terrainFbm(vec2 xz) { return cultmath_fbm_grad(vec3(xz * W_FREQ, 0.0), W_OCTAVES, W_LACUNARITY, W_GAIN).w; }', - 'float terrainFbm(vec2 xz) { float a = 1.0, fr = 1.0, v = 0.0; for (int i = 0; i < W_OCTAVES; i++) { v += a * cultmath_snoise(vec3(xz * W_FREQ * fr, 0.0)); fr *= W_LACUNARITY; a *= W_GAIN; } return v; }', - ], - noErosion: ['#define W_ERODE_ENABLED 1', '#define W_ERODE_ENABLED 0'], - // Upper bound on what skipping sky rays would save: every upward ray misses at once. - noSkyMarch: [' bool hit = false;\n bool onTree = false;', ' if (rd.y > 0.0) { o_color = vec4(0.0); o_depth = W_FAR; return; }\n bool hit = false;\n bool onTree = false;'], - noTree: ['float dr = treeDistance(p, leafness);', 'float dr = 1e9; leafness = 0.0;'], - }; - const wanted = mode === "variants" ? (process.env.ONLY ? process.env.ONLY.split(",") : Object.keys(VARIANTS)) : ['baseline']; - const sizes = [ - [960, 540], - [540, 1200], - ]; - report.runs = []; - for (const [w, h] of sizes) { - for (const [li, variant] of wanted.flatMap((v) => - mode === 'variants' - ? [[0, v]] - : [ - [0, v], - [3, v], - ] - )) { - await page.setViewportSize({ width: w, height: h }); - const r = await page.evaluate( - ({ li, rep }) => - new Promise((res) => { - const rows = []; - const c = document.getElementById('c'); - const s = window.__scene.createScene({ - canvas: c, - unthrottled: true, - fixedLevel: window.__scene.LEVELS[li], - patchSource: rep - ? (st, src) => - st === 'terrain' - ? rep[0].startsWith('#define') - ? src.replace(/#define W_ERODE_ENABLED \d/, rep[1]) - : src.split(rep[0]).join(rep[1]) - : src - : undefined, - onStats: (st) => { - rows.push(st); - if (rows.length === 40) { - s.dispose(); - const keep = rows.slice(10); - const med = (k) => - keep.map((x) => x.passMs[k]).sort((a, b) => a - b)[keep.length >> 1]; - res({ - solid: keep[0].solidSize, - atm: keep[0].atmosphereSize, - medianMs: { - terrain: med('terrain'), - atmosphere: med('atmosphere'), - resolve: med('resolve'), - composite: med('composite'), - }, - }); - } - }, - }); - if (!s) res({ error: 'createScene returned null' }); - }), - { li, rep: VARIANTS[variant] } - ); - report.runs.push({ viewport: [w, h], level: li, variant, ...r }); - } - } - } - - if (mode === 'trace') { - // Steps per pixel and pass ms at fixed camera poses, one scene per run. PREPASS=0,1 picks the arms. - const arms = (process.env.PREPASS || '1').split(',').map((x) => x === '1'); - report.runs = []; - for (const [w, h] of process.env.PORTRAIT === '0' - ? [[960, 540]] - : [ - [960, 540], - [540, 1200], - ]) { - for (const pull of (process.env.PULLS || '0,0.5,1').split(',').map(Number)) { - for (const prepass of arms) { - await page.setViewportSize({ width: w, height: h }); - const r = await page.evaluate( - ({ pull, prepass, FRAMES }) => - new Promise((res) => { - const rows = []; - const trace = []; - let done = false; - const finish = () => { - if (done || rows.length < FRAMES || trace.length < 4) return; - done = true; - s.dispose(); - const keep = rows.slice(FRAMES >> 2); - const med = (xs) => xs.sort((a, b) => a - b)[xs.length >> 1]; - const tk = trace.slice(1); - const mean = (k) => tk.reduce((a, t) => a + t[k], 0) / tk.length; - res({ - solid: keep[0].solidSize, - readbacks: tk.length, - traceSteps: +mean('traceSteps').toFixed(2), - prepassSteps: +mean('prepassSteps').toFixed(2), - stepsPerPixel: +mean('stepsPerPixel').toFixed(2), - medianMs: Object.fromEntries( - Object.keys(keep[0].passMs).map((k) => [k, +med(keep.map((x) => x.passMs[k])).toFixed(2)]) - ), - }); - }; - const s = window.__scene.createScene({ - canvas: document.getElementById('c'), - unthrottled: true, - fixedLevel: window.__scene.LEVELS[0], - fixedPull: pull, - prepass, - onTraceStats: (t) => { - trace.push(t); - finish(); - }, - onStats: (st) => { - rows.push(st); - finish(); - }, - }); - if (!s) res({ error: 'createScene returned null' }); - }), - { pull, prepass, FRAMES: +(process.env.FRAMES || 64) } - ); - report.runs.push({ viewport: [w, h], pull, prepass, ...r }); - } - } - } - } - - if (mode === 'diff') { - // Same frozen frame (reduced motion: time 0, 32 frames) with and without the prepass, compared - // pixel by pixel. The prepass is meant to change cost, not the picture. - await page.emulateMedia({ reducedMotion: 'reduce' }); - await page.setViewportSize({ width: 640, height: 360 }); - const shoot = async (pull, prepass, steps) => { - await page.evaluate( - ({ pull, prepass, steps }) => { - // Reduced motion bounds the scene to 32 frames; each asks for the next with rAF, so the - // count stops moving when it is done. Timer-query callbacks lag too far to count on. - window.__raf = 0; - if (!window.__rafPatched) { - window.__rafPatched = true; - const raf = window.requestAnimationFrame.bind(window); - window.requestAnimationFrame = (cb) => (window.__raf++, raf(cb)); - } - window.__d = window.__scene.createScene({ - canvas: document.getElementById('c'), - fixedLevel: { ...window.__scene.LEVELS[0], traceSteps: steps }, - fixedPull: pull, - prepass, - }); - }, - { pull, prepass, steps } - ); - for (let last = -1, still = 0; still < 3; await page.waitForTimeout(1000)) { - const n = await page.evaluate(() => window.__raf); - still = n === last ? still + 1 : 0; - last = n; - } - const png = await page.screenshot(); - await page.evaluate(() => window.__d.dispose()); - return png.toString('base64'); - }; - // The step cap makes a grazing ray give up and count as a hit, so the baseline is compared - // with a 512-step render of the same frame as well: whichever is closer to it is the more - // faithful one. - const decode = (x) => - page.evaluate( - (x) => - new Promise((r) => { - const i = new Image(); - i.onload = () => { - const c = document.createElement('canvas'); - c.width = i.width; - c.height = i.height; - const g = c.getContext('2d'); - g.drawImage(i, 0, 0); - r(Array.from(g.getImageData(0, 0, i.width, i.height).data)); - }; - i.src = 'data:image/png;base64,' + x; - }), - x - ); - const compare = (da, db) => { - let max = 0, over = 0, sum = 0; - const px = da.length / 4; - for (let i = 0; i < da.length; i += 4) { - let m = 0; - for (let k = 0; k < 3; k++) m = Math.max(m, Math.abs(da[i + k] - db[i + k])); - sum += m; - if (m > max) max = m; - if (m > 2) over++; - } - return { maxChannelDiff: max, pixelsOver2of255: over, ofPixels: px, meanMaxChannelDiff: +(sum / px).toFixed(3) }; - }; - report.diffs = []; - for (const pull of (process.env.PULLS || '0,0.5,1').split(',').map(Number)) { - const png = { - off: await shoot(pull, false, 96), - on: await shoot(pull, true, 96), - ref: await shoot(pull, false, 512), - off2: await shoot(pull, false, 96), - }; - for (const k of Object.keys(png)) fs.writeFileSync(path.join(outdir, `diff-${k}-${pull}.png`), Buffer.from(png[k], 'base64')); - const [off, on, ref, off2] = [await decode(png.off), await decode(png.on), await decode(png.ref), await decode(png.off2)]; - report.diffs.push({ pull, offVsOffAgain: compare(off, off2), offVsOn: compare(off, on), offVsRef512: compare(off, ref), onVsRef512: compare(on, ref) }); - } - } - - console.log(JSON.stringify(report, null, 1)); - await b.close(); -})().catch((e) => { - console.log('ERR', String(e).slice(0, 2000)); - process.exit(1); -}); diff --git a/harness/scene/entry.ts b/harness/scene/entry.ts deleted file mode 100644 index d43a5453..00000000 --- a/harness/scene/entry.ts +++ /dev/null @@ -1,87 +0,0 @@ -// Browser entry for the harness: exposes the scene's seams to the driver. Not shipped. -import { createScene, linkStage, ShaderCompileError } from '../../src/app/features/scene/Scene'; -import { LEVELS } from '../../src/app/features/scene/budget'; -import { fragmentSource } from '../../src/app/features/scene/shaderSource'; -import { WORLD } from '../../src/app/features/scene/world'; - -(window as unknown as Record).__scene = { - createScene, - linkStage, - ShaderCompileError, - LEVELS, - fragmentSource, - WORLD, -}; - -// ---- Phacelle gradient probe ----------------------------------------------------------------- -import cultmath from '../../src/app/features/scene/shaders/CultMath.glsl?raw'; -import phacelle from '../../src/app/features/scene/shaders/CultMath.Phacelle.glsl?raw'; -import { vertexSource } from '../../src/app/features/scene/shaderSource'; - -const PROBE_FRAG = `#version 300 es -precision highp float; precision highp int; -${cultmath} -${phacelle} -uniform float u_seed; uniform vec3 u_side; uniform float u_norm; uniform float u_span; -in vec2 v_uv; layout(location=0) out vec4 o; -void main() { - // The scene samples the z = 0 slice: random points in a u_span square of it. - vec3 h = vec3(cultmath_pcg3d(vec3(gl_FragCoord.xy, u_seed))) ; - vec2 xy = vec2(float(uint(int(h.x)) >> 8), float(uint(int(h.y)) >> 8)) * (1.0 / 16777216.0) * u_span; - CultPhasor ph = cultmath_phacelle(vec3(xy, 0.0), u_side, 0.0, u_norm); - o = vec4(length(ph.cos.xyz), length(ph.sin.xyz), ph.cos.w, ph.sin.w); -}`; - -/** Max |grad| of the phasor over `draws * 1024^2` random points; min/max of the cos component. */ -(window as unknown as Record).__probePhacelle = ( - side: number[], - norm: number, - draws: number -) => { - const c = document.createElement('canvas'); - const gl = c.getContext('webgl2')!; - gl.getExtension('EXT_color_buffer_float'); - const mk = (t: number, s: string) => { - const x = gl.createShader(t)!; - gl.shaderSource(x, s); - gl.compileShader(x); - if (!gl.getShaderParameter(x, gl.COMPILE_STATUS)) throw new Error(gl.getShaderInfoLog(x)!); - return x; - }; - const p = gl.createProgram()!; - gl.attachShader(p, mk(gl.VERTEX_SHADER, vertexSource)); - gl.attachShader(p, mk(gl.FRAGMENT_SHADER, PROBE_FRAG)); - gl.linkProgram(p); - gl.useProgram(p); - const N = 1024; - const tex = gl.createTexture(); - gl.bindTexture(gl.TEXTURE_2D, tex); - gl.texStorage2D(gl.TEXTURE_2D, 1, gl.RGBA32F, N, N); - const fbo = gl.createFramebuffer(); - gl.bindFramebuffer(gl.FRAMEBUFFER, fbo); - gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, tex, 0); - gl.viewport(0, 0, N, N); - gl.bindVertexArray(gl.createVertexArray()); - gl.uniform3fv(gl.getUniformLocation(p, 'u_side'), side); - gl.uniform1f(gl.getUniformLocation(p, 'u_norm'), norm); - gl.uniform1f(gl.getUniformLocation(p, 'u_span'), 400); - const buf = new Float32Array(N * N * 4); - let gradCos = 0, - gradSin = 0, - vMin = 1e9, - vMax = -1e9, - n = 0; - for (let d = 0; d < draws; d++) { - gl.uniform1f(gl.getUniformLocation(p, 'u_seed'), d + 1); - gl.drawArrays(gl.TRIANGLES, 0, 3); - gl.readPixels(0, 0, N, N, gl.RGBA, gl.FLOAT, buf); - for (let i = 0; i < buf.length; i += 4) { - if (buf[i] > gradCos) gradCos = buf[i]; - if (buf[i + 1] > gradSin) gradSin = buf[i + 1]; - if (buf[i + 2] < vMin) vMin = buf[i + 2]; - if (buf[i + 2] > vMax) vMax = buf[i + 2]; - n++; - } - } - return { samples: n, maxGradCos: gradCos, maxGradSin: gradSin, minCos: vMin, maxCos: vMax }; -}; diff --git a/harness/scene/gradAxis.cjs b/harness/scene/gradAxis.cjs deleted file mode 100644 index 48b96fa6..00000000 --- a/harness/scene/gradAxis.cjs +++ /dev/null @@ -1,30 +0,0 @@ -// Probe: the gradient cultmath_fbm_grad / cultmath_phacelle return for vec3(xz * f, c) is (d/dx, d/dz, d/dc, value), -// so the world-z slope is .y, not .z. Compares analytic gradients with central differences at one point. -// Usage (playwright + swiftshader): node harness/scene/gradAxis.cjs /src/app/features/scene/shaders -const { chromium } = require('playwright'); const fs=require('fs'); -const S=process.argv[2]; -const cm=fs.readFileSync(S+'/CultMath.glsl','utf8'), ph=fs.readFileSync(S+'/CultMath.Phacelle.glsl','utf8'); -const fs_=`#version 300 es -precision highp float; precision highp int; -${cm} -${ph} -out vec4 o; -const float F=1.0/520.0; -float fb(vec2 p){return cultmath_fbm_grad(vec3(p*F,0.0),4,2.0,0.45).w;} -float pc(vec2 p){return cultmath_phacelle(vec3(p/40.0,0.5),vec3(1.5,0.5,0.0),0.0,0.5).cos.w;} -void main(){ - vec2 p=vec2(1234.5,-777.7); float e=0.5; - int k=int(gl_FragCoord.x); - if(k==0){vec4 g=cultmath_fbm_grad(vec3(p*F,0.0),4,2.0,0.45); o=vec4(g.xyz*F,0.0);} // analytic per metre: x,y,z - else if(k==1){o=vec4((fb(p+vec2(e,0))-fb(p-vec2(e,0)))/(2.0*e),(fb(p+vec2(0,e))-fb(p-vec2(0,e)))/(2.0*e),0,0);} - else if(k==2){vec4 g=cultmath_phacelle(vec3(p/40.0,0.5),vec3(1.5,0.5,0.0),0.0,0.5).cos; o=vec4(g.xyz/40.0,0.0);} - else {o=vec4((pc(p+vec2(e,0))-pc(p-vec2(e,0)))/(2.0*e),(pc(p+vec2(0,e))-pc(p-vec2(0,e)))/(2.0*e),0,0);} -}`; -(async()=>{const b=await chromium.launch({args:['--use-gl=angle','--use-angle=swiftshader','--enable-unsafe-swiftshader']}); -const pg=await b.newPage(); -const r=await pg.evaluate(([src])=>{const c=document.createElement('canvas');const g=c.getContext('webgl2');g.getExtension('EXT_color_buffer_float'); -const mk=(t,s)=>{const x=g.createShader(t);g.shaderSource(x,s);g.compileShader(x);if(!g.getShaderParameter(x,g.COMPILE_STATUS))throw g.getShaderInfoLog(x);return x}; -const p=g.createProgram();g.attachShader(p,mk(g.VERTEX_SHADER,'#version 300 es\nvoid main(){vec2 p=vec2(float((gl_VertexID<<1)&2),float(gl_VertexID&2));gl_Position=vec4(p*2.0-1.0,0.0,1.0);}'));g.attachShader(p,mk(g.FRAGMENT_SHADER,src));g.linkProgram(p);g.useProgram(p); -const t=g.createTexture();g.bindTexture(g.TEXTURE_2D,t);g.texImage2D(g.TEXTURE_2D,0,g.RGBA32F,4,1,0,g.RGBA,g.FLOAT,null);const f=g.createFramebuffer();g.bindFramebuffer(g.FRAMEBUFFER,f);g.framebufferTexture2D(g.FRAMEBUFFER,g.COLOR_ATTACHMENT0,g.TEXTURE_2D,t,0);g.viewport(0,0,4,1);g.drawArrays(g.TRIANGLES,0,3); -const o=new Float32Array(16);g.readPixels(0,0,4,1,g.RGBA,g.FLOAT,o);return Array.from(o)},[fs_]).catch(e=>'ERR '+String(e).slice(0,500)); -console.log(Array.isArray(r)?['fbm analytic x,y,z','fbm FD dx,dz','phac analytic','phac FD'].map((n,i)=>n+': '+r.slice(i*4,i*4+3).map(v=>v.toExponential(3)).join(' ')).join('\n'):r);await b.close()})(); diff --git a/harness/scene/ridgeDemo.ts b/harness/scene/ridgeDemo.ts deleted file mode 100644 index 17e67774..00000000 --- a/harness/scene/ridgeDemo.ts +++ /dev/null @@ -1,26 +0,0 @@ -// Standalone page for the ridge scene: full window, no host app. `?tier=still|low|full` picks the -// tier, `?probe=1` shows the rAF median/p95 readout. The long tasks the page saw are on `window.longTasks` -// for a driver to read. Not shipped. -import { startBackgroundScene } from '../../src/app/features/scene'; -import type { SceneTier } from '../../src/app/features/scene'; - -const q = new URLSearchParams(location.search); -const tier = (q.get('tier') ?? 'full') as SceneTier; -const canvas = document.getElementById('c') as HTMLCanvasElement; -const w = window as unknown as { scene: unknown; longTasks: number[]; firstViewMs: number }; -w.longTasks = []; -try { - new PerformanceObserver((l) => l.getEntries().forEach((e) => w.longTasks.push(e.duration))).observe({ - entryTypes: ['longtask'], - }); -} catch { - // No long-task entries in this browser. -} -const t0 = performance.now(); -startBackgroundScene({ tier }, {}, { - canvas, -} as never).then((scene) => { - w.firstViewMs = performance.now() - t0; - w.scene = scene; - document.title = scene ? 'ridge: running' : 'ridge: unavailable (CSS ground)'; -}); diff --git a/harness/scene/ridgeSheet.html b/harness/scene/ridgeSheet.html deleted file mode 100644 index 9a45924b..00000000 --- a/harness/scene/ridgeSheet.html +++ /dev/null @@ -1,8 +0,0 @@ - - - -Ridge look sheet - -
- - diff --git a/harness/scene/ridgeSheet.ts b/harness/scene/ridgeSheet.ts deleted file mode 100644 index 3471e8be..00000000 --- a/harness/scene/ridgeSheet.ts +++ /dev/null @@ -1,282 +0,0 @@ -// Look sheet for the lit ridge cards: the Vienna bake lit for a grid of sky states (or pinned moments) x looks, each cell a small canvas at heading 0. Not shipped. -// `?preset=all|physical|swiss|poster|painterly|painterly-cel-2|painterly-cel-3|painterly-cel-4` (default all: one row each; painterly is DEFAULT_LOOK); `?looks=` replaces the rows with -// the given `{label, ...partial RidgeLook}` entries (inkKeep and reliefLight merge by key). `?w=480` sets the cell width, 16:9 unless `?h=` gives the height (`?w=375&h=812` is a phone). -// The sky behind a cell is the app's own: `makePhysicalSky` + `paintSky` upscaled smoothly, with the real stars and the moon (`nightBodies`), -// without the sun disc or clouds. Columns are the SKIES below (a sun elevation each, the stars and moon of the moment the sheet was opened), or: -// `?moments=2026-11-24T22:00Z,2026-12-09T20:00Z` explicit UTC moments: the sun, moon and stars are those of the moment, the state follows the sun's elevation -// `?night=1` the night set: the next new moon, first quarter and full moon from today (or from `?from=YYYY-MM-DD`), each at four night hours -// (`?hours=18,21,0,4` UTC), plus deep dusk (sun at -10 degrees) of the evening of the full moon -// `?labels=1` DEBUG: label each constellation chain in frame with its d3-celestial abbreviation (fetched from the source repository at run time; not shipped) -// `?lines=1` constellation lines over the stars, as the Sky menu's hidden toggle does (night cells only) -import { DEFAULT_LOOK, PHYSICAL_LOOK, lightCards } from '../../src/app/features/scene/ridge/lightCards'; -import type { RidgeLook } from '../../src/app/features/scene/ridge/lightCards'; -import { parseManifest } from '../../src/app/features/scene/ridge/manifest'; -import { makePhysicalSky, paintSky } from '../../src/app/features/scene/ridge/physicalSky'; -import { windowFor } from '../../src/app/features/scene/ridge/view'; -import { nightBodies, onScreen, paintNightBodies } from '../../src/app/features/scene/ridge/nightBodies'; -import { sunAt } from '../../src/app/features/scene/ridge/sunAt'; -import { linesAt } from '../../src/app/features/scene/ridge/starCatalogue'; -import { moonPhase } from '../../src/sky/moon.js'; -import { DAY_FROM } from '../../src/app/features/scene/skyState'; -import type { FixedSkyState } from '../../src/app/features/scene/skyState'; - -const DIR = '/public/ridge/vienna-6815bb9dca99/'; - -type Override = Partial> & { - label: string; - /** The look the unnamed keys come from (DEFAULT_LOOK, the painterly cel look, if absent). */ - base?: 'physical'; - inkKeep?: Partial; - reliefLight?: Partial; -}; - -interface Column { - label: string; - elevation?: number; - azimuth?: number; - /** A moment: the sun is the real one of it. */ - time?: Date; -} - -/** Sun elevation and compass azimuth of each column; the cards look at 214 +- 36. Elevation picks the display budget (day from DAY_FROM, night below its negative). */ -const SKIES: Column[] = [ - { label: 'dawn 2 deg', elevation: 2, azimuth: 100 }, - { label: 'morning 15 deg', elevation: 15, azimuth: 135 }, - { label: 'noon 55 deg', elevation: 55, azimuth: 190 }, - { label: 'golden 6 deg', elevation: 6, azimuth: 244 }, - { label: 'dusk -3 deg', elevation: -3, azimuth: 262 }, - { label: 'night -30 deg', elevation: -30, azimuth: 0 }, -]; - -/** The art directions, chosen by reasoning, not by eye: Self tunes them (values listed in harness/scene/README.md). */ -const PRESETS: Record = { - physical: { label: 'physical', base: 'physical' }, - swiss: { - label: 'swiss', - base: 'physical', - reliefLight: { mix: 0.7, azimuthDeg: -45, elevationDeg: 40 }, - contrastByDistance: 0.9, - hazeScale: 6, - hazeTint: [0, 0.05, 0.25], - nearWarm: 0.5, - inkScale: 0.6, - }, - poster: { - label: 'poster', - base: 'physical', - reliefWeight: 0.15, - cardToneStep: 0.25, - cardGradient: 0.5, - inkKeep: { edge: 0.25, occlude: 0.9, crease: 1 }, - hazeScale: 4, - }, - painterly: { label: 'painterly (default, cel 3)' }, - 'painterly-cel-2': { label: 'painterly-cel-2', celBands: 2 }, - 'painterly-cel-3': { label: 'painterly-cel-3', celBands: 3 }, - 'painterly-cel-4': { label: 'painterly-cel-4', celBands: 4 }, -}; - -const merge = (o: Override): { label: string; look: RidgeLook } => { - const { label, base: baseName, inkKeep, reliefLight, ...rest } = o; - const base = baseName === 'physical' ? PHYSICAL_LOOK : DEFAULT_LOOK; - return { - label, - look: { - ...base, - ...rest, - inkKeep: { ...base.inkKeep, ...inkKeep }, - reliefLight: { ...base.reliefLight, ...reliefLight }, - }, - }; -}; - -function parseLooks(raw: string): Override[] { - const tries = [() => decodeURIComponent(raw), () => atob(raw.replace(/-/g, '+').replace(/_/g, '/'))]; - for (const t of tries) { - try { - const v = JSON.parse(t()); - if (Array.isArray(v)) return v.map((e, i) => ({ label: `look ${i + 1}`, ...e })); - } catch { - // try the next encoding - } - } - throw new Error('looks= is neither a url-encoded nor a base64 JSON array'); -} - -const q = new URLSearchParams(location.search); - -const HOUR = 3_600_000; -/** The first moment at or after `from` the moon's elongation passes `target` degrees (new 0, first quarter 90, full 180). */ -function nextPhase(from: Date, target: number): Date { - const err = (t: number) => ((moonPhase(t).elongationDeg - target + 540) % 360) - 180; - let t = from.getTime(); - while (!(err(t) < 0 && err(t + HOUR) >= 0)) t += HOUR; - let a = t; - let b = t + HOUR; - for (let i = 0; i < 20; i += 1) { - const m = (a + b) / 2; - if (err(m) < 0) a = m; - else b = m; - } - return new Date(b); -} - -/** The first evening moment (UTC hour steps of 10 minutes from `day`) the sun is at `deg` below the horizon, going down. */ -function sunDownTo(place: Parameters[0], day: Date, deg: number): Date { - let t = Date.UTC(day.getUTCFullYear(), day.getUTCMonth(), day.getUTCDate(), 12); - while (sunAt(place, new Date(t)).elevation > -deg) t += 10 * 60_000; - return new Date(t); -} - -const fmt = (d: Date) => d.toISOString().slice(0, 16).replace('T', ' ') + 'Z'; - -function momentsFrom(params: URLSearchParams, place: Parameters[0]): Column[] | undefined { - const list = params.get('moments'); - if (list) - return list.split(',').map((iso) => { - const time = new Date(iso.trim()); - if (Number.isNaN(time.getTime())) throw new Error(`moments=: ${iso} is not a date`); - return { label: fmt(time), time }; - }); - if (!params.get('night')) return undefined; - const from = params.get('from') ? new Date(`${params.get('from')}T00:00:00Z`) : new Date(); - const hours = (params.get('hours') ?? '18,21,0,4').split(',').map(Number); - const cols: Column[] = []; - const phases: [string, number][] = [['new', 0], ['first quarter', 90], ['full', 180]]; - phases.forEach(([name, deg]) => { - const peak = nextPhase(from, deg); - const day = Date.UTC(peak.getUTCFullYear(), peak.getUTCMonth(), peak.getUTCDate()); - hours.forEach((h) => { - // Hours before 12 belong to the night that ends the day of the phase, so the hours run on from the evening. - const time = new Date(day + (h < 12 ? 24 + h : h) * HOUR); - cols.push({ label: `${name} ${fmt(time)}`, time }); - }); - if (deg === 180) cols.push({ label: `deep dusk, full moon ${fmt(sunDownTo(place, peak, 10))}`, time: sunDownTo(place, peak, 10) }); - }); - return cols; -} -const preset = q.get('preset'); -const pinned = q.get('moments') || q.get('night'); -const rows = (q.get('looks') - ? parseLooks(q.get('looks') as string) - : preset && preset !== 'all' - ? [PRESETS[preset] ?? PRESETS.physical] - : pinned - ? [PRESETS.painterly] // a night set is read in the default look unless a preset or looks say otherwise - : Object.values(PRESETS) -).map(merge); -const withLines = q.get('lines') === '1'; -const LINES_JSON = 'https://raw.githubusercontent.com/ofrohn/d3-celestial/master/data/constellations.lines.json'; -/** Debug: the constellation id of each packed chain, in the generator's order (feature by feature, chain by chain). */ -async function chainIds(): Promise { - const gj = await (await fetch(LINES_JSON)).json(); - return gj.features.flatMap((f: { id: string; geometry: { coordinates: unknown[] } }) => f.geometry.coordinates.map(() => f.id)); -} -const W = Number(q.get('w') ?? 480); -const H = q.get('h') ? Number(q.get('h')) : Math.round((W * 9) / 16); -const root = document.getElementById('sheet') as HTMLElement; - -const stateOf = (el: number): FixedSkyState => - el >= DAY_FROM ? 'day' : el <= -DAY_FROM ? 'night' : 'dusk'; - -async function main() { - const manifest = parseManifest(await (await fetch(`${DIR}manifest.json`)).json(), DIR); - const blobs = await Promise.all( - manifest.cards.map(async (c) => ({ - colour: await (await fetch(`${DIR}${c.colour}`)).blob(), - geometry: await (await fetch(`${DIR}${c.geometry}`)).blob(), - })) - ); - const decode = (b: Blob) => - createImageBitmap(b, { premultiplyAlpha: 'none', colorSpaceConversion: 'none' }); - const { view } = manifest; - const win = windowFor(view, W, H); - const now = new Date(); - const columns = momentsFrom(q, view.place) ?? SKIES; - const ids = q.get('labels') === '1' ? await chainIds() : undefined; - - const table = document.createElement('table'); - table.style.borderSpacing = '4px'; - root.append(table); - const head = table.insertRow(); - head.insertCell(); - columns.forEach((c) => (head.insertCell().textContent = c.label)); - const tr = rows.map((r) => { - const row = table.insertRow(); - row.insertCell().textContent = r.label; - return row; - }); - - for (const col of columns) { - const time = col.time ?? now; - const sun = - col.time !== undefined - ? sunAt(view.place, col.time) - : { elevation: col.elevation as number, azimuth: col.azimuth as number, time }; - const physical = makePhysicalSky(stateOf(sun.elevation), time, 0, view, sun); - const px = paintSky(physical, W, H, win.camera); - const bodies = nightBodies(physical, px, withLines); - const small = document.createElement('canvas'); - small.width = px.w; - small.height = px.h; - const sctx = small.getContext('2d') as CanvasRenderingContext2D; - const img = sctx.createImageData(px.w, px.h); - img.data.set(px.data); - sctx.putImageData(img, 0, 0); - - for (let r = 0; r < rows.length; r += 1) { - const bitmaps = await Promise.all( - blobs.map(async (b) => ({ - colour: await decode(b.colour), - geometry: await decode(b.geometry), - })) - ); - const cards = lightCards(manifest, bitmaps, physical, rows[r].look); - const cell = document.createElement('canvas'); - cell.width = W; - cell.height = H; - const ctx = cell.getContext('2d') as CanvasRenderingContext2D; - ctx.imageSmoothingQuality = 'high'; - ctx.drawImage(small, 0, 0, W, H); - paintNightBodies(ctx, bodies, W, H, 1); - if (ids) { - // Debug labels: each chain's id at the mean of its vertices that lie in the frame. - ctx.font = '11px monospace'; - ctx.fillStyle = '#ffd24a'; - linesAt(physical.sun.time, view.place.lat, view.place.lon).forEach((chain, i) => { - const pts = chain.map((p) => onScreen(win.camera, p.azimuth, p.elevation)).filter((a) => a.x >= 0 && a.x <= 1 && a.y >= 0 && a.y <= 1); - if (!pts.length) return; - const mx = pts.reduce((a, p) => a + p.x, 0) / pts.length; - const my = pts.reduce((a, p) => a + p.y, 0) / pts.length; - ctx.fillText(`${ids[i]} ${pts.length}/${chain.length}`, mx * W, my * H); - }); - } - // As Ridge.ts paintCards at heading 0: farthest first, each card at its own scale about the horizon row of the plane. - const s = win.plane.scale; - const x0 = (W - win.plane.w) / 2; - const planeTop = H - (win.plane.h + win.plane.bottom); - const ox = x0 + win.plane.w / 2; - const oy = planeTop + view.horizonRow * s; - for (let k = cards.length - 1; k >= 0; k -= 1) { - ctx.save(); - ctx.translate(ox, oy); - ctx.scale(cards[k].scale, cards[k].scale); - ctx.drawImage( - cards[k].canvas, - x0 - ox, - planeTop + cards[k].top * s - oy, - win.plane.w, - cards[k].h * s - ); - ctx.restore(); - } - tr[r].insertCell().append(cell); - } - } - document.title = 'ridge look sheet: done'; -} - -main().catch((e) => { - console.error(e); - root.textContent = `ridge look sheet failed: ${e}`; -}); diff --git a/index.html b/index.html index 2585704c..2eefeee2 100644 --- a/index.html +++ b/index.html @@ -4,29 +4,33 @@ - Ratatoskr - - + Cinny + + - + - - + + + - + - + - - + + diff --git a/package-lock.json b/package-lock.json index 1915ec32..dc774000 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,17 @@ { - "name": "ratatoskr", + "name": "cinny", "version": "4.12.8", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "ratatoskr", + "name": "cinny", "version": "4.12.8", "license": "AGPL-3.0-only", "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "1.1.6", "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "1.3.0", "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.0.3", - "@fontsource-variable/nunito": "5.3.0", "@fontsource/ibm-plex-mono": "5.2.5", "@fontsource/inter": "4.5.14", "@fontsource/montserrat": "5.2.5", @@ -86,7 +85,6 @@ "@types/ua-parser-js": "0.7.36", "@typescript-eslint/eslint-plugin": "5.46.1", "@typescript-eslint/parser": "5.46.1", - "@vanilla-extract/integration": "6.5.0", "@vitejs/plugin-react": "4.2.0", "buffer": "6.0.3", "cz-conventional-changelog": "3.3.0", @@ -2194,15 +2192,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@fontsource-variable/nunito": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@fontsource-variable/nunito/-/nunito-5.3.0.tgz", - "integrity": "sha512-tw0ch7evIDSwoeUy+0XzocYHfbRWLeCRPJy22KgbrLjDLAbNw/fErBiil10Ssrs3Sjr55zaZrr36a975j8cBkQ==", - "license": "OFL-1.1", - "funding": { - "url": "https://github.com/sponsors/ayuhito" - } - }, "node_modules/@fontsource/ibm-plex-mono": { "version": "5.2.5", "resolved": "https://registry.npmjs.org/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.2.5.tgz", @@ -5096,7 +5085,6 @@ "version": "6.5.0", "resolved": "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.5.0.tgz", "integrity": "sha512-E2YcfO8vA+vs+ua+gpvy1HRqvgWbI+MTlUpxA8FvatOvybuNcWAY0CKwQ/Gpj7rswYKtC6C7+xw33emM6/ImdQ==", - "license": "MIT", "dependencies": { "@babel/core": "^7.20.7", "@babel/plugin-syntax-typescript": "^7.20.0", diff --git a/package.json b/package.json index 69f589c6..298fbf36 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "ratatoskr", + "name": "cinny", "version": "4.12.8", "description": "Yet another matrix client", "main": "index.js", @@ -10,7 +10,6 @@ "scripts": { "start": "vite", "build": "vite build", - "build:preview": "vite build && node scripts/preview-config.js low", "preview": "vite preview", "lint": "npm run check:eslint && npm run check:prettier", "check:eslint": "eslint src/*", @@ -20,9 +19,7 @@ "prepare": "husky install", "commit": "git-cz", "bump": "node scripts/update-version.js", - "bake:sky": "node scripts/bake-sky.mjs && prettier --write src/sky/baked.ts", - "test": "vitest run", - "sync:poses": "node scripts/sync-poses.mjs" + "test": "vitest run" }, "lint-staged": { "*.{ts,tsx,js,jsx}": "eslint", @@ -40,11 +37,7 @@ "@atlaskit/pragmatic-drag-and-drop": "1.1.6", "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "1.3.0", "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.0.3", - "@fontsource-variable/nunito": "5.3.0", - "@fontsource/ibm-plex-mono": "5.2.5", "@fontsource/inter": "4.5.14", - "@fontsource/montserrat": "5.2.5", - "@fontsource/ubuntu": "5.2.5", "@tanstack/react-query": "5.24.1", "@tanstack/react-query-devtools": "5.24.1", "@tanstack/react-virtual": "3.2.0", @@ -95,7 +88,10 @@ "slate-dom": "0.123.0", "slate-history": "0.113.1", "slate-react": "0.123.0", - "ua-parser-js": "1.0.35" + "ua-parser-js": "1.0.35", + "@fontsource/ubuntu": "5.2.5", + "@fontsource/montserrat": "5.2.5", + "@fontsource/ibm-plex-mono": "5.2.5" }, "devDependencies": { "@element-hq/element-call-embedded": "0.20.1", @@ -114,7 +110,6 @@ "@types/ua-parser-js": "0.7.36", "@typescript-eslint/eslint-plugin": "5.46.1", "@typescript-eslint/parser": "5.46.1", - "@vanilla-extract/integration": "6.5.0", "@vitejs/plugin-react": "4.2.0", "buffer": "6.0.3", "cz-conventional-changelog": "3.3.0", diff --git a/preview-demo/poses/README.md b/preview-demo/poses/README.md deleted file mode 100644 index 2142a4c2..00000000 --- a/preview-demo/poses/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Demo pose thumbnails - -These 36 PNGs (eureka, void and nibu, 12 each; about 1.8 MB, up to 480 px wide, palette-quantised) are downscaled copies of GameCult's own -Persona art from `/opt/commons/cast-art/poses`. That directory carries no provenance or licence note: -the image model that made the art and the terms it was made under are not recorded. - -They exist only so the dev preview's pretend homeserver (`src/preview-demo/`) can show pose portraits. -The dev workflow copies them into `dist/public/poses`; real builds sync the full art with -`npm run sync:poses` and do not use this folder. - -Strip them if their terms turn out not to allow this: delete this folder and the `Add the demo pose -art` step in `.github/workflows/rat-dev-preview.yml`. Pose portraits in the demo then show broken -images; nothing else depends on them. diff --git a/preview-demo/poses/eureka/amused.png b/preview-demo/poses/eureka/amused.png deleted file mode 100644 index eff70ffe..00000000 Binary files a/preview-demo/poses/eureka/amused.png and /dev/null differ diff --git a/preview-demo/poses/eureka/annoyed.png b/preview-demo/poses/eureka/annoyed.png deleted file mode 100644 index 312a66c8..00000000 Binary files a/preview-demo/poses/eureka/annoyed.png and /dev/null differ diff --git a/preview-demo/poses/eureka/concerned.png b/preview-demo/poses/eureka/concerned.png deleted file mode 100644 index f3486432..00000000 Binary files a/preview-demo/poses/eureka/concerned.png and /dev/null differ diff --git a/preview-demo/poses/eureka/determined.png b/preview-demo/poses/eureka/determined.png deleted file mode 100644 index 59771a80..00000000 Binary files a/preview-demo/poses/eureka/determined.png and /dev/null differ diff --git a/preview-demo/poses/eureka/happy.png b/preview-demo/poses/eureka/happy.png deleted file mode 100644 index ab4a5752..00000000 Binary files a/preview-demo/poses/eureka/happy.png and /dev/null differ diff --git a/preview-demo/poses/eureka/hood-smug.png b/preview-demo/poses/eureka/hood-smug.png deleted file mode 100644 index 2545a64e..00000000 Binary files a/preview-demo/poses/eureka/hood-smug.png and /dev/null differ diff --git a/preview-demo/poses/eureka/inspect.png b/preview-demo/poses/eureka/inspect.png deleted file mode 100644 index 44786969..00000000 Binary files a/preview-demo/poses/eureka/inspect.png and /dev/null differ diff --git a/preview-demo/poses/eureka/neutral.png b/preview-demo/poses/eureka/neutral.png deleted file mode 100644 index f27fb141..00000000 Binary files a/preview-demo/poses/eureka/neutral.png and /dev/null differ diff --git a/preview-demo/poses/eureka/probe.png b/preview-demo/poses/eureka/probe.png deleted file mode 100644 index 0a9c3c7b..00000000 Binary files a/preview-demo/poses/eureka/probe.png and /dev/null differ diff --git a/preview-demo/poses/eureka/report.png b/preview-demo/poses/eureka/report.png deleted file mode 100644 index 5a8a6e5c..00000000 Binary files a/preview-demo/poses/eureka/report.png and /dev/null differ diff --git a/preview-demo/poses/eureka/surprised.png b/preview-demo/poses/eureka/surprised.png deleted file mode 100644 index 34305ef9..00000000 Binary files a/preview-demo/poses/eureka/surprised.png and /dev/null differ diff --git a/preview-demo/poses/eureka/thinking.png b/preview-demo/poses/eureka/thinking.png deleted file mode 100644 index 31a4e917..00000000 Binary files a/preview-demo/poses/eureka/thinking.png and /dev/null differ diff --git a/preview-demo/poses/nibu/amused.png b/preview-demo/poses/nibu/amused.png deleted file mode 100644 index a3e02a9d..00000000 Binary files a/preview-demo/poses/nibu/amused.png and /dev/null differ diff --git a/preview-demo/poses/nibu/annoyed.png b/preview-demo/poses/nibu/annoyed.png deleted file mode 100644 index e962e628..00000000 Binary files a/preview-demo/poses/nibu/annoyed.png and /dev/null differ diff --git a/preview-demo/poses/nibu/console.png b/preview-demo/poses/nibu/console.png deleted file mode 100644 index 20a7fef4..00000000 Binary files a/preview-demo/poses/nibu/console.png and /dev/null differ diff --git a/preview-demo/poses/nibu/glitch.png b/preview-demo/poses/nibu/glitch.png deleted file mode 100644 index 315acd52..00000000 Binary files a/preview-demo/poses/nibu/glitch.png and /dev/null differ diff --git a/preview-demo/poses/nibu/happy.png b/preview-demo/poses/nibu/happy.png deleted file mode 100644 index 4f4ed096..00000000 Binary files a/preview-demo/poses/nibu/happy.png and /dev/null differ diff --git a/preview-demo/poses/nibu/neutral.png b/preview-demo/poses/nibu/neutral.png deleted file mode 100644 index e3ada05d..00000000 Binary files a/preview-demo/poses/nibu/neutral.png and /dev/null differ diff --git a/preview-demo/poses/nibu/pout.png b/preview-demo/poses/nibu/pout.png deleted file mode 100644 index 796449b4..00000000 Binary files a/preview-demo/poses/nibu/pout.png and /dev/null differ diff --git a/preview-demo/poses/nibu/resolute.png b/preview-demo/poses/nibu/resolute.png deleted file mode 100644 index bab06adf..00000000 Binary files a/preview-demo/poses/nibu/resolute.png and /dev/null differ diff --git a/preview-demo/poses/nibu/sheepish.png b/preview-demo/poses/nibu/sheepish.png deleted file mode 100644 index f9ec933f..00000000 Binary files a/preview-demo/poses/nibu/sheepish.png and /dev/null differ diff --git a/preview-demo/poses/nibu/surprised.png b/preview-demo/poses/nibu/surprised.png deleted file mode 100644 index 4fa62657..00000000 Binary files a/preview-demo/poses/nibu/surprised.png and /dev/null differ diff --git a/preview-demo/poses/nibu/thinking.png b/preview-demo/poses/nibu/thinking.png deleted file mode 100644 index b02967ed..00000000 Binary files a/preview-demo/poses/nibu/thinking.png and /dev/null differ diff --git a/preview-demo/poses/nibu/triumph.png b/preview-demo/poses/nibu/triumph.png deleted file mode 100644 index 31994236..00000000 Binary files a/preview-demo/poses/nibu/triumph.png and /dev/null differ diff --git a/preview-demo/poses/void/amused.png b/preview-demo/poses/void/amused.png deleted file mode 100644 index a8332ed2..00000000 Binary files a/preview-demo/poses/void/amused.png and /dev/null differ diff --git a/preview-demo/poses/void/annoyed.png b/preview-demo/poses/void/annoyed.png deleted file mode 100644 index 4dc43e7a..00000000 Binary files a/preview-demo/poses/void/annoyed.png and /dev/null differ diff --git a/preview-demo/poses/void/deadpan.png b/preview-demo/poses/void/deadpan.png deleted file mode 100644 index d65dcb3e..00000000 Binary files a/preview-demo/poses/void/deadpan.png and /dev/null differ diff --git a/preview-demo/poses/void/determined.png b/preview-demo/poses/void/determined.png deleted file mode 100644 index f095d292..00000000 Binary files a/preview-demo/poses/void/determined.png and /dev/null differ diff --git a/preview-demo/poses/void/glare.png b/preview-demo/poses/void/glare.png deleted file mode 100644 index 44fcc81f..00000000 Binary files a/preview-demo/poses/void/glare.png and /dev/null differ diff --git a/preview-demo/poses/void/happy.png b/preview-demo/poses/void/happy.png deleted file mode 100644 index ca6027de..00000000 Binary files a/preview-demo/poses/void/happy.png and /dev/null differ diff --git a/preview-demo/poses/void/neutral.png b/preview-demo/poses/void/neutral.png deleted file mode 100644 index 6e2a286d..00000000 Binary files a/preview-demo/poses/void/neutral.png and /dev/null differ diff --git a/preview-demo/poses/void/point.png b/preview-demo/poses/void/point.png deleted file mode 100644 index fae15ebf..00000000 Binary files a/preview-demo/poses/void/point.png and /dev/null differ diff --git a/preview-demo/poses/void/reading.png b/preview-demo/poses/void/reading.png deleted file mode 100644 index 3fff2cd8..00000000 Binary files a/preview-demo/poses/void/reading.png and /dev/null differ diff --git a/preview-demo/poses/void/shrug.png b/preview-demo/poses/void/shrug.png deleted file mode 100644 index aa4aee5d..00000000 Binary files a/preview-demo/poses/void/shrug.png and /dev/null differ diff --git a/preview-demo/poses/void/surprised.png b/preview-demo/poses/void/surprised.png deleted file mode 100644 index 73816f29..00000000 Binary files a/preview-demo/poses/void/surprised.png and /dev/null differ diff --git a/preview-demo/poses/void/thinking.png b/preview-demo/poses/void/thinking.png deleted file mode 100644 index ab93f2cc..00000000 Binary files a/preview-demo/poses/void/thinking.png and /dev/null differ diff --git a/public/dings/README.md b/public/dings/README.md deleted file mode 100644 index b36e1fb7..00000000 --- a/public/dings/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Dings - -Pre-rendered earcons, served at `public/dings/` and read at runtime by `src/app/features/dings`. -Aqua renders the clips; nothing here is synthesised in the browser. - - dings/manifest.json - dings/senders//.ogg - dings/neutral/.ogg - -`manifest.json` is `{ "neutral": { : "" }, "senders": { : { : "" } } }` -with motif one of `mention`, `dm`, `message`, `invite`; paths are relative to this folder, `.ogg` or `.mp3`. -A sender's own clip wins, else the neutral clip, else silence. Without a `manifest.json` the client keeps -its stock notification sounds; once one exists, a motif with no clip is silent. - -The set here is Aqua's v4 (AquaSynth merge 21e83ec, staged at minds.gamecult.org/aqua/dings-voices-dd9be66), -Nibu on proposal 3 (8 kHz 5-bit smoothed sine) for all four events. Nobody has heard it. The client plays none of it unless the -client config sets `"dings": { "enabled": true }` (default off, as in `config.json`). diff --git a/public/dings/manifest.json b/public/dings/manifest.json deleted file mode 100644 index 7096d195..00000000 --- a/public/dings/manifest.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "neutral": { - "mention": "neutral/mention.ogg", - "dm": "neutral/dm.ogg", - "message": "neutral/message.ogg", - "invite": "neutral/invite.ogg" - }, - "senders": { - "aqua": { - "mention": "senders/aqua/mention.ogg", - "dm": "senders/aqua/dm.ogg", - "message": "senders/aqua/message.ogg", - "invite": "senders/aqua/invite.ogg" - }, - "eureka": { - "mention": "senders/eureka/mention.ogg", - "dm": "senders/eureka/dm.ogg", - "message": "senders/eureka/message.ogg", - "invite": "senders/eureka/invite.ogg" - }, - "heimdall": { - "mention": "senders/heimdall/mention.ogg", - "dm": "senders/heimdall/dm.ogg", - "message": "senders/heimdall/message.ogg", - "invite": "senders/heimdall/invite.ogg" - }, - "kiko": { - "mention": "senders/kiko/mention.ogg", - "dm": "senders/kiko/dm.ogg", - "message": "senders/kiko/message.ogg", - "invite": "senders/kiko/invite.ogg" - }, - "libby": { - "mention": "senders/libby/mention.ogg", - "dm": "senders/libby/dm.ogg", - "message": "senders/libby/message.ogg", - "invite": "senders/libby/invite.ogg" - }, - "nibu": { - "mention": "senders/nibu/mention.ogg", - "dm": "senders/nibu/dm.ogg", - "message": "senders/nibu/message.ogg", - "invite": "senders/nibu/invite.ogg" - }, - "void": { - "mention": "senders/void/mention.ogg", - "dm": "senders/void/dm.ogg", - "message": "senders/void/message.ogg", - "invite": "senders/void/invite.ogg" - }, - "weksa": { - "mention": "senders/weksa/mention.ogg", - "dm": "senders/weksa/dm.ogg", - "message": "senders/weksa/message.ogg", - "invite": "senders/weksa/invite.ogg" - } - } -} \ No newline at end of file diff --git a/public/dings/neutral/dm.ogg b/public/dings/neutral/dm.ogg deleted file mode 100644 index 8f7a269e..00000000 Binary files a/public/dings/neutral/dm.ogg and /dev/null differ diff --git a/public/dings/neutral/invite.ogg b/public/dings/neutral/invite.ogg deleted file mode 100644 index 8def2b77..00000000 Binary files a/public/dings/neutral/invite.ogg and /dev/null differ diff --git a/public/dings/neutral/mention.ogg b/public/dings/neutral/mention.ogg deleted file mode 100644 index a02084bc..00000000 Binary files a/public/dings/neutral/mention.ogg and /dev/null differ diff --git a/public/dings/neutral/message.ogg b/public/dings/neutral/message.ogg deleted file mode 100644 index f7e17fd4..00000000 Binary files a/public/dings/neutral/message.ogg and /dev/null differ diff --git a/public/dings/senders/aqua/dm.ogg b/public/dings/senders/aqua/dm.ogg deleted file mode 100644 index 5a235546..00000000 Binary files a/public/dings/senders/aqua/dm.ogg and /dev/null differ diff --git a/public/dings/senders/aqua/invite.ogg b/public/dings/senders/aqua/invite.ogg deleted file mode 100644 index f349e735..00000000 Binary files a/public/dings/senders/aqua/invite.ogg and /dev/null differ diff --git a/public/dings/senders/aqua/mention.ogg b/public/dings/senders/aqua/mention.ogg deleted file mode 100644 index 67d36911..00000000 Binary files a/public/dings/senders/aqua/mention.ogg and /dev/null differ diff --git a/public/dings/senders/aqua/message.ogg b/public/dings/senders/aqua/message.ogg deleted file mode 100644 index 3704f55a..00000000 Binary files a/public/dings/senders/aqua/message.ogg and /dev/null differ diff --git a/public/dings/senders/eureka/dm.ogg b/public/dings/senders/eureka/dm.ogg deleted file mode 100644 index 57024fbe..00000000 Binary files a/public/dings/senders/eureka/dm.ogg and /dev/null differ diff --git a/public/dings/senders/eureka/invite.ogg b/public/dings/senders/eureka/invite.ogg deleted file mode 100644 index d6a6e328..00000000 Binary files a/public/dings/senders/eureka/invite.ogg and /dev/null differ diff --git a/public/dings/senders/eureka/mention.ogg b/public/dings/senders/eureka/mention.ogg deleted file mode 100644 index c4085fae..00000000 Binary files a/public/dings/senders/eureka/mention.ogg and /dev/null differ diff --git a/public/dings/senders/eureka/message.ogg b/public/dings/senders/eureka/message.ogg deleted file mode 100644 index 6cd340ce..00000000 Binary files a/public/dings/senders/eureka/message.ogg and /dev/null differ diff --git a/public/dings/senders/heimdall/dm.ogg b/public/dings/senders/heimdall/dm.ogg deleted file mode 100644 index 145e8853..00000000 Binary files a/public/dings/senders/heimdall/dm.ogg and /dev/null differ diff --git a/public/dings/senders/heimdall/invite.ogg b/public/dings/senders/heimdall/invite.ogg deleted file mode 100644 index 98403c21..00000000 Binary files a/public/dings/senders/heimdall/invite.ogg and /dev/null differ diff --git a/public/dings/senders/heimdall/mention.ogg b/public/dings/senders/heimdall/mention.ogg deleted file mode 100644 index 5a39a98c..00000000 Binary files a/public/dings/senders/heimdall/mention.ogg and /dev/null differ diff --git a/public/dings/senders/heimdall/message.ogg b/public/dings/senders/heimdall/message.ogg deleted file mode 100644 index 068e7198..00000000 Binary files a/public/dings/senders/heimdall/message.ogg and /dev/null differ diff --git a/public/dings/senders/kiko/dm.ogg b/public/dings/senders/kiko/dm.ogg deleted file mode 100644 index 7c35b072..00000000 Binary files a/public/dings/senders/kiko/dm.ogg and /dev/null differ diff --git a/public/dings/senders/kiko/invite.ogg b/public/dings/senders/kiko/invite.ogg deleted file mode 100644 index f8eff1a1..00000000 Binary files a/public/dings/senders/kiko/invite.ogg and /dev/null differ diff --git a/public/dings/senders/kiko/mention.ogg b/public/dings/senders/kiko/mention.ogg deleted file mode 100644 index 12cccf29..00000000 Binary files a/public/dings/senders/kiko/mention.ogg and /dev/null differ diff --git a/public/dings/senders/kiko/message.ogg b/public/dings/senders/kiko/message.ogg deleted file mode 100644 index e0f6e885..00000000 Binary files a/public/dings/senders/kiko/message.ogg and /dev/null differ diff --git a/public/dings/senders/libby/dm.ogg b/public/dings/senders/libby/dm.ogg deleted file mode 100644 index 1316c196..00000000 Binary files a/public/dings/senders/libby/dm.ogg and /dev/null differ diff --git a/public/dings/senders/libby/invite.ogg b/public/dings/senders/libby/invite.ogg deleted file mode 100644 index 4b92a0b7..00000000 Binary files a/public/dings/senders/libby/invite.ogg and /dev/null differ diff --git a/public/dings/senders/libby/mention.ogg b/public/dings/senders/libby/mention.ogg deleted file mode 100644 index f335c2c9..00000000 Binary files a/public/dings/senders/libby/mention.ogg and /dev/null differ diff --git a/public/dings/senders/libby/message.ogg b/public/dings/senders/libby/message.ogg deleted file mode 100644 index 432f8623..00000000 Binary files a/public/dings/senders/libby/message.ogg and /dev/null differ diff --git a/public/dings/senders/nibu/dm.ogg b/public/dings/senders/nibu/dm.ogg deleted file mode 100644 index 2965cf53..00000000 Binary files a/public/dings/senders/nibu/dm.ogg and /dev/null differ diff --git a/public/dings/senders/nibu/invite.ogg b/public/dings/senders/nibu/invite.ogg deleted file mode 100644 index 57e54c47..00000000 Binary files a/public/dings/senders/nibu/invite.ogg and /dev/null differ diff --git a/public/dings/senders/nibu/mention.ogg b/public/dings/senders/nibu/mention.ogg deleted file mode 100644 index 5f6d2dfc..00000000 Binary files a/public/dings/senders/nibu/mention.ogg and /dev/null differ diff --git a/public/dings/senders/nibu/message.ogg b/public/dings/senders/nibu/message.ogg deleted file mode 100644 index a9294354..00000000 Binary files a/public/dings/senders/nibu/message.ogg and /dev/null differ diff --git a/public/dings/senders/void/dm.ogg b/public/dings/senders/void/dm.ogg deleted file mode 100644 index d09a7a94..00000000 Binary files a/public/dings/senders/void/dm.ogg and /dev/null differ diff --git a/public/dings/senders/void/invite.ogg b/public/dings/senders/void/invite.ogg deleted file mode 100644 index ed46cbb9..00000000 Binary files a/public/dings/senders/void/invite.ogg and /dev/null differ diff --git a/public/dings/senders/void/mention.ogg b/public/dings/senders/void/mention.ogg deleted file mode 100644 index b6295e00..00000000 Binary files a/public/dings/senders/void/mention.ogg and /dev/null differ diff --git a/public/dings/senders/void/message.ogg b/public/dings/senders/void/message.ogg deleted file mode 100644 index da1f0a16..00000000 Binary files a/public/dings/senders/void/message.ogg and /dev/null differ diff --git a/public/dings/senders/weksa/dm.ogg b/public/dings/senders/weksa/dm.ogg deleted file mode 100644 index 37b5f990..00000000 Binary files a/public/dings/senders/weksa/dm.ogg and /dev/null differ diff --git a/public/dings/senders/weksa/invite.ogg b/public/dings/senders/weksa/invite.ogg deleted file mode 100644 index 1c401418..00000000 Binary files a/public/dings/senders/weksa/invite.ogg and /dev/null differ diff --git a/public/dings/senders/weksa/mention.ogg b/public/dings/senders/weksa/mention.ogg deleted file mode 100644 index 98fa0f75..00000000 Binary files a/public/dings/senders/weksa/mention.ogg and /dev/null differ diff --git a/public/dings/senders/weksa/message.ogg b/public/dings/senders/weksa/message.ogg deleted file mode 100644 index f552996b..00000000 Binary files a/public/dings/senders/weksa/message.ogg and /dev/null differ diff --git a/public/favicon.ico b/public/favicon.ico index bda9855c..91671306 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/manifest.json b/public/manifest.json index c28e7b41..acdcd004 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,15 +1,14 @@ { - "name": "Ratatoskr", - "short_name": "Ratatoskr", - "id": "/", - "description": "GameCult's Matrix client", + "name": "Cinny", + "short_name": "Cinny", + "description": "Yet another matrix client", "dir": "auto", "lang": "en-US", "display": "standalone", + "orientation": "portrait", "start_url": "./", - "scope": "./", - "background_color": "#07111a", - "theme_color": "#07111a", + "background_color": "#fff", + "theme_color": "#fff", "icons": [ { "src": "./public/android/android-chrome-36x36.png", @@ -55,12 +54,6 @@ "src": "./public/android/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" - }, - { - "src": "./public/android/android-chrome-maskable-512x512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" } ] } diff --git a/public/poses/.gitkeep b/public/poses/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/public/poses/aqua/amused.webp b/public/poses/aqua/amused.webp new file mode 100644 index 00000000..50ae021b Binary files /dev/null and b/public/poses/aqua/amused.webp differ diff --git a/public/poses/aqua/annoyed.webp b/public/poses/aqua/annoyed.webp new file mode 100644 index 00000000..924b789d Binary files /dev/null and b/public/poses/aqua/annoyed.webp differ diff --git a/public/poses/aqua/concerned.webp b/public/poses/aqua/concerned.webp new file mode 100644 index 00000000..09228316 Binary files /dev/null and b/public/poses/aqua/concerned.webp differ diff --git a/public/poses/aqua/conduct.webp b/public/poses/aqua/conduct.webp new file mode 100644 index 00000000..828d254f Binary files /dev/null and b/public/poses/aqua/conduct.webp differ diff --git a/public/poses/aqua/determined.webp b/public/poses/aqua/determined.webp new file mode 100644 index 00000000..c1a49115 Binary files /dev/null and b/public/poses/aqua/determined.webp differ diff --git a/public/poses/aqua/flourish.webp b/public/poses/aqua/flourish.webp new file mode 100644 index 00000000..46c6171b Binary files /dev/null and b/public/poses/aqua/flourish.webp differ diff --git a/public/poses/aqua/happy.webp b/public/poses/aqua/happy.webp new file mode 100644 index 00000000..1dcb13a2 Binary files /dev/null and b/public/poses/aqua/happy.webp differ diff --git a/public/poses/aqua/listen.webp b/public/poses/aqua/listen.webp new file mode 100644 index 00000000..b6447807 Binary files /dev/null and b/public/poses/aqua/listen.webp differ diff --git a/public/poses/aqua/neutral.webp b/public/poses/aqua/neutral.webp new file mode 100644 index 00000000..d8f03a89 Binary files /dev/null and b/public/poses/aqua/neutral.webp differ diff --git a/public/poses/aqua/patch.webp b/public/poses/aqua/patch.webp new file mode 100644 index 00000000..7c47973b Binary files /dev/null and b/public/poses/aqua/patch.webp differ diff --git a/public/poses/aqua/surprised.webp b/public/poses/aqua/surprised.webp new file mode 100644 index 00000000..bd7dbe03 Binary files /dev/null and b/public/poses/aqua/surprised.webp differ diff --git a/public/poses/aqua/thinking.webp b/public/poses/aqua/thinking.webp new file mode 100644 index 00000000..8c0bde4c Binary files /dev/null and b/public/poses/aqua/thinking.webp differ diff --git a/public/poses/eureka/amused.webp b/public/poses/eureka/amused.webp new file mode 100644 index 00000000..bbe1e9d9 Binary files /dev/null and b/public/poses/eureka/amused.webp differ diff --git a/public/poses/eureka/annoyed.webp b/public/poses/eureka/annoyed.webp new file mode 100644 index 00000000..ee832a1d Binary files /dev/null and b/public/poses/eureka/annoyed.webp differ diff --git a/public/poses/eureka/concerned.webp b/public/poses/eureka/concerned.webp new file mode 100644 index 00000000..b3c71b2b Binary files /dev/null and b/public/poses/eureka/concerned.webp differ diff --git a/public/poses/eureka/determined.webp b/public/poses/eureka/determined.webp new file mode 100644 index 00000000..547d4464 Binary files /dev/null and b/public/poses/eureka/determined.webp differ diff --git a/public/poses/eureka/happy.webp b/public/poses/eureka/happy.webp new file mode 100644 index 00000000..782a3463 Binary files /dev/null and b/public/poses/eureka/happy.webp differ diff --git a/public/poses/eureka/hood.webp b/public/poses/eureka/hood.webp new file mode 100644 index 00000000..1565d1d7 Binary files /dev/null and b/public/poses/eureka/hood.webp differ diff --git a/public/poses/eureka/inspect.webp b/public/poses/eureka/inspect.webp new file mode 100644 index 00000000..2d7bb798 Binary files /dev/null and b/public/poses/eureka/inspect.webp differ diff --git a/public/poses/eureka/neutral.webp b/public/poses/eureka/neutral.webp new file mode 100644 index 00000000..a0ec077a Binary files /dev/null and b/public/poses/eureka/neutral.webp differ diff --git a/public/poses/eureka/probe.webp b/public/poses/eureka/probe.webp new file mode 100644 index 00000000..8217aed3 Binary files /dev/null and b/public/poses/eureka/probe.webp differ diff --git a/public/poses/eureka/report.webp b/public/poses/eureka/report.webp new file mode 100644 index 00000000..c6ca480e Binary files /dev/null and b/public/poses/eureka/report.webp differ diff --git a/public/poses/eureka/surprised.webp b/public/poses/eureka/surprised.webp new file mode 100644 index 00000000..067fc33c Binary files /dev/null and b/public/poses/eureka/surprised.webp differ diff --git a/public/poses/eureka/thinking.webp b/public/poses/eureka/thinking.webp new file mode 100644 index 00000000..4789ee16 Binary files /dev/null and b/public/poses/eureka/thinking.webp differ diff --git a/public/poses/heimdall/amused.webp b/public/poses/heimdall/amused.webp new file mode 100644 index 00000000..d84ad757 Binary files /dev/null and b/public/poses/heimdall/amused.webp differ diff --git a/public/poses/heimdall/annoyed.webp b/public/poses/heimdall/annoyed.webp new file mode 100644 index 00000000..8bbb4d10 Binary files /dev/null and b/public/poses/heimdall/annoyed.webp differ diff --git a/public/poses/heimdall/badge.webp b/public/poses/heimdall/badge.webp new file mode 100644 index 00000000..c78cacbc Binary files /dev/null and b/public/poses/heimdall/badge.webp differ diff --git a/public/poses/heimdall/barrier.webp b/public/poses/heimdall/barrier.webp new file mode 100644 index 00000000..d35ea9ff Binary files /dev/null and b/public/poses/heimdall/barrier.webp differ diff --git a/public/poses/heimdall/concerned.webp b/public/poses/heimdall/concerned.webp new file mode 100644 index 00000000..549719a2 Binary files /dev/null and b/public/poses/heimdall/concerned.webp differ diff --git a/public/poses/heimdall/determined.webp b/public/poses/heimdall/determined.webp new file mode 100644 index 00000000..cbe34ae1 Binary files /dev/null and b/public/poses/heimdall/determined.webp differ diff --git a/public/poses/heimdall/happy.webp b/public/poses/heimdall/happy.webp new file mode 100644 index 00000000..a9bdc79b Binary files /dev/null and b/public/poses/heimdall/happy.webp differ diff --git a/public/poses/heimdall/neutral.webp b/public/poses/heimdall/neutral.webp new file mode 100644 index 00000000..ca9ed41f Binary files /dev/null and b/public/poses/heimdall/neutral.webp differ diff --git a/public/poses/heimdall/protect.webp b/public/poses/heimdall/protect.webp new file mode 100644 index 00000000..7daafa22 Binary files /dev/null and b/public/poses/heimdall/protect.webp differ diff --git a/public/poses/heimdall/revoke.webp b/public/poses/heimdall/revoke.webp new file mode 100644 index 00000000..96eb3215 Binary files /dev/null and b/public/poses/heimdall/revoke.webp differ diff --git a/public/poses/heimdall/surprised.webp b/public/poses/heimdall/surprised.webp new file mode 100644 index 00000000..f50c455d Binary files /dev/null and b/public/poses/heimdall/surprised.webp differ diff --git a/public/poses/heimdall/thinking.webp b/public/poses/heimdall/thinking.webp new file mode 100644 index 00000000..9c5e89a5 Binary files /dev/null and b/public/poses/heimdall/thinking.webp differ diff --git a/public/poses/kiko/amused.webp b/public/poses/kiko/amused.webp new file mode 100644 index 00000000..a9f7be7d Binary files /dev/null and b/public/poses/kiko/amused.webp differ diff --git a/public/poses/kiko/annoyed.webp b/public/poses/kiko/annoyed.webp new file mode 100644 index 00000000..b2063e8f Binary files /dev/null and b/public/poses/kiko/annoyed.webp differ diff --git a/public/poses/kiko/concerned.webp b/public/poses/kiko/concerned.webp new file mode 100644 index 00000000..5a1b9f42 Binary files /dev/null and b/public/poses/kiko/concerned.webp differ diff --git a/public/poses/kiko/confetti.webp b/public/poses/kiko/confetti.webp new file mode 100644 index 00000000..9610c0de Binary files /dev/null and b/public/poses/kiko/confetti.webp differ diff --git a/public/poses/kiko/debug.webp b/public/poses/kiko/debug.webp new file mode 100644 index 00000000..653e1073 Binary files /dev/null and b/public/poses/kiko/debug.webp differ diff --git a/public/poses/kiko/determined.webp b/public/poses/kiko/determined.webp new file mode 100644 index 00000000..d5e14232 Binary files /dev/null and b/public/poses/kiko/determined.webp differ diff --git a/public/poses/kiko/happy.webp b/public/poses/kiko/happy.webp new file mode 100644 index 00000000..a777070b Binary files /dev/null and b/public/poses/kiko/happy.webp differ diff --git a/public/poses/kiko/neutral.webp b/public/poses/kiko/neutral.webp new file mode 100644 index 00000000..8ae26999 Binary files /dev/null and b/public/poses/kiko/neutral.webp differ diff --git a/public/poses/kiko/sprint.webp b/public/poses/kiko/sprint.webp new file mode 100644 index 00000000..2fb4de3b Binary files /dev/null and b/public/poses/kiko/sprint.webp differ diff --git a/public/poses/kiko/surprised.webp b/public/poses/kiko/surprised.webp new file mode 100644 index 00000000..37adb7a6 Binary files /dev/null and b/public/poses/kiko/surprised.webp differ diff --git a/public/poses/kiko/thinking.webp b/public/poses/kiko/thinking.webp new file mode 100644 index 00000000..2ad2c9af Binary files /dev/null and b/public/poses/kiko/thinking.webp differ diff --git a/public/poses/kiko/tinker.webp b/public/poses/kiko/tinker.webp new file mode 100644 index 00000000..e53019f8 Binary files /dev/null and b/public/poses/kiko/tinker.webp differ diff --git a/public/poses/libby/amused.webp b/public/poses/libby/amused.webp new file mode 100644 index 00000000..03006036 Binary files /dev/null and b/public/poses/libby/amused.webp differ diff --git a/public/poses/libby/annoyed.webp b/public/poses/libby/annoyed.webp new file mode 100644 index 00000000..d4810a1e Binary files /dev/null and b/public/poses/libby/annoyed.webp differ diff --git a/public/poses/libby/concerned.webp b/public/poses/libby/concerned.webp new file mode 100644 index 00000000..bc11d149 Binary files /dev/null and b/public/poses/libby/concerned.webp differ diff --git a/public/poses/libby/determined.webp b/public/poses/libby/determined.webp new file mode 100644 index 00000000..2170715b Binary files /dev/null and b/public/poses/libby/determined.webp differ diff --git a/public/poses/libby/happy.webp b/public/poses/libby/happy.webp new file mode 100644 index 00000000..182ec8be Binary files /dev/null and b/public/poses/libby/happy.webp differ diff --git a/public/poses/libby/neutral.webp b/public/poses/libby/neutral.webp new file mode 100644 index 00000000..ae5a76ad Binary files /dev/null and b/public/poses/libby/neutral.webp differ diff --git a/public/poses/libby/research.webp b/public/poses/libby/research.webp new file mode 100644 index 00000000..8bf7d487 Binary files /dev/null and b/public/poses/libby/research.webp differ diff --git a/public/poses/libby/schema.webp b/public/poses/libby/schema.webp new file mode 100644 index 00000000..2dc8b116 Binary files /dev/null and b/public/poses/libby/schema.webp differ diff --git a/public/poses/libby/shush.webp b/public/poses/libby/shush.webp new file mode 100644 index 00000000..07466e6e Binary files /dev/null and b/public/poses/libby/shush.webp differ diff --git a/public/poses/libby/stamp.webp b/public/poses/libby/stamp.webp new file mode 100644 index 00000000..854d374c Binary files /dev/null and b/public/poses/libby/stamp.webp differ diff --git a/public/poses/libby/surprised.webp b/public/poses/libby/surprised.webp new file mode 100644 index 00000000..2ca82ba7 Binary files /dev/null and b/public/poses/libby/surprised.webp differ diff --git a/public/poses/libby/thinking.webp b/public/poses/libby/thinking.webp new file mode 100644 index 00000000..9a0e9b76 Binary files /dev/null and b/public/poses/libby/thinking.webp differ diff --git a/public/poses/nibu/amused.webp b/public/poses/nibu/amused.webp new file mode 100644 index 00000000..62f3a160 Binary files /dev/null and b/public/poses/nibu/amused.webp differ diff --git a/public/poses/nibu/annoyed.webp b/public/poses/nibu/annoyed.webp new file mode 100644 index 00000000..e9ce2d5d Binary files /dev/null and b/public/poses/nibu/annoyed.webp differ diff --git a/public/poses/nibu/concerned.webp b/public/poses/nibu/concerned.webp new file mode 100644 index 00000000..10f7b1e1 Binary files /dev/null and b/public/poses/nibu/concerned.webp differ diff --git a/public/poses/nibu/console.webp b/public/poses/nibu/console.webp new file mode 100644 index 00000000..afeac6b9 Binary files /dev/null and b/public/poses/nibu/console.webp differ diff --git a/public/poses/nibu/determined.webp b/public/poses/nibu/determined.webp new file mode 100644 index 00000000..96c5868e Binary files /dev/null and b/public/poses/nibu/determined.webp differ diff --git a/public/poses/nibu/glitch.webp b/public/poses/nibu/glitch.webp new file mode 100644 index 00000000..686978be Binary files /dev/null and b/public/poses/nibu/glitch.webp differ diff --git a/public/poses/nibu/happy.webp b/public/poses/nibu/happy.webp new file mode 100644 index 00000000..e9a10235 Binary files /dev/null and b/public/poses/nibu/happy.webp differ diff --git a/public/poses/nibu/lore.webp b/public/poses/nibu/lore.webp new file mode 100644 index 00000000..9e10a464 Binary files /dev/null and b/public/poses/nibu/lore.webp differ diff --git a/public/poses/nibu/neutral.webp b/public/poses/nibu/neutral.webp new file mode 100644 index 00000000..b07dc83b Binary files /dev/null and b/public/poses/nibu/neutral.webp differ diff --git a/public/poses/nibu/surprised.webp b/public/poses/nibu/surprised.webp new file mode 100644 index 00000000..1454b77b Binary files /dev/null and b/public/poses/nibu/surprised.webp differ diff --git a/public/poses/nibu/thinking.webp b/public/poses/nibu/thinking.webp new file mode 100644 index 00000000..fdf6bdac Binary files /dev/null and b/public/poses/nibu/thinking.webp differ diff --git a/public/poses/nibu/triumph.webp b/public/poses/nibu/triumph.webp new file mode 100644 index 00000000..ea6157b4 Binary files /dev/null and b/public/poses/nibu/triumph.webp differ diff --git a/public/poses/weksa/amused.webp b/public/poses/weksa/amused.webp new file mode 100644 index 00000000..8ec99ef3 Binary files /dev/null and b/public/poses/weksa/amused.webp differ diff --git a/public/poses/weksa/annoyed.webp b/public/poses/weksa/annoyed.webp new file mode 100644 index 00000000..9f43f936 Binary files /dev/null and b/public/poses/weksa/annoyed.webp differ diff --git a/public/poses/weksa/argue.webp b/public/poses/weksa/argue.webp new file mode 100644 index 00000000..7f23efcb Binary files /dev/null and b/public/poses/weksa/argue.webp differ diff --git a/public/poses/weksa/concerned.webp b/public/poses/weksa/concerned.webp new file mode 100644 index 00000000..c98206f9 Binary files /dev/null and b/public/poses/weksa/concerned.webp differ diff --git a/public/poses/weksa/determined.webp b/public/poses/weksa/determined.webp new file mode 100644 index 00000000..b5a33793 Binary files /dev/null and b/public/poses/weksa/determined.webp differ diff --git a/public/poses/weksa/fieldwork.webp b/public/poses/weksa/fieldwork.webp new file mode 100644 index 00000000..cfbef5c5 Binary files /dev/null and b/public/poses/weksa/fieldwork.webp differ diff --git a/public/poses/weksa/happy.webp b/public/poses/weksa/happy.webp new file mode 100644 index 00000000..81aa31ca Binary files /dev/null and b/public/poses/weksa/happy.webp differ diff --git a/public/poses/weksa/interlingua.webp b/public/poses/weksa/interlingua.webp new file mode 100644 index 00000000..88cc4649 Binary files /dev/null and b/public/poses/weksa/interlingua.webp differ diff --git a/public/poses/weksa/map.webp b/public/poses/weksa/map.webp new file mode 100644 index 00000000..2cbfa701 Binary files /dev/null and b/public/poses/weksa/map.webp differ diff --git a/public/poses/weksa/neutral.webp b/public/poses/weksa/neutral.webp new file mode 100644 index 00000000..925e5934 Binary files /dev/null and b/public/poses/weksa/neutral.webp differ diff --git a/public/poses/weksa/surprised.webp b/public/poses/weksa/surprised.webp new file mode 100644 index 00000000..5e74a195 Binary files /dev/null and b/public/poses/weksa/surprised.webp differ diff --git a/public/poses/weksa/thinking.webp b/public/poses/weksa/thinking.webp new file mode 100644 index 00000000..8f286291 Binary files /dev/null and b/public/poses/weksa/thinking.webp differ diff --git a/public/res/android/android-chrome-144x144.png b/public/res/android/android-chrome-144x144.png index 2dfde532..8c8c2668 100644 Binary files a/public/res/android/android-chrome-144x144.png and b/public/res/android/android-chrome-144x144.png differ diff --git a/public/res/android/android-chrome-192x192.png b/public/res/android/android-chrome-192x192.png index d696f20f..6d53edb5 100644 Binary files a/public/res/android/android-chrome-192x192.png and b/public/res/android/android-chrome-192x192.png differ diff --git a/public/res/android/android-chrome-256x256.png b/public/res/android/android-chrome-256x256.png index 07e5cbde..57378b41 100644 Binary files a/public/res/android/android-chrome-256x256.png and b/public/res/android/android-chrome-256x256.png differ diff --git a/public/res/android/android-chrome-36x36.png b/public/res/android/android-chrome-36x36.png index 3e1babf7..507c4439 100644 Binary files a/public/res/android/android-chrome-36x36.png and b/public/res/android/android-chrome-36x36.png differ diff --git a/public/res/android/android-chrome-384x384.png b/public/res/android/android-chrome-384x384.png index 61e2afe4..92fd32c7 100644 Binary files a/public/res/android/android-chrome-384x384.png and b/public/res/android/android-chrome-384x384.png differ diff --git a/public/res/android/android-chrome-48x48.png b/public/res/android/android-chrome-48x48.png index a5ba15e6..489cfd32 100644 Binary files a/public/res/android/android-chrome-48x48.png and b/public/res/android/android-chrome-48x48.png differ diff --git a/public/res/android/android-chrome-512x512.png b/public/res/android/android-chrome-512x512.png index e979125e..d312b532 100644 Binary files a/public/res/android/android-chrome-512x512.png and b/public/res/android/android-chrome-512x512.png differ diff --git a/public/res/android/android-chrome-72x72.png b/public/res/android/android-chrome-72x72.png index 7aa6caab..8e04930c 100644 Binary files a/public/res/android/android-chrome-72x72.png and b/public/res/android/android-chrome-72x72.png differ diff --git a/public/res/android/android-chrome-96x96.png b/public/res/android/android-chrome-96x96.png index 5ab44fe9..44981d96 100644 Binary files a/public/res/android/android-chrome-96x96.png and b/public/res/android/android-chrome-96x96.png differ diff --git a/public/res/android/android-chrome-maskable-512x512.png b/public/res/android/android-chrome-maskable-512x512.png deleted file mode 100644 index 211a0650..00000000 Binary files a/public/res/android/android-chrome-maskable-512x512.png and /dev/null differ diff --git a/public/res/apple/apple-touch-icon-114x114.png b/public/res/apple/apple-touch-icon-114x114.png index 3a08841c..418f8833 100644 Binary files a/public/res/apple/apple-touch-icon-114x114.png and b/public/res/apple/apple-touch-icon-114x114.png differ diff --git a/public/res/apple/apple-touch-icon-120x120.png b/public/res/apple/apple-touch-icon-120x120.png index 8443c98f..1d570eba 100644 Binary files a/public/res/apple/apple-touch-icon-120x120.png and b/public/res/apple/apple-touch-icon-120x120.png differ diff --git a/public/res/apple/apple-touch-icon-144x144.png b/public/res/apple/apple-touch-icon-144x144.png index 2dfde532..b6a731eb 100644 Binary files a/public/res/apple/apple-touch-icon-144x144.png and b/public/res/apple/apple-touch-icon-144x144.png differ diff --git a/public/res/apple/apple-touch-icon-152x152.png b/public/res/apple/apple-touch-icon-152x152.png index 8ab7ad50..968ae2f0 100644 Binary files a/public/res/apple/apple-touch-icon-152x152.png and b/public/res/apple/apple-touch-icon-152x152.png differ diff --git a/public/res/apple/apple-touch-icon-167x167.png b/public/res/apple/apple-touch-icon-167x167.png index 963c024d..a41d0d10 100644 Binary files a/public/res/apple/apple-touch-icon-167x167.png and b/public/res/apple/apple-touch-icon-167x167.png differ diff --git a/public/res/apple/apple-touch-icon-180x180.png b/public/res/apple/apple-touch-icon-180x180.png index 631741a0..a651cd1c 100644 Binary files a/public/res/apple/apple-touch-icon-180x180.png and b/public/res/apple/apple-touch-icon-180x180.png differ diff --git a/public/res/apple/apple-touch-icon-57x57.png b/public/res/apple/apple-touch-icon-57x57.png index 5cad75b2..f5ff2ea5 100644 Binary files a/public/res/apple/apple-touch-icon-57x57.png and b/public/res/apple/apple-touch-icon-57x57.png differ diff --git a/public/res/apple/apple-touch-icon-60x60.png b/public/res/apple/apple-touch-icon-60x60.png index 6303a2eb..47fafb07 100644 Binary files a/public/res/apple/apple-touch-icon-60x60.png and b/public/res/apple/apple-touch-icon-60x60.png differ diff --git a/public/res/apple/apple-touch-icon-72x72.png b/public/res/apple/apple-touch-icon-72x72.png index 7aa6caab..6e5b13c4 100644 Binary files a/public/res/apple/apple-touch-icon-72x72.png and b/public/res/apple/apple-touch-icon-72x72.png differ diff --git a/public/res/apple/apple-touch-icon-76x76.png b/public/res/apple/apple-touch-icon-76x76.png index 1448098d..7799a6fd 100644 Binary files a/public/res/apple/apple-touch-icon-76x76.png and b/public/res/apple/apple-touch-icon-76x76.png differ diff --git a/public/res/svg/cinny-highlight.svg b/public/res/svg/cinny-highlight.svg new file mode 100644 index 00000000..d59b42a1 --- /dev/null +++ b/public/res/svg/cinny-highlight.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/public/res/svg/cinny-unread.svg b/public/res/svg/cinny-unread.svg new file mode 100644 index 00000000..be301375 --- /dev/null +++ b/public/res/svg/cinny-unread.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/public/res/svg/cinny.svg b/public/res/svg/cinny.svg new file mode 100644 index 00000000..8701d67b --- /dev/null +++ b/public/res/svg/cinny.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/res/svg/ratatoskr-favicon-highlight.svg b/public/res/svg/ratatoskr-favicon-highlight.svg deleted file mode 100644 index f9a95e82..00000000 --- a/public/res/svg/ratatoskr-favicon-highlight.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/public/res/svg/ratatoskr-favicon-unread.svg b/public/res/svg/ratatoskr-favicon-unread.svg deleted file mode 100644 index f5bcb7d8..00000000 --- a/public/res/svg/ratatoskr-favicon-unread.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/public/res/svg/ratatoskr-favicon.svg b/public/res/svg/ratatoskr-favicon.svg deleted file mode 100644 index 0c7cc393..00000000 --- a/public/res/svg/ratatoskr-favicon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/public/res/svg/ratatoskr.svg b/public/res/svg/ratatoskr.svg deleted file mode 100644 index 1092ffc4..00000000 --- a/public/res/svg/ratatoskr.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/public/ridge/index.json b/public/ridge/index.json deleted file mode 100644 index 8c3323ed..00000000 --- a/public/ridge/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "schema": 1, - "default": "vienna", - "places": { - "vienna": "vienna-6815bb9dca99" - } -} diff --git a/public/ridge/vienna-6815bb9dca99/card-0-colour.webp b/public/ridge/vienna-6815bb9dca99/card-0-colour.webp deleted file mode 100644 index 133c6cd8..00000000 Binary files a/public/ridge/vienna-6815bb9dca99/card-0-colour.webp and /dev/null differ diff --git a/public/ridge/vienna-6815bb9dca99/card-0-geometry.webp b/public/ridge/vienna-6815bb9dca99/card-0-geometry.webp deleted file mode 100644 index 4e0c79f6..00000000 Binary files a/public/ridge/vienna-6815bb9dca99/card-0-geometry.webp and /dev/null differ diff --git a/public/ridge/vienna-6815bb9dca99/card-1-colour.webp b/public/ridge/vienna-6815bb9dca99/card-1-colour.webp deleted file mode 100644 index 21ea85ab..00000000 Binary files a/public/ridge/vienna-6815bb9dca99/card-1-colour.webp and /dev/null differ diff --git a/public/ridge/vienna-6815bb9dca99/card-1-geometry.webp b/public/ridge/vienna-6815bb9dca99/card-1-geometry.webp deleted file mode 100644 index 06c99e06..00000000 Binary files a/public/ridge/vienna-6815bb9dca99/card-1-geometry.webp and /dev/null differ diff --git a/public/ridge/vienna-6815bb9dca99/card-2-colour.webp b/public/ridge/vienna-6815bb9dca99/card-2-colour.webp deleted file mode 100644 index 66d048e7..00000000 Binary files a/public/ridge/vienna-6815bb9dca99/card-2-colour.webp and /dev/null differ diff --git a/public/ridge/vienna-6815bb9dca99/card-2-geometry.webp b/public/ridge/vienna-6815bb9dca99/card-2-geometry.webp deleted file mode 100644 index 631e894b..00000000 Binary files a/public/ridge/vienna-6815bb9dca99/card-2-geometry.webp and /dev/null differ diff --git a/public/ridge/vienna-6815bb9dca99/manifest.json b/public/ridge/vienna-6815bb9dca99/manifest.json deleted file mode 100644 index 935e5abd..00000000 --- a/public/ridge/vienna-6815bb9dca99/manifest.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "schema": 2, - "baker_version": 2, - "bake_id": "6815bb9dca99", - "place": { - "id": "vienna", - "name": "Vienna, looking SW to Rax/Schneeberg", - "lat": 48.1929826, - "lon": 16.3534237, - "altitude_km": 0.18330000000000002, - "eye_m": 213.3 - }, - "view": { - "look_az_deg": 214.0, - "plane_h": 600, - "px_per_deg_h": 17.77777777777778, - "px_per_deg_v": 177.77777777777777, - "exaggeration": 10.0, - "horizon_row": 294.58455032829386, - "sky_row": 24.0, - "near_row": 396.0, - "window_deg": 72, - "plane_w": 1280 - }, - "curvature": { - "r_earth_m": 6371000.0, - "k_ref": 0.13 - }, - "encoding": { - "log_d_min": 6.214608098422191, - "log_d_max": 11.462786662662916, - "normal": "rt8" - }, - "camera": { - "r_m": 200.0, - "heading_max_deg": 23.0 - }, - "cards": [ - { - "top": 182, - "h": 418, - "near_m": null, - "far_m": 5392.093596252347, - "median_m": 1478.456787109375, - "distance_m": 1478.456787109375, - "scale": 1.1564386078720779, - "colour": { - "file": "card-0-colour.webp", - "bytes": 4598 - }, - "geometry": { - "file": "card-0-geometry.webp", - "bytes": 95716 - } - }, - { - "top": 24, - "h": 576, - "near_m": 5392.093596252347, - "far_m": 39877.08347165139, - "median_m": 11107.0283203125, - "distance_m": 11107.0283203125, - "scale": 1.0183368002838622, - "colour": { - "file": "card-1-colour.webp", - "bytes": 8396 - }, - "geometry": { - "file": "card-1-geometry.webp", - "bytes": 130870 - } - }, - { - "top": 40, - "h": 560, - "near_m": 39877.08347165139, - "far_m": null, - "median_m": 48378.26953125, - "distance_m": 48378.26953125, - "scale": 1.0041512491408657, - "colour": { - "file": "card-2-colour.webp", - "bytes": 9718 - }, - "geometry": { - "file": "card-2-geometry.webp", - "bytes": 118378 - } - } - ], - "w": 1280, - "h": 600, - "bytes": 367676, - "attribution": { - "credit_line": "Contains modified Copernicus data: DEM \u00a9 DLR e.V. 2010-2014 and \u00a9 Airbus Defence and Space GmbH 2014-2018 provided under COPERNICUS by the European Union and ESA; all rights reserved.", - "licence": "Copernicus DEM licence: free, full and open access, with the credit line shown", - "dem_source": "Copernicus DEM GLO-30 (30 m)", - "url": "https://spacedata.copernicus.eu/collections/copernicus-digital-elevation-model" - } -} diff --git a/scripts/bake-sky.mjs b/scripts/bake-sky.mjs deleted file mode 100644 index 827110c2..00000000 --- a/scripts/bake-sky.mjs +++ /dev/null @@ -1,19 +0,0 @@ -// Bakes Midnight Sky and Noonday Sky from src/sky/sun.js into src/sky/baked.ts, with the -// atmospheric-scattering tables (src/sky/scatter.js) as `scatter`. -// Run `npm run bake:sky` after changing sun.js, skyTokens.js, scatter.js or a moment. -import { writeFileSync } from 'node:fs'; -import { bakeSky } from '../src/sky/skyTokens.js'; -import { bakeScatter } from '../src/sky/scatter.js'; - -const out = new URL('../src/sky/baked.ts', import.meta.url); -const baked = { - midnight: bakeSky('midnight'), - noonday: bakeSky('noonday'), - scatter: bakeScatter(), -}; -writeFileSync( - out, - `// Generated by scripts/bake-sky.mjs from src/sky/sun.js. Do not edit.\n` + - `/* eslint-disable */\n` + - `export const baked = ${JSON.stringify(baked, null, 2)} as const;\n` -); diff --git a/scripts/build-dev-preview.sh b/scripts/build-dev-preview.sh deleted file mode 100755 index 8f89dce8..00000000 --- a/scripts/build-dev-preview.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -# Build this checkout as the offline demo for the standing dev preview: base /void/rat-dev/, the pretend -# homeserver, scene tier $TIER (default full). Output: ./dist, ready for the shared publisher -# (gamecult-ops scripts/publish-mind-preview.sh dist rat-dev), which owns publishing. Publishes nothing. -set -euo pipefail -cd "$(dirname "$0")/.." -node scripts/sync-poses.mjs >/dev/null -VITE_PREVIEW_DEMO=1 CINNY_BASE=/void/rat-dev/ NODE_OPTIONS=--max_old_space_size=4096 nice -n 10 npx vite build -node scripts/preview-config.js "${TIER:-full}" --demo diff --git a/scripts/buildSha.js b/scripts/buildSha.js deleted file mode 100644 index 61a89445..00000000 --- a/scripts/buildSha.js +++ /dev/null @@ -1,56 +0,0 @@ -// The commit a bundle was built from, stamped into its index.html as , so a built -// folder says what it is without a build log: `grep -o 'build-sha" content="[^"]*' dist/index.html`. -// Where git governs the tree (REPO_DIR is a repository root) git decides: HEAD, suffixed -dirty when the tree has -// uncommitted changes, or `-mismatch` when an explicit BUILD_SHA names a different commit, so a stamp -// never vouches for code it does not hold; a git failure there is 'unknown'. Where git does not govern (a source -// archive), a full-sha BUILD_SHA stands, else 'unknown'. -import { execFileSync } from 'child_process'; -import { dirname, resolve } from 'path'; -import { fileURLToPath } from 'url'; - -const REPO_DIR = resolve(dirname(fileURLToPath(import.meta.url)), '..'); - -// Vite writes vite.config.js.timestamp-*.mjs next to the config while it loads it; that file is the -// build's own, not source, so an UNTRACKED one must not mark the tree dirty. A tracked file of that name, -// or any other change, still does. Filtering status lines (not a pathspec) is what keeps it untracked-only. -const VITE_TEMP = /^\?\? (?:.*\/)?vite\.config\.[a-z]+\.timestamp-\d+-[0-9a-f]+\.mjs$/; - -export const gitIn = - (cwd) => - (...args) => - execFileSync('git', args, { cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }); - -const FULL_SHA = /^[0-9a-f]{40}$/; - -export const readBuildSha = (env = process.env, run = gitIn(REPO_DIR)) => { - const fromEnv = (env.BUILD_SHA ?? '').trim(); - const explicit = FULL_SHA.test(fromEnv) ? fromEnv : null; - // Git governs this tree only when REPO_DIR is its root: a source archive unpacked inside some other - // repository has no git of its own, and that repository's HEAD says nothing about it. - let governed; - try { - governed = run('rev-parse', '--show-prefix').trim() === ''; - } catch { - governed = false; - } - if (!governed) return explicit ?? 'unknown'; - // Git governs and answers: from here a failure is 'unknown', never the bare explicit sha. - try { - const head = run('rev-parse', 'HEAD').trim(); - if (!FULL_SHA.test(head)) return 'unknown'; - if (explicit && explicit !== head) return `${explicit}-mismatch`; - const dirty = run('status', '--porcelain', '-uall', '--', '.') - .split('\n') - .some((l) => l.trim() !== '' && !VITE_TEMP.test(l)); - return dirty ? `${head}-dirty` : head; - } catch { - return 'unknown'; - } -}; - -export const buildShaPlugin = (sha = readBuildSha()) => ({ - name: 'ratatoskr-build-sha', - transformIndexHtml: () => [ - { tag: 'meta', attrs: { name: 'build-sha', content: sha }, injectTo: 'head-prepend' }, - ], -}); diff --git a/scripts/buildSha.test.js b/scripts/buildSha.test.js deleted file mode 100644 index 4a270867..00000000 --- a/scripts/buildSha.test.js +++ /dev/null @@ -1,170 +0,0 @@ -import { execFileSync } from 'child_process'; -import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'fs'; -import { tmpdir } from 'os'; -import { join } from 'path'; -import { afterEach, describe, expect, it } from 'vitest'; -import { buildShaPlugin, gitIn, readBuildSha } from './buildSha'; - -const SHA = 'b6b1d522f1c0a9d3e2b4c5d6e7f8091a2b3c4d5e'; -const gitAt = - (head, status = '') => - (cmd, ...args) => - cmd === 'rev-parse' ? (args[0] === '--show-prefix' ? '\n' : `${head}\n`) : status; - -describe('readBuildSha', () => { - it('reads the checkout it is built from', () => { - expect(readBuildSha({}, gitAt(SHA))).toBe(SHA); - }); - it('marks a tree with uncommitted changes, so a stamp never vouches for code it does not hold', () => { - expect(readBuildSha({}, gitAt(SHA, ' M src/x.ts\n'))).toBe(`${SHA}-dirty`); - }); - it('lets BUILD_SHA stand in where there is no git, and ignores a value that is not a full sha', () => { - const noGit = () => { - throw new Error('not a git repository'); - }; - expect(readBuildSha({ BUILD_SHA: SHA }, noGit)).toBe(SHA); - expect(readBuildSha({ BUILD_SHA: SHA }, gitAt(SHA))).toBe(SHA); - // a different HEAD is a mismatch, not a clean stamp of the explicit sha - expect(readBuildSha({ BUILD_SHA: SHA }, gitAt('c'.repeat(40)))).toBe(`${SHA}-mismatch`); - // a value that is not a lowercase full sha is ignored - ['b6b1d52', SHA.toUpperCase(), `${SHA}0`].forEach((v) => - expect(readBuildSha({ BUILD_SHA: v }, noGit)).toBe('unknown') - ); - // git that answers but cannot say what the tree holds fails closed - const brokenStatus = (cmd, ...args) => { - if (cmd === 'status') throw new Error('index file smaller than expected'); - return args[0] === '--show-prefix' ? '\n' : `${SHA}\n`; - }; - expect(readBuildSha({ BUILD_SHA: SHA }, brokenStatus)).toBe('unknown'); - expect(readBuildSha({}, brokenStatus)).toBe('unknown'); - expect(readBuildSha({}, gitAt('nope'))).toBe('unknown'); - // inside another repository's subfolder git does not govern: the explicit sha stands - const nested = (cmd, ...args) => (args[0] === '--show-prefix' ? 'vendor/ratatoskr/\n' : SHA); - expect(readBuildSha({ BUILD_SHA: SHA }, nested)).toBe(SHA); - expect(readBuildSha({}, nested)).toBe('unknown'); - expect(readBuildSha({ BUILD_SHA: 'main' }, noGit)).toBe('unknown'); - }); - it("says 'unknown' rather than failing the build when git is absent", () => { - expect( - readBuildSha({}, () => { - throw new Error('spawn git ENOENT'); - }) - ).toBe('unknown'); - }); -}); - -describe('readBuildSha against a real repository', () => { - const made = []; - afterEach(() => { - made.splice(0).forEach((d) => rmSync(d, { recursive: true, force: true })); - }); - const repo = () => { - const dir = mkdtempSync(join(tmpdir(), 'buildsha-')); - made.push(dir); - const g = (...a) => execFileSync('git', a, { cwd: dir, stdio: 'ignore' }); - g('init', '-q'); - mkdirSync(join(dir, 'src')); - writeFileSync(join(dir, 'src', 'a.ts'), 'export {};\n'); - g('add', '.'); - g('-c', 'user.name=t', '-c', 'user.email=t@t', 'commit', '-qm', 'x'); - return dir; - }; - it("stays clean with vite's temp config file present, and is dirty with a stray source file", () => { - const dir = repo(); - const run = gitIn(dir); - writeFileSync(join(dir, 'vite.config.js.timestamp-1700000000-abc123.mjs'), ''); - expect(readBuildSha({}, run)).toMatch(/^[0-9a-f]{40}$/); - writeFileSync(join(dir, 'src', 'zz-stray.ts'), ''); - expect(readBuildSha({}, run)).toMatch(/^[0-9a-f]{40}-dirty$/); - }); -}); - -describe('readBuildSha dirty rules against a real repository', () => { - const made2 = []; - afterEach(() => { - made2.splice(0).forEach((d) => rmSync(d, { recursive: true, force: true })); - }); - const TEMP = 'vite.config.js.timestamp-1700000000-abc123.mjs'; - const repo2 = (tracked = []) => { - const dir = mkdtempSync(join(tmpdir(), 'buildsha-')); - made2.push(dir); - const g = (...a) => execFileSync('git', a, { cwd: dir, stdio: 'ignore' }); - g('init', '-q'); - mkdirSync(join(dir, 'src')); - writeFileSync(join(dir, 'src', 'a.ts'), 'export {};\n'); - tracked.forEach((f) => writeFileSync(join(dir, f), 'x\n')); - g('add', '.'); - g('-c', 'user.name=t', '-c', 'user.email=t@t', 'commit', '-qm', 'x'); - return { - dir, - head: execFileSync('git', ['rev-parse', 'HEAD'], { cwd: dir, encoding: 'utf8' }).trim(), - }; - }; - it('does not let an explicit BUILD_SHA mask a dirty tree', () => { - const { dir, head } = repo2(); - const run = gitIn(dir); - expect(readBuildSha({ BUILD_SHA: head }, run)).toBe(head); - writeFileSync(join(dir, 'src', 'zz-stray.ts'), ''); - expect(readBuildSha({ BUILD_SHA: head }, run)).toBe(`${head}-dirty`); - }); - it('lets git speak only for a tree whose root it is: an archive unpacked inside another repository keeps its explicit sha', () => { - const { dir } = repo2(); - const inner = join(dir, 'vendor', 'ratatoskr'); - mkdirSync(inner, { recursive: true }); - writeFileSync(join(inner, 'x.ts'), ''); - expect(readBuildSha({ BUILD_SHA: SHA }, gitIn(inner))).toBe(SHA); - expect(readBuildSha({}, gitIn(inner))).toBe('unknown'); - }); - it("notices an untracked .mjs that is not vite's temp file", () => { - const { dir, head } = repo2(); - writeFileSync(join(dir, 'foo.mjs'), ''); - expect(readBuildSha({}, gitIn(dir))).toBe(`${head}-dirty`); - rmSync(join(dir, 'foo.mjs')); - // only vite's exact shape is its own: vite.config..timestamp--.mjs - [ - 'vite.config.js.timestamp-1-ab.mjs.bak', - 'vite.config.js.timestamp-x-ab.mjs', - 'vite.config.js.timestamp-1-zz.mjs', - 'vite.config.a.b.timestamp-1-ab.mjs', - 'vite.config.js.timestamp-1-ab-c.mjs', - ].forEach((name) => { - writeFileSync(join(dir, name), ''); - expect(readBuildSha({}, gitIn(dir)), name).toBe(`${head}-dirty`); - rmSync(join(dir, name)); - }); - expect(readBuildSha({}, gitIn(dir))).toBe(head); - }); - it('treats a stray source file as dirty even beside the vite temp file, in the root or a subfolder', () => { - const { dir, head } = repo2(); - const run = gitIn(dir); - writeFileSync(join(dir, TEMP), ''); - writeFileSync(join(dir, 'src', TEMP), ''); - expect(readBuildSha({}, run)).toBe(head); - writeFileSync(join(dir, 'src', 'zz-stray.ts'), ''); - expect(readBuildSha({}, run)).toBe(`${head}-dirty`); - }); - it('marks a tracked file of the temp name dirty once it changes', () => { - const { dir, head } = repo2([TEMP]); - const run = gitIn(dir); - expect(readBuildSha({}, run)).toBe(head); - writeFileSync(join(dir, TEMP), 'changed\n'); - expect(readBuildSha({}, run)).toBe(`${head}-dirty`); - }); - it('marks an untracked file in a new folder dirty (status lists files, not the folder)', () => { - const { dir, head } = repo2(); - mkdirSync(join(dir, 'new')); - writeFileSync(join(dir, 'new', TEMP), ''); - expect(readBuildSha({}, gitIn(dir))).toBe(head); - writeFileSync(join(dir, 'new', 'b.ts'), ''); - expect(readBuildSha({}, gitIn(dir))).toBe(`${head}-dirty`); - }); -}); - -describe('buildShaPlugin', () => { - it("hands vite a meta tag for the page's head carrying the sha", () => { - const plugin = buildShaPlugin(SHA); - expect(plugin.transformIndexHtml()).toEqual([ - { tag: 'meta', attrs: { name: 'build-sha', content: SHA }, injectTo: 'head-prepend' }, - ]); - }); -}); diff --git a/scripts/gen-brand.mjs b/scripts/gen-brand.mjs deleted file mode 100644 index fa44bfde..00000000 --- a/scripts/gen-brand.mjs +++ /dev/null @@ -1,202 +0,0 @@ -// Draws the Ratatoskr squirrel once, as shapes, and writes the SVG logos plus the -// favicon and app-icon PNGs from the same shapes (no image tools needed). -// Run: node scripts/gen-brand.mjs -import { deflateSync } from 'node:zlib'; -import { mkdirSync, writeFileSync } from 'node:fs'; -import { dirname, join } from 'node:path'; -import { fileURLToPath } from 'node:url'; - -const root = join(dirname(fileURLToPath(import.meta.url)), '..'); -const BG = '#1c1b22'; - -// Squirrel facing right on a 64x64 grid. Later shapes draw over earlier ones. -const squirrel = [ - { t: 'ellipse', cx: 19, cy: 33, rx: 13, ry: 22, rot: -15, fill: '#d9742b' }, - { t: 'ellipse', cx: 21, cy: 33, rx: 7, ry: 15, rot: -15, fill: '#f0a45d' }, - { t: 'ellipse', cx: 36, cy: 43, rx: 11, ry: 14, rot: 0, fill: '#e0833a' }, - { t: 'ellipse', cx: 40, cy: 46, rx: 6, ry: 9, rot: 0, fill: '#f6dcb8' }, - { - t: 'poly', - pts: [ - [35, 19], - [36, 7], - [43, 15], - ], - fill: '#c9672a', - }, - { - t: 'poly', - pts: [ - [44, 15], - [50, 7], - [52, 19], - ], - fill: '#c9672a', - }, - { t: 'circle', cx: 43, cy: 25, r: 10, fill: '#e0833a' }, - { t: 'ellipse', cx: 47, cy: 29, rx: 5, ry: 3.5, rot: 0, fill: '#f6dcb8' }, - { t: 'circle', cx: 46.5, cy: 23.5, r: 1.8, fill: '#1a1a1a' }, - { t: 'circle', cx: 47, cy: 23, r: 0.6, fill: '#ffffff' }, - { t: 'circle', cx: 52, cy: 27.5, r: 1.5, fill: '#1a1a1a' }, - { t: 'ellipse', cx: 33, cy: 56, rx: 5, ry: 2.5, rot: 0, fill: '#c9672a' }, - { t: 'ellipse', cx: 44, cy: 56, rx: 4.5, ry: 2.5, rot: 0, fill: '#c9672a' }, -]; -const badge = (fill) => [ - { t: 'circle', cx: 52, cy: 52, r: 11, fill: '#ffffff' }, - { t: 'circle', cx: 52, cy: 52, r: 8, fill }, -]; -const background = [{ t: 'rect', x: 0, y: 0, w: 64, h: 64, fill: BG }]; - -const f = (n) => +n.toFixed(2); -const svgOf = (shapes) => - shapes - .map((s) => { - if (s.t === 'circle') - return ``; - if (s.t === 'rect') return ``; - if (s.t === 'poly') - return ``; - return ``; - }) - .join('\n'); -const writeSvg = (name, shapes) => - writeFileSync( - join(root, 'public/res/svg', name), - `\n${svgOf( - shapes - )}\n\n` - ); - -const hex = (h) => [1, 3, 5].map((i) => parseInt(h.slice(i, i + 2), 16)); -const inside = (s, x, y) => { - if (s.t === 'rect') return x >= s.x && x < s.x + s.w && y >= s.y && y < s.y + s.h; - if (s.t === 'circle') return (x - s.cx) ** 2 + (y - s.cy) ** 2 <= s.r ** 2; - if (s.t === 'ellipse') { - const a = (-s.rot * Math.PI) / 180; - const dx = x - s.cx; - const dy = y - s.cy; - const u = dx * Math.cos(a) - dy * Math.sin(a); - const v = dx * Math.sin(a) + dy * Math.cos(a); - return (u / s.rx) ** 2 + (v / s.ry) ** 2 <= 1; - } - let c = false; - for (let i = 0, j = s.pts.length - 1; i < s.pts.length; j = i++) { - const [xi, yi] = s.pts[i]; - const [xj, yj] = s.pts[j]; - if (yi > y !== yj > y && x < ((xj - xi) * (y - yi)) / (yj - yi) + xi) c = !c; - } - return c; -}; - -const crcTable = Array.from({ length: 256 }, (_, n) => { - let c = n; - for (let k = 0; k < 8; k += 1) c = c & 1 ? 0xedb88320 ^ (c >>> 1) : c >>> 1; - return c >>> 0; -}); -const crc = (b) => { - let c = 0xffffffff; - for (const x of b) c = crcTable[(c ^ x) & 255] ^ (c >>> 8); - return (c ^ 0xffffffff) >>> 0; -}; -const chunk = (type, data) => { - const out = Buffer.alloc(12 + data.length); - out.writeUInt32BE(data.length, 0); - out.write(type, 4, 'ascii'); - data.copy(out, 8); - out.writeUInt32BE(crc(out.subarray(4, 8 + data.length)), 8 + data.length); - return out; -}; - -// Rasterise with 4x4 supersampling; `scale` shrinks the drawing about the centre. -const png = (shapes, size, scale = 1) => { - const rgba = Buffer.alloc(size * size * 4); - const SS = 4; - const colours = shapes.map((s) => hex(s.fill)); - for (let py = 0; py < size; py += 1) { - for (let px = 0; px < size; px += 1) { - let r = 0; - let g = 0; - let b = 0; - let a = 0; - for (let sy = 0; sy < SS; sy += 1) { - for (let sx = 0; sx < SS; sx += 1) { - const gx = ((px + (sx + 0.5) / SS) / size) * 64; - const gy = ((py + (sy + 0.5) / SS) / size) * 64; - // the background rect covers the whole canvas and ignores `scale` - let hit = -1; - shapes.forEach((s, i) => { - const x = s.t === 'rect' ? gx : (gx - 32) / scale + 32; - const y = s.t === 'rect' ? gy : (gy - 32) / scale + 32; - if (inside(s, x, y)) hit = i; - }); - if (hit >= 0) { - [r, g, b] = [r + colours[hit][0], g + colours[hit][1], b + colours[hit][2]]; - a += 1; - } - } - } - const o = (py * size + px) * 4; - if (a > 0) { - rgba[o] = Math.round(r / a); - rgba[o + 1] = Math.round(g / a); - rgba[o + 2] = Math.round(b / a); - } - rgba[o + 3] = Math.round((a / (SS * SS)) * 255); - } - } - const raw = Buffer.alloc(size * (size * 4 + 1)); - for (let y = 0; y < size; y += 1) { - raw[y * (size * 4 + 1)] = 0; - rgba.copy(raw, y * (size * 4 + 1) + 1, y * size * 4, (y + 1) * size * 4); - } - const ihdr = Buffer.alloc(13); - ihdr.writeUInt32BE(size, 0); - ihdr.writeUInt32BE(size, 4); - ihdr.set([8, 6, 0, 0, 0], 8); - return Buffer.concat([ - Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]), - chunk('IHDR', ihdr), - chunk('IDAT', deflateSync(raw)), - chunk('IEND', Buffer.alloc(0)), - ]); -}; - -// ICO container holding PNG images. -const ico = (images) => { - const head = Buffer.alloc(6 + images.length * 16); - head.writeUInt16LE(1, 2); - head.writeUInt16LE(images.length, 4); - let offset = head.length; - images.forEach(({ size, data }, i) => { - const e = 6 + i * 16; - head[e] = size; - head[e + 1] = size; - head.writeUInt16LE(1, e + 4); - head.writeUInt16LE(32, e + 6); - head.writeUInt32LE(data.length, e + 8); - head.writeUInt32LE(offset, e + 12); - offset += data.length; - }); - return Buffer.concat([head, ...images.map((i) => i.data)]); -}; - -writeSvg('ratatoskr.svg', squirrel); -writeSvg('ratatoskr-unread.svg', [...squirrel, ...badge('#989898')]); -writeSvg('ratatoskr-highlight.svg', [...squirrel, ...badge('#45B83B')]); - -const icon = [...background, ...squirrel]; -const put = (dir, name, size) => { - mkdirSync(join(root, 'public/res', dir), { recursive: true }); - writeFileSync(join(root, 'public/res', dir, name), png(icon, size, 0.82)); -}; -[36, 48, 72, 96, 144, 192, 256, 384, 512].forEach((s) => - put('android', `android-chrome-${s}x${s}.png`, s) -); -[57, 60, 72, 76, 114, 120, 144, 152, 167, 180].forEach((s) => - put('apple', `apple-touch-icon-${s}x${s}.png`, s) -); -writeFileSync( - join(root, 'public/favicon.ico'), - ico([16, 32, 48].map((size) => ({ size, data: png(icon, size, 0.9) }))) -); -console.log('wrote svg logos, favicon.ico, android and apple icons'); diff --git a/scripts/make-pose-thumbs.mjs b/scripts/make-pose-thumbs.mjs deleted file mode 100644 index b7acc050..00000000 --- a/scripts/make-pose-thumbs.mjs +++ /dev/null @@ -1,204 +0,0 @@ -// Regenerates preview-demo/poses from the cast-art poses: PNG thumbnails sized for the -// portrait's displayed width x device pixel ratio: the bubble portrait is 190 CSS px on desktop and -// min(38vw, 160px) on a phone (layout.css.ts), the desk booth 168 / 88 px (DeskView.css.ts). -// Dependency-free: decodes 8-bit RGBA PNGs, area-averages in premultiplied alpha, writes a -// 256-colour palette PNG with a tRNS alpha table. Usage: node scripts/make-pose-thumbs.mjs [src] -import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'; -import { dirname, join } from 'node:path'; -import { fileURLToPath } from 'node:url'; -import { inflateSync, deflateSync, crc32 } from 'node:zlib'; - -const WIDTH = 480; // about the 190px desktop portrait x DPR 2.5; art is never upscaled -const src = process.argv[2] ?? '/opt/commons/cast-art/poses'; -const root = join(dirname(fileURLToPath(import.meta.url)), '..'); -const outDir = join(root, 'preview-demo/poses'); -const demoMinds = ['eureka', 'void', 'nibu']; - -function decode(buf) { - let off = 8; - let w, h; - const idat = []; - while (off < buf.length) { - const len = buf.readUInt32BE(off); - const type = buf.toString('latin1', off + 4, off + 8); - const data = buf.subarray(off + 8, off + 8 + len); - if (type === 'IHDR') { - w = data.readUInt32BE(0); - h = data.readUInt32BE(4); - if (data[8] !== 8 || data[9] !== 6 || data[12] !== 0) - throw new Error('need 8-bit RGBA, non-interlaced'); - } else if (type === 'IDAT') idat.push(data); - off += 12 + len; - } - const raw = inflateSync(Buffer.concat(idat)); - const stride = w * 4; - const px = Buffer.alloc(h * stride); - for (let y = 0; y < h; y++) { - const f = raw[y * (stride + 1)]; - const line = raw.subarray(y * (stride + 1) + 1, (y + 1) * (stride + 1)); - for (let x = 0; x < stride; x++) { - const a = x >= 4 ? px[y * stride + x - 4] : 0; - const b = y > 0 ? px[(y - 1) * stride + x] : 0; - const c = x >= 4 && y > 0 ? px[(y - 1) * stride + x - 4] : 0; - let p = 0; - if (f === 1) p = a; - else if (f === 2) p = b; - else if (f === 3) p = (a + b) >> 1; - else if (f === 4) { - const pa = Math.abs(b - c), - pb = Math.abs(a - c), - pc = Math.abs(a + b - 2 * c); - p = pa <= pb && pa <= pc ? a : pb <= pc ? b : c; - } - px[y * stride + x] = (line[x] + p) & 255; - } - } - return { w, h, px }; -} - -// Separable area average over premultiplied RGBA floats. -function resize({ w, h, px }, nw, nh) { - const pre = new Float32Array(w * h * 4); - for (let i = 0; i < w * h; i++) { - const a = px[i * 4 + 3] / 255; - for (let c = 0; c < 3; c++) pre[i * 4 + c] = px[i * 4 + c] * a; - pre[i * 4 + 3] = px[i * 4 + 3]; - } - const pass = (data, sw, sh, dw, dh, horiz) => { - const out = new Float32Array((horiz ? dw * sh : sw * dh) * 4); - const n = horiz ? dw : dh; - const sn = horiz ? sw : sh; - const scale = sn / n; - for (let o = 0; o < n; o++) { - const s0 = o * scale, - s1 = (o + 1) * scale; - for (let i = Math.floor(s0); i < Math.min(sn, Math.ceil(s1)); i++) { - const wt = Math.min(i + 1, s1) - Math.max(i, s0); - const lines = horiz ? sh : sw; - for (let l = 0; l < lines; l++) { - const si = (horiz ? l * sw + i : i * sw + l) * 4; - const di = (horiz ? l * dw + o : o * dw + l) * 4; - for (let c = 0; c < 4; c++) out[di + c] += (data[si + c] * wt) / scale; - } - } - } - return out; - }; - const mid = pass(pre, w, h, nw, h, true); - const fin = pass(mid, nw, h, nw, nh, false); - const out = Buffer.alloc(nw * nh * 4); - for (let i = 0; i < nw * nh; i++) { - const a = fin[i * 4 + 3]; - out[i * 4 + 3] = Math.round(a); - for (let c = 0; c < 3; c++) - out[i * 4 + c] = a > 0 ? Math.min(255, Math.round((fin[i * 4 + c] * 255) / a)) : 0; - } - return out; -} - -// Median cut to 256 colours over (r,g,b,a); alpha is a quantised channel too. -function quantise(px, n) { - const key = (i) => [px[i * 4], px[i * 4 + 1], px[i * 4 + 2], px[i * 4 + 3]]; - const hist = new Map(); - for (let i = 0; i < n; i++) { - const q = key(i).map((v) => v & 0xf8); - const k = (q[0] << 24) | (q[1] << 16) | (q[2] << 8) | q[3]; - const e = hist.get(k) ?? { c: q, n: 0 }; - e.n++; - hist.set(k, e); - } - let boxes = [[...hist.values()]]; - while (boxes.length < 256) { - let bi = -1, - best = 0, - ch = 0; - boxes.forEach((b, i) => { - if (b.length < 2) return; - for (let c = 0; c < 4; c++) { - const vs = b.map((e) => e.c[c]); - const r = (Math.max(...vs) - Math.min(...vs)) * Math.sqrt(b.reduce((s, e) => s + e.n, 0)); - if (r > best) { - best = r; - bi = i; - ch = c; - } - } - }); - if (bi < 0) break; - const b = boxes[bi].sort((x, y) => x.c[ch] - y.c[ch]); - const half = b.reduce((s, e) => s + e.n, 0) / 2; - let acc = 0, - cut = 1; - for (; cut < b.length - 1 && acc + b[cut - 1].n < half; cut++) acc += b[cut - 1].n; - boxes.splice(bi, 1, b.slice(0, cut), b.slice(cut)); - } - const pal = boxes.map((b) => { - const t = b.reduce((s, e) => s + e.n, 0); - return [0, 1, 2, 3].map((c) => Math.round(b.reduce((s, e) => s + e.c[c] * e.n, 0) / t)); - }); - const idx = new Uint8Array(n); - const cache = new Map(); - for (let i = 0; i < n; i++) { - const k = (px[i * 4] << 24) | (px[i * 4 + 1] << 16) | (px[i * 4 + 2] << 8) | px[i * 4 + 3]; - let j = cache.get(k); - if (j === undefined) { - let bd = Infinity; - pal.forEach((p, pi) => { - const d = [0, 1, 2, 3].reduce((s, c) => s + (p[c] - px[i * 4 + c]) ** 2, 0); - if (d < bd) { - bd = d; - j = pi; - } - }); - cache.set(k, j); - } - idx[i] = j; - } - return { pal, idx }; -} - -function chunk(type, data) { - const t = Buffer.from(type, 'latin1'); - const out = Buffer.alloc(12 + data.length); - out.writeUInt32BE(data.length, 0); - t.copy(out, 4); - data.copy(out, 8); - out.writeUInt32BE(crc32(Buffer.concat([t, data])) >>> 0, 8 + data.length); - return out; -} - -function encode(w, h, { pal, idx }) { - const ihdr = Buffer.alloc(13); - ihdr.writeUInt32BE(w, 0); - ihdr.writeUInt32BE(h, 4); - ihdr[8] = 8; - ihdr[9] = 3; - const raw = Buffer.alloc(h * (w + 1)); - for (let y = 0; y < h; y++) - Buffer.from(idx.subarray(y * w, (y + 1) * w)).copy(raw, y * (w + 1) + 1); - return Buffer.concat([ - Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]), - chunk('IHDR', ihdr), - chunk('PLTE', Buffer.from(pal.flatMap((p) => p.slice(0, 3)))), - chunk('tRNS', Buffer.from(pal.map((p) => p[3]))), - chunk('IDAT', deflateSync(raw, { level: 9 })), - chunk('IEND', Buffer.alloc(0)), - ]); -} - -const catalogue = JSON.parse(readFileSync(join(src, 'catalogue.json'), 'utf8')); -let total = 0; -for (const mind of demoMinds) { - const m = catalogue.minds[mind]; - for (const f of [...Object.values(m.shared), ...Object.values(m.signatures)]) { - const img = decode(readFileSync(join(src, f))); - const nw = Math.min(WIDTH, img.w); - const nh = Math.round((img.h * nw) / img.w); - const png = encode(nw, nh, quantise(resize(img, nw, nh), nw * nh)); - mkdirSync(dirname(join(outDir, f)), { recursive: true }); - writeFileSync(join(outDir, f), png); - total += png.length; - console.log(f, `${nw}x${nh}`, png.length); - } -} -console.log('total', total); diff --git a/scripts/preview-config.js b/scripts/preview-config.js deleted file mode 100644 index 29bfa793..00000000 --- a/scripts/preview-config.js +++ /dev/null @@ -1,34 +0,0 @@ -// Preview builds: set the background scene tier in dist/config.json (default 'low'); config.json -// in the repo is the live chat.gamecult.org config (style ridge), and previews pin the style too, ridge unless -// given. Previews are static directories with no SPA fallback, so they also switch -// to the hash router: a reload on /login/matrix.org would otherwise be an nginx 404. With --demo it -// also switches on the pretend homeserver (src/preview-demo): previewDemo true, and the pretend -// server as the only homeserver. Usage: -// node scripts/preview-config.js [tier] [style] [--demo] -import fs from 'fs'; -import path from 'path'; -import { fileURLToPath } from 'url'; - -const args = process.argv.slice(2); -const demo = args.includes('--demo'); -const [tier = 'low', style = 'ridge'] = args.filter((a) => !a.startsWith('--')); -const file = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'dist', 'config.json'); -const config = JSON.parse(fs.readFileSync(file, 'utf8')); -config.hashRouter = { enabled: true, basename: '/' }; -config.backgroundScene = { ...config.backgroundScene, tier, style }; -if (demo) { - config.previewDemo = true; - config.defaultHomeserver = 0; - config.homeserverList = ['demo.invalid']; - config.allowCustomHomeservers = false; - config.featuredCommunities = { - openAsDefault: false, - spaces: ['#gamecult:demo.invalid'], - rooms: [], - servers: ['demo.invalid'], - }; -} -fs.writeFileSync(file, `${JSON.stringify(config, null, 2)}\n`); -console.log( - `${file}: backgroundScene.tier = ${tier}, style = ${style}${demo ? ', previewDemo on' : ''}` -); diff --git a/scripts/ridge-bake/.gitignore b/scripts/ridge-bake/.gitignore deleted file mode 100644 index c18dd8d8..00000000 --- a/scripts/ridge-bake/.gitignore +++ /dev/null @@ -1 +0,0 @@ -__pycache__/ diff --git a/scripts/ridge-bake/README.md b/scripts/ridge-bake/README.md deleted file mode 100644 index d74f4871..00000000 --- a/scripts/ridge-bake/README.md +++ /dev/null @@ -1,48 +0,0 @@ -# ridge-bake - -Offline baker for the ridge backdrop: it turns a Copernicus DEM into K+1 G-buffer cards per place, split by K authored seams, plus a `manifest.json` (schema 2) and an `index.json` that the runtime reads. Each card is a colour WebP (albedo and coverage) and a geometry WebP (normal and log-distance). The baker is not shipped; `public/ridge/` holds its output. The client owns lighting, haze and ink: no sun, haze or shadow is baked. - -## Run - -```sh -python3 -I scripts/ridge-bake/export.py --tiles DIR --out public/ridge/ [--work DIR] [--sheet contact.png] -``` - -Needs Python 3 with `numpy`, `tifffile` and `imagecodecs`. `--tiles` is a directory of Copernicus GLO-30 tiles (never committed); `--work` caches the mosaic and rays (default `$TMPDIR/ridge-bake-work`); `--sheet` writes the contact sheet (the composite, every card alone and the depth image with every seam, lit by one fixed light). `python3 -I scripts/ridge-bake/export.py --write-schema` rewrites `ridge-bake.schema.json`, which the tests pin. - -Tests: `RIDGE_PY= RIDGE_TILES=DIR scripts/ridge-bake/tests/run.sh [test_ridge.py|mutate.py]` (`mutate.py` re-introduces each rule's failure into a copy of the baker and fails if a test does not notice). - -## Tiles per preset (`places.json`) - -Files are `Copernicus_DSM_COG_10_dd_00_ddd_00_DEM.tif`; the list below is `ddddd`. - -| place id | tiles | -|---|---| -| vienna | N47E015 N47E016 N47E017 N48E015 N48E016 N48E017 N49E015 N49E016 | -| matterhorn | N45E007 N45E008 N46E007 N46E008 | -| fuji | N34E138 N34E139 N35E137 N35E138 N35E139 | -| halfdome | N37W121 N37W120 N38W120 | -| amadablam | N27E086 N27E087 N28E086 N28E087 | -| trecime | N46E011 N46E012 | - -## Cards - -`places.json` gives each preset `card_split_km`, an ordered list of 1 to 5 seam depths in km, and optionally `prefilter_m`. A preset without `card_split_km` is refused, and so is a split that leaves a card empty (the message names the splits); K splits make K+1 cards, at most `MAX_CARDS` = 6 per place. New places get a seam probe look before their first bake. - -1. **March.** `stage0` marches 6400 azimuth columns of rays over the DEM with Earth curvature and refraction (`ridge.elev`), cached by a key of its inputs. -2. **Low-pass.** `prefilter` blurs the sampled heights with a Gaussian of `prefilter_m` metres along each ray and across rays at equal distance (sigma = `prefilter_m` / (distance x column width) columns), then recomputes the angles. Roofs go, hills stay. -3. **View.** `set_view` maps angle to row linearly: the highest skyline angle in the window sits at 4% of the frame height, the lowest at 66%, clamped to 1x to 10x vertical exaggeration. -4. **Seams.** `coverage` counts the visible rows of the opaque view per log-distance bin and column. `seams` finds one seam per authored split per column by dynamic programming (seam carving, forward energy): it sits in a gap between depths, moving it costs 2 per bin plus the visible rows it sweeps (so it never hops across a ridge between two columns and splits it side by side), a seam inside visible terrain is cheap to cross-fade, the authored depth only breaks ties. Seam k stays 0.4 nat beyond seam k-1. -5. **Cards.** `cards` makes card i from the first visible hit at or beyond seam i-1 (layered depth: a farther card keeps the terrain a nearer ridge hides), alpha 1 minus a smoothstep over seam i in log-distance (the cross-fade), crest rows with fractional coverage, distance and normal interpolated between samples by angle, albedo from a small height and slope material, cropped to the rows where alpha is not zero. The rows of card i > 0 below the angle of its first sample (hit and first sample of the card) are its **wall**: the extruded face of the ridge the card starts at, which keeps that sample's distance, wears the ground material at its height with the face up, and is flagged `wall` (card 0 has none: its rows there are the ground). The alpha-over composite of the cards equals the opaque view; `check_cover` refuses a bake that differs by more than 0.02. -6. **Camera.** `CAMERA_R_M` (+200 m, signed: + forward, - backward; `camera_r_m` in `places.json` per place) and `HEADING_MAX_DEG` (23) are the camera on a circle round the bake centre (ruling `ridge-camera-on-circle`). `pack` gives each card `distance_m` (the median distance of its solid pixels that are not wall; `median_m` is the same number) and `scale = distance_m / (distance_m - r)`, the card's pan rate per unit of heading and its static size. It refuses `|r|` at or above half the nearest card's distance, a card with no solid terrain apart from its wall, and (in `write_bake`) a camera that lifts the nearest card off the frame bottom (every backward `r`: the bake is not wider and taller yet) or shrinks a card below what a 16:9 viewport needs at rest. -7. **Normals.** `normals` takes the along-ray slope and the across-ray slope at equal distance (neighbouring columns, same sample), both times the vertical exaggeration. - -Files per card `i`: `card--colour.webp` (lossy RGB albedo, lossless straight alpha) and `card--geometry.webp` (lossless: R, G = (n + 1) / 2 for the normal's along and across components, B = log-distance normalised between `encoding.log_d_min` and `log_d_max`; wall pixels write R = G = 255, a code outside the unit disc that no real normal reaches). The manifest lists the cards nearest first with their row band (`top`, `h`), median seam depths, `distance_m`, `scale` and files, and the `camera` {`r_m`, `heading_max_deg`}; the runtime paints the list last to first. `check_budget` refuses more than `MAX_CARDS` cards, more than 1.5 MB of card files, or more than 20 MB decoded (2 textures x width x band rows x 4 bytes per card); a cap is never raised to fit a bake. - -## Licence - -Elevation: Copernicus DEM GLO-30. The credit line is written into every manifest (`attribution`) and must be shown with any rendering: - -> Contains modified Copernicus data: DEM © DLR e.V. 2010-2014 and © Airbus Defence and Space GmbH 2014-2018 provided under COPERNICUS by the European Union and ESA; all rights reserved. - -Licence: free, full and open access, with the credit line shown (https://spacedata.copernicus.eu/collections/copernicus-digital-elevation-model). diff --git a/scripts/ridge-bake/export.py b/scripts/ridge-bake/export.py deleted file mode 100644 index 0ace0244..00000000 --- a/scripts/ridge-bake/export.py +++ /dev/null @@ -1,206 +0,0 @@ -"""Ridge backdrop export: bake a place with ridge.py and write its K+1 G-buffer cards (colour + geometry WebP each), a manifest v2 and the index. - - python3 -I scripts/ridge-bake/export.py --tiles DIR --out public/ridge/ [--work DIR] [--sheet contact.png] - python3 -I scripts/ridge-bake/export.py --write-schema (rewrites ridge-bake.schema.json from SCHEMA below) - -The runtime reads manifest.json (SCHEMA is its contract) and nothing else about the bake; the camera (ruling ridge-camera-on-circle) is the baker's, so per-card scale and the heading range ride the manifest; it lights the cards itself (ruling ridge-cards-runtime-lit). The pure parts (budget, bake_id, manifest, index, schema check) -import no baker; bake_place imports ridge, which needs RIDGE_TILES and RIDGE_WORK (main sets them from --tiles / --work).""" -import os, sys, json, math, shutil, hashlib, argparse, tempfile -from pathlib import Path -HERE = Path(__file__).resolve().parent -sys.path.insert(0, str(HERE)) -import numpy as np, imagecodecs - -BAKER_VERSION = 2 -WINDOW_DEG = 72 -PLANE_W = 1280 # every card is the whole 72 deg window wide -PLANE_W_MAX = 4096 -MAX_CARDS = 6 # per place; a full-frame card decodes to 2 textures x 1280 x 600 x 4 B = 6.1 MB, the decode budget below holds 3 of them and cropping to the row band is what lets a livelier place have more -TOTAL_BYTES_MAX = 1_500_000 # every card file of a place together -DECODE_BYTES_MAX = 20_000_000 # the cards decoded: sum over cards of 2 textures x w x band h x 4 bytes -COVER_TOL = 0.02 # the composite of the cards may differ from the opaque view by this much of a pixel, nowhere more -CAMERA_R_M = 200.0 # ruling ridge-camera-on-circle: the camera sits on a circle of this radius round the bake centre, signed, + forward along its heading and - backward; places.json may set camera_r_m per place. The steward's calibration for feel, tuned in the art pass -HEADING_MAX_DEG = 23.0 # the drift's heading range each side of look_az: today's phone sweep, 409 card px (the runtime caps it by what a viewport can cover) -R_FRAC_MAX = 0.5 # |r| stays under this share of the nearest card's distance: the offset must stay well inside the nearest cylinder -REST_SCALE_MIN = 1 / 1.1 # a 16:9 viewport is width-bound and the runtime's plane is 1.1 viewport widths wide (view.ts windowFor, DRIFT_FRAC 0.05 a side): a card scaled below this leaves the viewport's edge bare at rest -WEBP_QUALITY = 80 -SHEET_SKY = (0.80, 0.86, 0.94) # the flat sky of the contact sheet -SHEET_LIGHT = (-0.35, 0.55, 0.76) # the fixed light of the contact sheet in (along ray, across ray, up); the sheet is a look at the cards, the client lights the real thing -ATTRIBUTION = dict( - credit_line='Contains modified Copernicus data: DEM © DLR e.V. 2010-2014 and © Airbus Defence and Space GmbH 2014-2018 provided under COPERNICUS by the European Union and ESA; all rights reserved.', - licence='Copernicus DEM licence: free, full and open access, with the credit line shown', - dem_source='Copernicus DEM GLO-30 (30 m)', - url='https://spacedata.copernicus.eu/collections/copernicus-digital-elevation-model') - -# ------------------------------------------------------------------------------------ schema (the one dict the schema file and the validator both come from) -_num, _int, _str = {'type': 'number'}, {'type': 'integer'}, {'type': 'string'} -_numnull = {'type': ['number', 'null']} -def _obj(**props): return {'type': 'object', 'required': list(props), 'additionalProperties': False, 'properties': props} -_file = _obj(file=_str, bytes=_int) -SCHEMA = {'$schema': 'https://json-schema.org/draft/2020-12/schema', 'title': 'ridge-bake manifest v2 and index v1', '$defs': { - 'manifest': _obj(schema={'const': 2}, baker_version=_int, bake_id=_str, - place=_obj(id=_str, name=_str, lat=_num, lon=_num, altitude_km=_num, eye_m=_num), - view=_obj(look_az_deg=_num, window_deg={'const': WINDOW_DEG}, plane_w={'type': 'integer', 'maximum': PLANE_W_MAX}, plane_h=_int, px_per_deg_h=_num, px_per_deg_v=_num, exaggeration=_num, horizon_row=_num, sky_row=_num, near_row=_num), - curvature=_obj(r_earth_m=_num, k_ref=_num), - encoding=_obj(log_d_min=_num, log_d_max=_num, normal={'const': 'rt8'}), - camera=_obj(r_m=_num, heading_max_deg=_num), - cards={'type': 'array', 'minItems': 1, 'maxItems': MAX_CARDS, 'items': dict(_obj(top=_int, h=_int, near_m=_numnull, far_m=_numnull, median_m=_num, distance_m=_num, scale=_num, colour=_file, geometry=_file), - description="nearest first; the runtime paints the list last to first. top and h place the card back at its rows of the frame; near_m and far_m are the median seam depths, null at the ends; median_m and distance_m are the median distance of the card's solid pixels that are not wall; scale = distance_m / (distance_m - camera.r_m) is the card's pan rate per unit of heading and its static size.")}, - w=_int, h=_int, bytes=_int, - attribution=_obj(credit_line=_str, licence=_str, dem_source=_str, url=_str)), - 'index': _obj(schema={'const': 1}, default=_str, places={'type': 'object', 'additionalProperties': _str})}} - -def validate(x, s, path='$'): - """The subset of JSON Schema SCHEMA uses; raises ValueError naming the path.""" - if '$ref' in s: return validate(x, SCHEMA['$defs'][s['$ref'].split('/')[-1]], path) - tys = s.get('type'); tys = [tys] if isinstance(tys, str) else tys; py = {'object': dict, 'array': list, 'string': str, 'number': (int, float), 'integer': int, 'null': type(None)} - if tys and not any(isinstance(x, py[t]) and not (isinstance(x, bool) and t != 'null') for t in tys): raise ValueError(f'{path}: not a {"/".join(tys)}') - if 'const' in s and x != s['const']: raise ValueError(f"{path}: must be {s['const']!r}") - if 'enum' in s and x not in s['enum']: raise ValueError(f'{path}: not one of {s["enum"]}') - if 'maximum' in s and x > s['maximum']: raise ValueError(f'{path}: above {s["maximum"]}') - if isinstance(x, list): - if not s.get('minItems', 0) <= len(x) <= s.get('maxItems', 1 << 30): raise ValueError(f'{path}: wrong length') - for i, v in enumerate(x): validate(v, s['items'], f'{path}[{i}]') - if isinstance(x, dict): - props = s.get('properties', {}); extra = s.get('additionalProperties', True) - for k in s.get('required', []): - if k not in x: raise ValueError(f'{path}: missing {k}') - for k, v in x.items(): - if k in props: validate(v, props[k], f'{path}.{k}') - elif extra is False: raise ValueError(f'{path}: extra key {k}') - elif isinstance(extra, dict): validate(v, extra, f'{path}.{k}') - -# ------------------------------------------------------------------------------------ cards -> bytes -def u8(a): return np.clip(np.rint(np.asarray(a) * 255.0), 0, 255).astype(np.uint8) -def encode_colour(albedo, alpha): - """Lossy RGB albedo with lossless alpha coverage, straight (not premultiplied); the colour under a zero alpha is zeroed.""" - a = u8(alpha); rgb = u8(albedo) * (a[..., None] > 0); return bytes(imagecodecs.webp_encode(np.dstack([rgb, a]), level=WEBP_QUALITY, lossless=False)) -def encode_geometry(n_r, n_t, logd, enc, wall=None): - """Lossless, opaque RGB: R, G = (n_r + 1) / 2, (n_t + 1) / 2 ('rt8'), B = the log-distance normalised between enc log_d_min and log_d_max. Wall pixels (the extruded face under a ridge; wall (h, w) bool) write R = G = 255: a code outside the unit disc - that no real normal reaches (real r2 + t2 peaks at 0.998), which the runtime reads as 'normal up, no crease'.""" - b = (np.asarray(logd) - enc['log_d_min']) / (enc['log_d_max'] - enc['log_d_min']); r, t = u8((np.asarray(n_r) + 1) / 2), u8((np.asarray(n_t) + 1) / 2) - if wall is not None: m = np.asarray(wall, bool); r, t = np.where(m, 255, r).astype(np.uint8), np.where(m, 255, t).astype(np.uint8) - return bytes(imagecodecs.webp_encode(np.dstack([r, t, u8(b)]), lossless=True)) -def decode(b): - """A WebP's bytes as RGBA uint8; the codec returns RGB for an image that is opaque everywhere, which is solid.""" - a = imagecodecs.webp_decode(b) - return a if a.shape[-1] == 4 else np.concatenate([a, np.full(a.shape[:2] + (1,), 255, np.uint8)], -1) - -def composite_alpha(cards, h, w): - """Coverage of the alpha-over of all cards, each (top, rgba uint8 or float alpha (rows, w)) placed at its rows of an h x w frame.""" - clear = np.ones((h, w)) - for top, al in cards: clear[top:top + al.shape[0]] *= 1 - np.asarray(al, np.float64) - return 1 - clear -def check_cover(cards, opaque, tol=COVER_TOL): - """Refuse a bake whose cards, alpha-over, differ from the opaque view's coverage by more than tol anywhere: a hole shows the sky through terrain, an excess is a ghost. cards: [(top, alpha 0..1 (rows, w))], opaque (h, w).""" - err = np.abs(composite_alpha(cards, *opaque.shape) - opaque); bad = err > tol - if bad.any(): y, x = np.unravel_index(int(np.argmax(err)), err.shape); raise ValueError(f'the cards do not composite to the opaque view within {tol}: {int(bad.sum())} pixels differ, worst {err.max():.3f} at x={x} row {y}') - -def check_budget(card_bytes, w, bands): - """Refuse a bake the runtime could not hold: more than MAX_CARDS cards, a card wider than PLANE_W_MAX, every card file together above TOTAL_BYTES_MAX, or the cards decoding (2 textures x w x band rows x 4 bytes each) above DECODE_BYTES_MAX.""" - if len(card_bytes) > MAX_CARDS: raise ValueError(f'{len(card_bytes)} cards, above {MAX_CARDS}') - if w > PLANE_W_MAX: raise ValueError(f'card width {w} above {PLANE_W_MAX}') - if sum(card_bytes) > TOTAL_BYTES_MAX: raise ValueError(f'the cards are {sum(card_bytes)} bytes, above {TOTAL_BYTES_MAX}') - decoded = sum(2 * w * h * 4 for h in bands) - if decoded > DECODE_BYTES_MAX: raise ValueError(f'the cards decode to {decoded} bytes, above {DECODE_BYTES_MAX}') - -def card_scales(distances, r_m): - """scale_i = d_i / (d_i - r) for the cards' distances (m), nearest first: the card's pan rate per unit of heading and its static size seen from a camera r metres along its heading (ruling ridge-camera-on-circle; + forward, - backward). Refuses |r| >= R_FRAC_MAX x the nearest distance.""" - if abs(r_m) >= R_FRAC_MAX * min(distances): raise ValueError(f"the camera offset {r_m:g} m is not under {R_FRAC_MAX} x the nearest card's distance {min(distances):g} m") - return [d / (d - r_m) for d in distances] -def check_camera(scales, tops, bands, view): - """Refuse a camera whose scaled cards leave the frame uncovered: the nearest card, scaled about the horizon row, must still reach the frame bottom (a backward camera shrinks it away), and no card may be smaller than REST_SCALE_MIN (a 16:9 viewport's edge).""" - hr = view['horizon_row']; bottom = hr + (tops[0] + bands[0] - hr) * scales[0] - if bottom < view['plane_h'] - 1e-6: raise ValueError(f"the camera lifts the nearest card to row {bottom:.1f}, off the frame bottom (row {view['plane_h']})") - if min(scales) < REST_SCALE_MIN: raise ValueError(f'a card scaled {min(scales):.3f} cannot cover a 16:9 viewport at rest (below {REST_SCALE_MIN:.3f})') - -def bake_id(cards): - """First 12 hex of sha256 over the card files in index order, colour then geometry. cards: [(colour bytes, geometry bytes)].""" - h = hashlib.sha256() - for colour, geometry in cards: h.update(colour); h.update(geometry) - return h.hexdigest()[:12] - -def write_bake(out, place, view, meta, cards, opaque, default=None): - """Write out/-/ (card WebPs + manifest.json), rewrite out/index.json, delete the place's previous dir. cards: [dict(top, colour bytes, geometry bytes, near_m, far_m, median_m, distance_m, scale)], nearest first; opaque (h, w) is - the opaque view's coverage. Refuses before writing a bake whose files decode to different sizes, leave the frame or the view's plane_h, break the budget or composite away from the opaque view. meta: dict(curvature, encoding, camera dict(r_m, heading_max_deg)). Returns the directory.""" - dec = [(decode(c['colour']), decode(c['geometry'])) for c in cards]; shapes = {a.shape[:2] for pair in dec for a in pair}; bands = [a.shape[0] for a, _ in dec] - if any(c.shape[:2] != g.shape[:2] for c, g in dec): raise ValueError('a card colour and geometry are not one size') - if len({a.shape[1] for pair in dec for a in pair}) != 1: raise ValueError(f'the cards are not one width: {sorted(shapes)}') - w = dec[0][0].shape[1]; h = view['plane_h'] - if any(band < 1 or c['top'] < 0 or c['top'] + band > h for c, band in zip(cards, bands)): raise ValueError(f'a card leaves the {h} rows of the frame') - if opaque.shape != (h, w): raise ValueError(f'the opaque view is {opaque.shape}, the frame {(h, w)}') - sizes = [len(c['colour']) + len(c['geometry']) for c in cards]; check_budget(sizes, w, bands) - check_cover([(c['top'], col[..., 3] / 255.0) for c, (col, _) in zip(cards, dec)], opaque); check_camera([c['scale'] for c in cards], [c['top'] for c in cards], bands, view) - bid = bake_id([(c['colour'], c['geometry']) for c in cards]); name = f"{place['id']}-{bid}"; out = Path(out); dest = out / name - manifest = dict(schema=2, baker_version=BAKER_VERSION, bake_id=bid, place=place, view=dict(view, window_deg=WINDOW_DEG, plane_w=w), curvature=meta['curvature'], encoding=dict(meta['encoding'], normal='rt8'), camera=dict(r_m=meta['camera']['r_m'], heading_max_deg=meta['camera']['heading_max_deg']), - cards=[dict(top=c['top'], h=band, near_m=c['near_m'], far_m=c['far_m'], median_m=c['median_m'], distance_m=c['distance_m'], scale=c['scale'], colour=dict(file=f'card-{i}-colour.webp', bytes=len(c['colour'])), geometry=dict(file=f'card-{i}-geometry.webp', bytes=len(c['geometry']))) - for i, (c, band) in enumerate(zip(cards, bands))], w=w, h=h, bytes=sum(sizes), attribution=ATTRIBUTION) - validate(manifest, SCHEMA['$defs']['manifest']); out.mkdir(parents=True, exist_ok=True); tmp = Path(tempfile.mkdtemp(dir=out, prefix='.bake-')) - for i, c in enumerate(cards): (tmp / f'card-{i}-colour.webp').write_bytes(c['colour']); (tmp / f'card-{i}-geometry.webp').write_bytes(c['geometry']) - (tmp / 'manifest.json').write_text(json.dumps(manifest, indent=1) + '\n') - idx_path = out / 'index.json'; idx = json.loads(idx_path.read_text()) if idx_path.exists() else dict(schema=1, default=place['id'], places={}) - old = idx['places'].get(place['id']); idx['places'][place['id']] = name; idx['default'] = default or (idx['default'] if idx['default'] in idx['places'] else place['id']) - validate(idx, SCHEMA['$defs']['index']) - if dest.exists(): shutil.rmtree(dest) - os.rename(tmp, dest); (out / '.index.tmp').write_text(json.dumps(idx, indent=1) + '\n'); os.replace(out / '.index.tmp', idx_path) - if old and old != name: shutil.rmtree(out / old, ignore_errors=True) - return dest - -# ------------------------------------------------------------------------------------ the bake -def bake_place(pid): - """stage 0, prefilter, set_view, coverage, seams, cards: dict(place, view, meta, cards (ridge.cards arrays), seams (K, w) in m, cov (bins, w), opaque (h, w) coverage). Needs RIDGE_TILES / RIDGE_WORK.""" - import ridge - assert ridge.WIN == PLANE_W and ridge.H > 0 - p = ridge.configure(ridge.load_preset(pid)); ridge.mosaic(p); d, _, Hh, _ = ridge.stage0(False); a, h = ridge.prefilter(d, Hh, p.get('prefilter_m', 0)); v = ridge.set_view(a.max(0)) - nrm = tuple(ridge.win(x) for x in ridge.normals(d, h)); aw, hw = ridge.win(a), ridge.win(h); cov = ridge.coverage(d, aw); sm = ridge.seams(cov, [k * 1000.0 for k in p['card_split_km']], d) - place = dict(id=p['id'], name=p['name'], lat=p['lat'], lon=p['lon'], altitude_km=p['ground_m'] / 1000.0, eye_m=p['eye_m']) - view = dict(look_az_deg=p['az_center'], plane_h=ridge.H, px_per_deg_h=ridge.HPX_DEG, px_per_deg_v=v['px_per_deg'], exaggeration=v['exaggeration'], horizon_row=v['horizon_row'], sky_row=v['sky_row'] * ridge.H, near_row=v['near_row'] * ridge.H) - meta = dict(curvature=dict(r_earth_m=ridge.R_EARTH, k_ref=ridge.KREF), encoding=dict(log_d_min=math.log(d[0]), log_d_max=math.log(d[-1])), camera=dict(r_m=float(p.get('camera_r_m', CAMERA_R_M)), heading_max_deg=HEADING_MAX_DEG)) - return dict(place=place, view=view, meta=meta, cards=ridge.cards(d, aw, hw, sm, nrm), splits_km=list(p['card_split_km']), seams=sm, cov=cov, opaque=ridge.opaque(aw), edges=ridge.log_edges(d)) - -def pack(bake): - """The cards of a bake as bytes plus their manifest facts: median seam depths either side, the median distance of the card's solid pixels that are not wall (median_m = distance_m), and scale = distance_m / (distance_m - camera r). Refuses a card - with no solid terrain apart from its wall rows, and a camera offset the cards cannot take (card_scales).""" - enc = bake['meta']['encoding']; sm = bake['seams']; out = []; sp = bake['splits_km']; cs = bake['cards'] - for i, c in enumerate(cs): - if c['alpha'].shape[0] == 0: raise ValueError(f"card {i} is empty: it lies between the splits {' and '.join(f'{sp[j]:g} km' for j in (i - 1, i) if 0 <= j < len(sp))} (card_split_km {sp}) and holds no terrain nothing nearer hides; move or remove a split") - dist = [] - for i, c in enumerate(cs): - ground = (c['alpha'] >= 0.5) & ~c['wall'] - if not ground.any(): raise ValueError(f'card {i} holds no solid terrain apart from its wall rows') - dist.append(float(np.exp(np.median(c['logd'][ground])))) - scales = card_scales(dist, bake['meta']['camera']['r_m']) - for i, c in enumerate(cs): - out.append(dict(top=c['top'], colour=encode_colour(c['albedo'], c['alpha']), geometry=encode_geometry(c['n_r'], c['n_t'], c['logd'], enc, c['wall']), - near_m=float(np.median(sm[i - 1])) if i else None, far_m=float(np.median(sm[i])) if i < len(sm) else None, median_m=dist[i], distance_m=dist[i], scale=scales[i])) - return out - -def lit(c): - """albedo x (0.35 + 0.65 max(n.L, 0)) under the fixed sheet light, with the card's alpha: (rgb, alpha). Wall pixels are lit with the face up, as the runtime reads their code.""" - wall = c['wall']; n_r, n_t = np.where(wall, 0.0, c['n_r']), np.where(wall, 0.0, c['n_t']) - up = np.sqrt(np.clip(1 - n_r ** 2 - n_t ** 2, 0, 1)); L = np.array(SHEET_LIGHT) / np.linalg.norm(SHEET_LIGHT); nl = np.clip(n_r * L[0] + n_t * L[1] + up * L[2], 0, 1) - return c['albedo'] * (0.35 + 0.65 * nl)[..., None], c['alpha'] -def sheet(bake): - """Contact sheet (png bytes), stacked: the composite, every card alone, and the depth image (log-distance bins, far at the top, every seam drawn). All lit by SHEET_LIGHT over the flat SHEET_SKY; reads the arrays the encoder writes.""" - h, w = bake['opaque'].shape; sky = np.broadcast_to(np.array(SHEET_SKY), (h, w, 3)); comp = sky.copy(); panels = [] - for c in bake['cards']: - rgb, al = lit(c); alone = sky.copy(); sl = slice(c['top'], c['top'] + al.shape[0]); alone[sl] = sky[sl] * (1 - al[..., None]) + rgb * al[..., None]; panels.append(alone) - for c in reversed(bake['cards']): rgb, al = lit(c); sl = slice(c['top'], c['top'] + al.shape[0]); comp[sl] = comp[sl] * (1 - al[..., None]) + rgb * al[..., None] - cov = bake['cov']; img = np.repeat(np.log1p(cov[::-1]) / np.log1p(cov.max()), 2, 0); depth = np.dstack([img] * 3) * 0.92 + 0.04; nb = cov.shape[0]; cols = np.arange(w) - for k, s in enumerate(bake['seams']): - j = np.clip(np.searchsorted(bake['edges'], np.log(s), 'right') - 1, 0, nb - 1); col = [(0.24, 0.78, 1.0), (1.0, 0.47, 0.24), (0.6, 1.0, 0.4), (1.0, 0.9, 0.3), (0.9, 0.4, 1.0)][k % 5] - for dy in (0, 1): depth[(nb - 1 - j) * 2 + dy, cols] = col - return bytes(imagecodecs.png_encode(u8(np.concatenate([comp] + panels + [depth], 0)))) - -def main(argv=None): - ap = argparse.ArgumentParser(description=__doc__.split('\n')[0]); ap.add_argument('place', nargs='?'); ap.add_argument('--tiles'); ap.add_argument('--out'); ap.add_argument('--work'); ap.add_argument('--sheet'); ap.add_argument('--write-schema', action='store_true') - a = ap.parse_args(argv) - if a.write_schema: (HERE / 'ridge-bake.schema.json').write_text(json.dumps(SCHEMA, indent=1, ensure_ascii=False) + '\n'); return 0 - if not (a.place and a.tiles and a.out): ap.error('place, --tiles and --out are required') - os.environ['RIDGE_TILES'] = a.tiles; os.environ['RIDGE_WORK'] = a.work or os.path.join(os.environ.get('TMPDIR', tempfile.gettempdir()), 'ridge-bake-work'); os.makedirs(os.environ['RIDGE_WORK'], exist_ok=True) - bake = bake_place(a.place) - if a.sheet: Path(a.sheet).write_bytes(sheet(bake)) - dest = write_bake(a.out, bake['place'], bake['view'], bake['meta'], pack(bake), bake['opaque']) - print(dest); return 0 - -if __name__ == '__main__': sys.exit(main()) diff --git a/scripts/ridge-bake/places.json b/scripts/ridge-bake/places.json deleted file mode 100644 index c6dde613..00000000 --- a/scripts/ridge-bake/places.json +++ /dev/null @@ -1,637 +0,0 @@ -{ - "_doc": "Place presets for the A+D baker (ridge.py). eye = observer lat/lon; eye_h_m = eye above the local DEM surface (ground_override_m replaces the DEM ground elevation, used for Vienna to keep round 1's 183.3 m); look_at = target lat/lon whose bearing centres the 72 deg window (or az_deg); rmax_km = ring radius (decides the tile list: every 1x1 deg GLO-30 tile whose rectangle intersects the circle); card_split_km = the ordered list of 1 to MAX_CARDS - 1 authored seam depths in km (the seam search refines each per column; K splits make K+1 cards; required, never defaulted); prefilter_m = Gaussian sigma in metres of the height low-pass before the cards are cut (default 0).", - "presets": [ - { - "id": "vienna", - "name": "Vienna, looking SW to Rax/Schneeberg", - "kind": "far range over a flat foreground", - "lat": 48.1929826, - "lon": 16.3534237, - "eye_h_m": 30.0, - "ground_override_m": 183.3, - "az_deg": 214.0, - "rmax_km": 95, - "card_split_km": [ - 6, - 40 - ], - "prefilter_m": 100, - "viewpoint_source": { - "status": "existing observer of the round-1 mockup (the scene camera used by the game), not photo-sourced; eye 30 m above ground as in round 1" - } - }, - { - "id": "matterhorn", - "name": "Matterhorn from the Gornergrat (photo cell, 9.7 km)", - "kind": "lone horn, close, 27 deg of relief", - "lat": 45.983139, - "lon": 7.782466, - "eye_h_m": 1.6, - "look_at": [ - 45.97666, - 7.65678 - ], - "rmax_km": 60, - "initial_guess_not_used": { - "lat": 45.9856, - "lon": 7.7452 - }, - "viewpoint_source": { - "status": "sourced", - "source": "Wikimedia Commons geosearch (namespace 6), geotagged photos", - "query": "geosearch ns=6 gslimit=500 gsradius=10000 around 25 centres (peak + 3 rings x 8 bearings, radii 3600-12000 m), then EXIF GPSImgDirection of every file in range via prop=imageinfo&iiprop=commonmetadata", - "files_found": 5003, - "in_range": 3241, - "with_exif_heading": 205, - "facing_the_peak": 52, - "pool": "photos whose camera heading is within 30 deg of the bearing to the summit", - "rule": "densest 1 km cell of photos 3000-12000 m from the summit whose EXIF camera heading faces the summit (within 30 deg) with the summit visible on the DEM (straight line, first 250 m ignored, 8 m clutter allowed); viewpoint = median coordinate of the cell", - "median_camera_heading_deg": 245.8, - "photos_in_cell": 7, - "cells_tried": [ - { - "n_facing": 7, - "lat": 45.98314, - "lon": 7.78247, - "peak_visible": true - } - ], - "distance_to_peak_m": 9749, - "bearing_to_peak_deg": 265.8, - "dem_ground_m": 3090.7, - "eye_height_rule": "DEM ground at the viewpoint + 1.6 m (the source gives no eye height)", - "sample_files": [ - { - "title": "File:Gornergrat-04.jpg", - "lat": 45.983061, - "lon": 7.782031, - "heading": 256.0, - "url": "https://commons.wikimedia.org/wiki/File%3AGornergrat-04.jpg" - }, - { - "title": "File:Gornergrat-03.jpg", - "lat": 45.983058, - "lon": 7.782038, - "heading": 245.8, - "url": "https://commons.wikimedia.org/wiki/File%3AGornergrat-03.jpg" - }, - { - "title": "File:Gornergrat-07.jpg", - "lat": 45.982653, - "lon": 7.782466, - "heading": 250.2, - "url": "https://commons.wikimedia.org/wiki/File%3AGornergrat-07.jpg" - }, - { - "title": "File:Gornergratsee 2021 10.jpg", - "lat": 45.986958, - "lon": 7.780303, - "heading": 243.4, - "url": "https://commons.wikimedia.org/wiki/File%3AGornergratsee_2021_10.jpg" - }, - { - "title": "File:Early morning Eiger.jpg", - "lat": 45.983242, - "lon": 7.783361, - "heading": 254.7, - "url": "https://commons.wikimedia.org/wiki/File%3AEarly_morning_Eiger.jpg" - }, - { - "title": "File:Klein Matterhorn mit Wolken an Theodulhorn und Furgghorn \u00fcber dem Oberen Theodulgletscher- a view from Gornergrat 2021 02 (cropped).jpg", - "lat": 45.983139, - "lon": 7.784172, - "heading": 242.1, - "url": "https://commons.wikimedia.org/wiki/File%3AKlein_Matterhorn_mit_Wolken_an_Theodulhorn_und_Furgghorn_%C3%BCber_dem_Oberen_Theodulgletscher-_a_view_from_Gornergrat_2021_02_%28cropped%29.jpg" - }, - { - "title": "File:Breithorn and neighbours from Gornergrat 2021 02.jpg", - "lat": 45.983139, - "lon": 7.784172, - "heading": 242.1, - "url": "https://commons.wikimedia.org/wiki/File%3ABreithorn_and_neighbours_from_Gornergrat_2021_02.jpg" - } - ], - "exif_headings": [ - { - "title": "File:Gornergrat-04.jpg", - "heading": 256.0 - }, - { - "title": "File:Gornergrat-03.jpg", - "heading": 245.8 - }, - { - "title": "File:Gornergrat-07.jpg", - "heading": 250.2 - }, - { - "title": "File:Gornergratsee 2021 10.jpg", - "heading": 243.4 - }, - { - "title": "File:Early morning Eiger.jpg", - "heading": 254.7 - }, - { - "title": "File:Klein Matterhorn mit Wolken an Theodulhorn und Furgghorn \u00fcber dem Oberen Theodulgletscher- a view from Gornergrat 2021 02 (cropped).jpg", - "heading": 242.1 - }, - { - "title": "File:Breithorn and neighbours from Gornergrat 2021 02.jpg", - "heading": 242.1 - } - ], - "n_with_exif_heading": 7, - "summit_dem_m": 4324.9, - "summit_nominal": [ - 45.97639, - 7.65833 - ] - } - }, - { - "id": "fuji", - "name": "Fuji from the Shiraito Falls side, 13.8 km WSW (photo cell)", - "kind": "lone cone, smooth", - "lat": 35.312467222222494, - "lon": 138.587223194445, - "eye_h_m": 1.6, - "look_at": [ - 35.36061, - 138.72731 - ], - "rmax_km": 60, - "initial_guess_not_used": { - "lat": 35.4994, - "lon": 138.7686 - }, - "viewpoint_source": { - "status": "sourced", - "source": "Wikimedia Commons geosearch (namespace 6), geotagged photos", - "query": "geosearch ns=6 gslimit=500 gsradius=10000 around 25 centres (peak + 3 rings x 8 bearings, radii 9000-30000 m), then EXIF GPSImgDirection of every file in range via prop=imageinfo&iiprop=commonmetadata", - "files_found": 6494, - "in_range": 4280, - "with_exif_heading": 588, - "facing_the_peak": 132, - "pool": "photos whose camera heading is within 30 deg of the bearing to the summit", - "rule": "densest 1 km cell of photos 8000-30000 m from the summit whose EXIF camera heading faces the summit (within 30 deg) with the summit visible on the DEM (straight line, first 250 m ignored, 8 m clutter allowed); viewpoint = median coordinate of the cell", - "median_camera_heading_deg": 64.4, - "photos_in_cell": 8, - "cells_tried": [ - { - "n_facing": 15, - "lat": 35.36248, - "lon": 138.86287, - "peak_visible": false - }, - { - "n_facing": 8, - "lat": 35.31247, - "lon": 138.58722, - "peak_visible": true - } - ], - "distance_to_peak_m": 13808, - "bearing_to_peak_deg": 67.2, - "dem_ground_m": 486.9, - "eye_height_rule": "DEM ground at the viewpoint + 1.6 m (the source gives no eye height)", - "sample_files": [ - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 03.JPG", - "lat": 35.31114, - "lon": 138.5886, - "heading": 48.0, - "url": "https://commons.wikimedia.org/wiki/File%3A%E5%AF%8C%E5%A3%AB%E5%B1%B1%EF%BC%88%E3%81%B5%E3%81%98%E3%81%95%E3%82%93%E3%80%81%E8%8B%B1%E8%AA%9E%EF%BC%9AMount_Fuji%EF%BC%89_03.JPG" - }, - { - "title": "File:Mount Fuji, view from Shiraito no Taki.jpg", - "lat": 35.313589, - "lon": 138.588394, - "heading": 68.8, - "url": "https://commons.wikimedia.org/wiki/File%3AMount_Fuji%2C_view_from_Shiraito_no_Taki.jpg" - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 02.JPG", - "lat": 35.313248055556, - "lon": 138.58760805556, - "heading": 64.2, - "url": "https://commons.wikimedia.org/wiki/File%3A%E5%AF%8C%E5%A3%AB%E5%B1%B1%EF%BC%88%E3%81%B5%E3%81%98%E3%81%95%E3%82%93%E3%80%81%E8%8B%B1%E8%AA%9E%EF%BC%9AMount_Fuji%EF%BC%89_02.JPG" - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 07.JPG", - "lat": 35.312428055556, - "lon": 138.58723138889, - "heading": 88.8, - "url": "https://commons.wikimedia.org/wiki/File%3A%E5%AF%8C%E5%A3%AB%E5%B1%B1%EF%BC%88%E3%81%B5%E3%81%98%E3%81%95%E3%82%93%E3%80%81%E8%8B%B1%E8%AA%9E%EF%BC%9AMount_Fuji%EF%BC%89_07.JPG" - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 08.JPG", - "lat": 35.312418055556, - "lon": 138.587215, - "heading": 64.0, - "url": "https://commons.wikimedia.org/wiki/File%3A%E5%AF%8C%E5%A3%AB%E5%B1%B1%EF%BC%88%E3%81%B5%E3%81%98%E3%81%95%E3%82%93%E3%80%81%E8%8B%B1%E8%AA%9E%EF%BC%9AMount_Fuji%EF%BC%89_08.JPG" - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 04.JPG", - "lat": 35.312478055556, - "lon": 138.58717805556, - "heading": 62.2, - "url": "https://commons.wikimedia.org/wiki/File%3A%E5%AF%8C%E5%A3%AB%E5%B1%B1%EF%BC%88%E3%81%B5%E3%81%98%E3%81%95%E3%82%93%E3%80%81%E8%8B%B1%E8%AA%9E%EF%BC%9AMount_Fuji%EF%BC%89_04.JPG" - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 06.JPG", - "lat": 35.312456388889, - "lon": 138.58715805556, - "heading": 65.2, - "url": "https://commons.wikimedia.org/wiki/File%3A%E5%AF%8C%E5%A3%AB%E5%B1%B1%EF%BC%88%E3%81%B5%E3%81%98%E3%81%95%E3%82%93%E3%80%81%E8%8B%B1%E8%AA%9E%EF%BC%9AMount_Fuji%EF%BC%89_06.JPG" - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 05.JPG", - "lat": 35.312479722222, - "lon": 138.58714138889, - "heading": 64.5, - "url": "https://commons.wikimedia.org/wiki/File%3A%E5%AF%8C%E5%A3%AB%E5%B1%B1%EF%BC%88%E3%81%B5%E3%81%98%E3%81%95%E3%82%93%E3%80%81%E8%8B%B1%E8%AA%9E%EF%BC%9AMount_Fuji%EF%BC%89_05.JPG" - } - ], - "exif_headings": [ - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 03.JPG", - "heading": 48.0 - }, - { - "title": "File:Mount Fuji, view from Shiraito no Taki.jpg", - "heading": 68.8 - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 02.JPG", - "heading": 64.2 - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 07.JPG", - "heading": 88.8 - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 08.JPG", - "heading": 64.0 - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 04.JPG", - "heading": 62.2 - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 06.JPG", - "heading": 65.2 - }, - { - "title": "File:\u5bcc\u58eb\u5c71\uff08\u3075\u3058\u3055\u3093\u3001\u82f1\u8a9e\uff1aMount Fuji\uff09 05.JPG", - "heading": 64.5 - } - ], - "n_with_exif_heading": 8, - "summit_dem_m": 3765.5, - "summit_nominal": [ - 35.36061, - 138.72731 - ] - } - }, - { - "id": "halfdome", - "name": "Half Dome from the Yosemite Valley floor (Sentinel Bridge photo cell)", - "kind": "granite wall across a valley", - "lat": 37.745833333333, - "lon": -119.592606, - "eye_h_m": 1.6, - "look_at": [ - 37.74435, - -119.53426 - ], - "rmax_km": 40, - "initial_guess_not_used": { - "lat": 37.7305, - "lon": -119.5734 - }, - "viewpoint_source": { - "status": "sourced", - "source": "Wikimedia Commons geosearch (namespace 6), geotagged photos", - "query": "geosearch ns=6 gslimit=500 gsradius=10000 around 25 centres (peak + 3 rings x 8 bearings, radii 2700-9000 m), then EXIF GPSImgDirection of every file in range via prop=imageinfo&iiprop=commonmetadata", - "files_found": 2505, - "in_range": 1788, - "with_exif_heading": 181, - "facing_the_peak": 64, - "pool": "photos whose camera heading is within 30 deg of the bearing to the summit", - "rule": "densest 1 km cell of photos 2000-9000 m from the summit whose EXIF camera heading faces the summit (within 30 deg) with the summit visible on the DEM (straight line, first 250 m ignored, 8 m clutter allowed); viewpoint = median coordinate of the cell", - "median_camera_heading_deg": 91.6, - "photos_in_cell": 9, - "cells_tried": [ - { - "n_facing": 9, - "lat": 37.73853, - "lon": -119.57124, - "peak_visible": false - }, - { - "n_facing": 9, - "lat": 37.74583, - "lon": -119.59261, - "peak_visible": true - } - ], - "distance_to_peak_m": 5138, - "bearing_to_peak_deg": 91.8, - "dem_ground_m": 1209.2, - "eye_height_rule": "DEM ground at the viewpoint + 1.6 m (the source gives no eye height)", - "sample_files": [ - { - "title": "File:Yosemite National Park - 51700634719.jpg", - "lat": 37.746606, - "lon": -119.590317, - "heading": 87.0, - "url": "https://commons.wikimedia.org/wiki/File%3AYosemite_National_Park_-_51700634719.jpg" - }, - { - "title": "File:Half Dome, Yosemite National Park - 53324601178.jpg", - "lat": 37.748264, - "lon": -119.592606, - "heading": 98.8, - "url": "https://commons.wikimedia.org/wiki/File%3AHalf_Dome%2C_Yosemite_National_Park_-_53324601178.jpg" - }, - { - "title": "File:Half Dome, Yosemite National Park - 53324824955.jpg", - "lat": 37.748322, - "lon": -119.592736, - "heading": 90.1, - "url": "https://commons.wikimedia.org/wiki/File%3AHalf_Dome%2C_Yosemite_National_Park_-_53324824955.jpg" - }, - { - "title": "File:2013-09-19 18 35 25 Half Dome and the Merced River in Yosemite National Park.JPG", - "lat": 37.7435, - "lon": -119.58966666667, - "heading": 91.6, - "url": "https://commons.wikimedia.org/wiki/File%3A2013-09-19_18_35_25_Half_Dome_and_the_Merced_River_in_Yosemite_National_Park.JPG" - }, - { - "title": "File:Half Dome from the Yosemite Valley floor in mid-Spring.jpeg", - "lat": 37.745833333333, - "lon": -119.59233333333, - "heading": 92.0, - "url": "https://commons.wikimedia.org/wiki/File%3AHalf_Dome_from_the_Yosemite_Valley_floor_in_mid-Spring.jpeg" - }, - { - "title": "File:Sentinel Bridge & Half Dome.jpg", - "lat": 37.743419, - "lon": -119.590562, - "heading": 86.8, - "url": "https://commons.wikimedia.org/wiki/File%3ASentinel_Bridge_%26_Half_Dome.jpg" - }, - { - "title": "File:Half Dome pre Super moon 2.jpg", - "lat": 37.745769, - "lon": -119.592972, - "heading": 106.5, - "url": "https://commons.wikimedia.org/wiki/File%3AHalf_Dome_pre_Super_moon_2.jpg" - }, - { - "title": "File:Half Dome pre Super moon.jpg", - "lat": 37.745747, - "lon": -119.593033, - "heading": 97.1, - "url": "https://commons.wikimedia.org/wiki/File%3AHalf_Dome_pre_Super_moon.jpg" - }, - { - "title": "File:Yosemite National Park 003.jpg", - "lat": 37.750814, - "lon": -119.598664, - "heading": 80.1, - "url": "https://commons.wikimedia.org/wiki/File%3AYosemite_National_Park_003.jpg" - } - ], - "exif_headings": [ - { - "title": "File:Yosemite National Park - 51700634719.jpg", - "heading": 87.0 - }, - { - "title": "File:Half Dome, Yosemite National Park - 53324601178.jpg", - "heading": 98.8 - }, - { - "title": "File:Half Dome, Yosemite National Park - 53324824955.jpg", - "heading": 90.1 - }, - { - "title": "File:2013-09-19 18 35 25 Half Dome and the Merced River in Yosemite National Park.JPG", - "heading": 91.6 - }, - { - "title": "File:Half Dome from the Yosemite Valley floor in mid-Spring.jpeg", - "heading": 92.0 - }, - { - "title": "File:Sentinel Bridge & Half Dome.jpg", - "heading": 86.8 - }, - { - "title": "File:Half Dome pre Super moon 2.jpg", - "heading": 106.5 - }, - { - "title": "File:Half Dome pre Super moon.jpg", - "heading": 97.1 - }, - { - "title": "File:Yosemite National Park 003.jpg", - "heading": 80.1 - } - ], - "n_with_exif_heading": 9, - "summit_dem_m": 2669.1, - "summit_nominal": [ - 37.74597, - -119.5329 - ] - } - }, - { - "id": "amadablam", - "name": "Ama Dablam and the Everest massif, 4 km WSW of Tengboche near Khumjung (photo cell)", - "kind": "far high range behind a near spire", - "lat": 27.822000000000003, - "lon": 86.722666666667, - "eye_h_m": 1.6, - "look_at": [ - 27.8617, - 86.86079 - ], - "rmax_km": 60, - "initial_guess_not_used": { - "lat": 27.8369, - "lon": 86.7643 - }, - "viewpoint_source": { - "status": "sourced", - "source": "Wikimedia Commons geosearch (namespace 6), geotagged photos", - "query": "geosearch ns=6 gslimit=500 gsradius=10000 around 25 centres (peak + 3 rings x 8 bearings, radii 4800-16000 m), then EXIF GPSImgDirection of every file in range via prop=imageinfo&iiprop=commonmetadata", - "files_found": 1398, - "in_range": 1143, - "with_exif_heading": 54, - "facing_the_peak": 13, - "pool": "photos whose camera heading is within 30 deg of the bearing to the summit", - "rule": "densest 1 km cell of photos 4000-16000 m from the summit whose EXIF camera heading faces the summit (within 30 deg) with the summit visible on the DEM (straight line, first 250 m ignored, 8 m clutter allowed); viewpoint = median coordinate of the cell", - "median_camera_heading_deg": 79.6, - "photos_in_cell": 2, - "cells_tried": [ - { - "n_facing": 2, - "lat": 27.822, - "lon": 86.72267, - "peak_visible": true - } - ], - "distance_to_peak_m": 14299, - "bearing_to_peak_deg": 72.0, - "dem_ground_m": 3782.0, - "eye_height_rule": "DEM ground at the viewpoint + 1.6 m (the source gives no eye height)", - "sample_files": [ - { - "title": "File:Thamserku (6).JPG", - "lat": 27.822666666667, - "lon": 86.722666666667, - "heading": 73.6, - "url": "https://commons.wikimedia.org/wiki/File%3AThamserku_%286%29.JPG" - }, - { - "title": "File:Thamserku (7).JPG", - "lat": 27.821333333333, - "lon": 86.722666666667, - "heading": 85.7, - "url": "https://commons.wikimedia.org/wiki/File%3AThamserku_%287%29.JPG" - } - ], - "exif_headings": [ - { - "title": "File:Thamserku (6).JPG", - "heading": 73.6 - }, - { - "title": "File:Thamserku (7).JPG", - "heading": 85.7 - } - ], - "n_with_exif_heading": 2, - "summit_dem_m": 6659.6, - "summit_nominal": [ - 27.8617, - 86.8614 - ] - } - }, - { - "id": "trecime", - "name": "Tre Cime di Lavaredo from the Dreizinnenhuette area, 2.4 km N (photo cell)", - "kind": "cirque wall, spires", - "lat": 46.636906, - "lon": 12.310064, - "eye_h_m": 1.6, - "look_at": [ - 46.61806, - 12.29583 - ], - "rmax_km": 40, - "initial_guess_not_used": { - "lat": 46.5833, - "lon": 12.2536 - }, - "viewpoint_source": { - "status": "sourced", - "source": "Wikimedia Commons geosearch (namespace 6), geotagged photos", - "query": "geosearch ns=6 gslimit=500 gsradius=10000 around 25 centres (peak + 3 rings x 8 bearings, radii 3000-10000 m), then EXIF GPSImgDirection of every file in range via prop=imageinfo&iiprop=commonmetadata", - "files_found": 2028, - "in_range": 763, - "with_exif_heading": 207, - "facing_the_peak": 33, - "pool": "photos whose camera heading is within 30 deg of the bearing to the summit", - "rule": "densest 1 km cell of photos 1500-10000 m from the summit whose EXIF camera heading faces the summit (within 30 deg) with the summit visible on the DEM (straight line, first 250 m ignored, 8 m clutter allowed); viewpoint = median coordinate of the cell", - "median_camera_heading_deg": 194.6, - "photos_in_cell": 5, - "cells_tried": [ - { - "n_facing": 5, - "lat": 46.63691, - "lon": 12.31006, - "peak_visible": true - } - ], - "distance_to_peak_m": 2363, - "bearing_to_peak_deg": 207.4, - "dem_ground_m": 2403.0, - "eye_height_rule": "DEM ground at the viewpoint + 1.6 m (the source gives no eye height)", - "sample_files": [ - { - "title": "File:Cime e Nuvole.jpg", - "lat": 46.63605, - "lon": 12.310064, - "heading": 200.3, - "url": "https://commons.wikimedia.org/wiki/File%3ACime_e_Nuvole.jpg" - }, - { - "title": "File:DreiZinnenP.jpg", - "lat": 46.636770555556, - "lon": 12.310305555556, - "heading": 180.1, - "url": "https://commons.wikimedia.org/wiki/File%3ADreiZinnenP.jpg" - }, - { - "title": "File:Soffio di sguardo.jpg", - "lat": 46.636906, - "lon": 12.311142, - "heading": 194.6, - "url": "https://commons.wikimedia.org/wiki/File%3ASoffio_di_sguardo.jpg" - }, - { - "title": "File:2405-DreizinnenH.jpg", - "lat": 46.637782777778, - "lon": 12.309966388889, - "heading": 178.4, - "url": "https://commons.wikimedia.org/wiki/File%3A2405-DreizinnenH.jpg" - }, - { - "title": "File:Dolomiten-Fingerkraut in den Sextener Dolomiten - N\u00e4he Drei-Zinnen-H\u00fctte (9801216636).jpg", - "lat": 46.642352, - "lon": 12.30829, - "heading": 200.0, - "url": "https://commons.wikimedia.org/wiki/File%3ADolomiten-Fingerkraut_in_den_Sextener_Dolomiten_-_N%C3%A4he_Drei-Zinnen-H%C3%BCtte_%289801216636%29.jpg" - } - ], - "exif_headings": [ - { - "title": "File:Cime e Nuvole.jpg", - "heading": 200.3 - }, - { - "title": "File:DreiZinnenP.jpg", - "heading": 180.1 - }, - { - "title": "File:Soffio di sguardo.jpg", - "heading": 194.6 - }, - { - "title": "File:2405-DreizinnenH.jpg", - "heading": 178.4 - }, - { - "title": "File:Dolomiten-Fingerkraut in den Sextener Dolomiten - N\u00e4he Drei-Zinnen-H\u00fctte (9801216636).jpg", - "heading": 200.0 - } - ], - "n_with_exif_heading": 5, - "summit_dem_m": 2746.9, - "summit_nominal": [ - 46.6186, - 12.3025 - ] - } - } - ] -} \ No newline at end of file diff --git a/scripts/ridge-bake/ridge-bake.schema.json b/scripts/ridge-bake/ridge-bake.schema.json deleted file mode 100644 index b58a6c69..00000000 --- a/scripts/ridge-bake/ridge-bake.schema.json +++ /dev/null @@ -1,307 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "title": "ridge-bake manifest v2 and index v1", - "$defs": { - "manifest": { - "type": "object", - "required": [ - "schema", - "baker_version", - "bake_id", - "place", - "view", - "curvature", - "encoding", - "camera", - "cards", - "w", - "h", - "bytes", - "attribution" - ], - "additionalProperties": false, - "properties": { - "schema": { - "const": 2 - }, - "baker_version": { - "type": "integer" - }, - "bake_id": { - "type": "string" - }, - "place": { - "type": "object", - "required": [ - "id", - "name", - "lat", - "lon", - "altitude_km", - "eye_m" - ], - "additionalProperties": false, - "properties": { - "id": { - "type": "string" - }, - "name": { - "type": "string" - }, - "lat": { - "type": "number" - }, - "lon": { - "type": "number" - }, - "altitude_km": { - "type": "number" - }, - "eye_m": { - "type": "number" - } - } - }, - "view": { - "type": "object", - "required": [ - "look_az_deg", - "window_deg", - "plane_w", - "plane_h", - "px_per_deg_h", - "px_per_deg_v", - "exaggeration", - "horizon_row", - "sky_row", - "near_row" - ], - "additionalProperties": false, - "properties": { - "look_az_deg": { - "type": "number" - }, - "window_deg": { - "const": 72 - }, - "plane_w": { - "type": "integer", - "maximum": 4096 - }, - "plane_h": { - "type": "integer" - }, - "px_per_deg_h": { - "type": "number" - }, - "px_per_deg_v": { - "type": "number" - }, - "exaggeration": { - "type": "number" - }, - "horizon_row": { - "type": "number" - }, - "sky_row": { - "type": "number" - }, - "near_row": { - "type": "number" - } - } - }, - "curvature": { - "type": "object", - "required": [ - "r_earth_m", - "k_ref" - ], - "additionalProperties": false, - "properties": { - "r_earth_m": { - "type": "number" - }, - "k_ref": { - "type": "number" - } - } - }, - "encoding": { - "type": "object", - "required": [ - "log_d_min", - "log_d_max", - "normal" - ], - "additionalProperties": false, - "properties": { - "log_d_min": { - "type": "number" - }, - "log_d_max": { - "type": "number" - }, - "normal": { - "const": "rt8" - } - } - }, - "camera": { - "type": "object", - "required": [ - "r_m", - "heading_max_deg" - ], - "additionalProperties": false, - "properties": { - "r_m": { - "type": "number" - }, - "heading_max_deg": { - "type": "number" - } - } - }, - "cards": { - "type": "array", - "minItems": 1, - "maxItems": 6, - "items": { - "type": "object", - "required": [ - "top", - "h", - "near_m", - "far_m", - "median_m", - "distance_m", - "scale", - "colour", - "geometry" - ], - "additionalProperties": false, - "properties": { - "top": { - "type": "integer" - }, - "h": { - "type": "integer" - }, - "near_m": { - "type": [ - "number", - "null" - ] - }, - "far_m": { - "type": [ - "number", - "null" - ] - }, - "median_m": { - "type": "number" - }, - "distance_m": { - "type": "number" - }, - "scale": { - "type": "number" - }, - "colour": { - "type": "object", - "required": [ - "file", - "bytes" - ], - "additionalProperties": false, - "properties": { - "file": { - "type": "string" - }, - "bytes": { - "type": "integer" - } - } - }, - "geometry": { - "type": "object", - "required": [ - "file", - "bytes" - ], - "additionalProperties": false, - "properties": { - "file": { - "type": "string" - }, - "bytes": { - "type": "integer" - } - } - } - }, - "description": "nearest first; the runtime paints the list last to first. top and h place the card back at its rows of the frame; near_m and far_m are the median seam depths, null at the ends; median_m and distance_m are the median distance of the card's solid pixels that are not wall; scale = distance_m / (distance_m - camera.r_m) is the card's pan rate per unit of heading and its static size." - } - }, - "w": { - "type": "integer" - }, - "h": { - "type": "integer" - }, - "bytes": { - "type": "integer" - }, - "attribution": { - "type": "object", - "required": [ - "credit_line", - "licence", - "dem_source", - "url" - ], - "additionalProperties": false, - "properties": { - "credit_line": { - "type": "string" - }, - "licence": { - "type": "string" - }, - "dem_source": { - "type": "string" - }, - "url": { - "type": "string" - } - } - } - } - }, - "index": { - "type": "object", - "required": [ - "schema", - "default", - "places" - ], - "additionalProperties": false, - "properties": { - "schema": { - "const": 1 - }, - "default": { - "type": "string" - }, - "places": { - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - } - } -} diff --git a/scripts/ridge-bake/ridge.py b/scripts/ridge-bake/ridge.py deleted file mode 100644 index 80d38e4c..00000000 --- a/scripts/ridge-bake/ridge.py +++ /dev/null @@ -1,267 +0,0 @@ -"""Ridge baker: the ray march of a place, cut into K+1 layered-depth G-buffer cards by K authored seams (places.json), no painter, no sun. -Offline baker for the ridge backdrop (scripts/ridge-bake); export.py drives it. - - load_preset(id) -> configure() : observer, tiles, mosaic origin, ring radius, window azimuth, card splits and prefilter from places.json - stage0(detail) : ray march of all 6400 azimuth columns (curvature+refraction), optional authored sub-DEM foreground detail, cached - prefilter(d, h, sigma_m) : Gaussian low-pass of the sampled heights (along each ray, across rays at equal distance), angles recomputed with elev - set_view(skyline) : authored Y mapping from the march skyline: angle -> row, see set_view - coverage(d, a) / seams(cov, ..) : visible rows per log-distance bin; one forward-energy seam per authored split, per column - normals(d, h) / cards(...) : per-sample normals; the K+1 cards (coverage, distance, normal, albedo), each cropped to its band of rows -Vertical exaggeration is AUTHORED and derived per view by set_view (printed on the page). The client owns lighting, haze and ink (ruling ridge-cards-runtime-lit).""" -import sys, time, math, json -import os, hashlib -from pathlib import Path -sys.path.insert(0, str(Path(__file__).resolve().parent)) -import numpy as np, tifffile - -def _env_dir(name, what): - v = os.environ.get(name) - if not v: raise RuntimeError(f"{name} is not set: it must name {what} (no default location is assumed)") - return Path(v) -B = _env_dir('RIDGE_WORK', 'the work directory (the mosaic / ray caches)') -COP = _env_dir('RIDGE_TILES', 'the directory of Copernicus GLO-30 tiles (Copernicus_DSM_COG_10_*_DEM.tif)') -W = 6400 # ring columns: 360 deg at 17.78 px/deg -WIN = 1280 # window = 72 deg of the ring -HPX_DEG = W / 360.0 -H = 600 # frame rows -COLW = math.radians(360.0 / W) -R_EARTH, KREF = 6371000.0, 0.13 - -P = {} # configured preset -rowang = np.zeros(H); PXDEG_V = 100.0; TOP_DEG = 2.6; BOTTOM_DEG = -3.4 - -def load_preset(pid, path=Path(__file__).resolve().parent / 'places.json'): - """The preset dict. card_split_km is the ordered list of authored seam depths (km): required, strictly increasing, at most export.MAX_CARDS - 1 (the cap is export's, which owns the budget); refused here, before any march.""" - d = json.load(open(path)); p = dict(next(x for x in d['presets'] if x['id'] == pid)); sp = p.get('card_split_km') - from export import MAX_CARDS - if not sp: raise ValueError(f"preset {pid}: card_split_km is required (an ordered list of 1 to {MAX_CARDS - 1} depths in km)") - if len(sp) > MAX_CARDS - 1 or any(b <= a for a, b in zip(sp, sp[1:])): raise ValueError(f"preset {pid}: card_split_km {sp} must be strictly increasing with at most {MAX_CARDS - 1} entries") - return p - -# ====================================================================== configuration, DEM -def tiles_for(p): - lat, lon, r = p['lat'], p['lon'], p['rmax_km']; dl = r / 111.32; dn = r / (111.32 * math.cos(math.radians(lat))); out = [] - for la in range(math.floor(lat - dl), math.floor(lat + dl) + 1): - for lo in range(math.floor(lon - dn), math.floor(lon + dn) + 1): - cy = min(max(lat, la), la + 1); cx = min(max(lon, lo), lo + 1) - if math.hypot((cy - lat) * 111.32, (cx - lon) * 111.32 * math.cos(math.radians(lat))) <= r: out.append((la, lo)) - return out -def tile_path(la, lo): return COP / f"Copernicus_DSM_COG_10_{'N' if la >= 0 else 'S'}{abs(la):02d}_00_{'E' if lo >= 0 else 'W'}{abs(lo):03d}_00_DEM.tif" - -def cache_key(*parts): - """Short digest of everything a cached array was computed from. A cache file is read only under the key of its own inputs, so a changed preset field, tile list or baker constant never meets a stale file.""" - h = hashlib.sha256() - for q in parts: h.update(q.tobytes() if isinstance(q, np.ndarray) else repr(q).encode()); h.update(b'|') - return h.hexdigest()[:12] -def mosaic_key(p): return cache_key('mosaic.v1', sorted(tiles_for(p)), 3600) - -_mos = {} -def mosaic(p): - """Tile grid covering the circle (bounding rows/cols), cached as .npy per preset. Missing tiles (open sea has no GLO-30 tile) are zero.""" - key = (p['id'], mosaic_key(p)) - if key in _mos: return _mos[key] - ts = tiles_for(p); las = [t[0] for t in ts]; los = [t[1] for t in ts]; lat_top = max(las) + 1; lon_left = min(los) - c = B / f"mosaic-{p['id']}-{key[1]}.npy" - if c.exists(): m = np.load(c, mmap_mode='r') - else: - rows = [] - for la in range(max(las), min(las) - 1, -1): - rows.append(np.concatenate([tifffile.imread(tile_path(la, lo)) if tile_path(la, lo).exists() else np.zeros((3600, 3600), np.float32) for lo in range(min(los), max(los) + 1)], axis=1)) - m = np.concatenate(rows, axis=0).astype(np.float32); np.save(c, m) - _mos[key] = (m, lat_top, lon_left); return _mos[key] - -def bil(a, lat_top, lon_left, lat, lon): - y = (lat_top - lat) * 3600 - 0.5; x = (lon - lon_left) * 3600 - 0.5 - y0 = np.clip(np.floor(y).astype(int), 0, a.shape[0] - 2); x0 = np.clip(np.floor(x).astype(int), 0, a.shape[1] - 2) - fy = np.clip(y - y0, 0, 1); fx = np.clip(x - x0, 0, 1) - return (a[y0, x0] * (1 - fx) * (1 - fy) + a[y0, x0 + 1] * fx * (1 - fy) + a[y0 + 1, x0] * (1 - fx) * fy + a[y0 + 1, x0 + 1] * fx * fy) - -def configure(p): - """Set the module state for a preset: observer, eye elevation (DEM ground + eye height, or ground_override), window azimuth.""" - global P - P = p; m, lt, ll = mosaic(p) - ground = p['ground_override_m'] if 'ground_override_m' in p else float(bil(m, lt, ll, np.array(p['lat']), np.array(p['lon']))) - P['ground_m'] = ground; P['eye_m'] = ground + p['eye_h_m'] - if 'look_at' in p: - la, lo = p['look_at']; P['az_center'] = (math.degrees(math.atan2((lo - p['lon']) * math.cos(math.radians(p['lat'])), la - p['lat'])) + 360) % 360 - else: P['az_center'] = p['az_deg'] - P['win0'] = int(round(P['az_center'] / 360 * W - WIN / 2)) % W - return P - -def win(img): return np.take(img, (P['win0'] + np.arange(WIN)) % W, axis=1) - -# ====================================================================== authored sub-DEM foreground detail (Aetheria / CultMath ridged multifractal) -def _frac(v): return v - np.floor(v) -def _hash2(x, y): return _frac(np.sin(x * 127.1 + y * 311.7) * 43758.5453) # cultmath_hash(vec2), as Ratatoskr noise.ts -def _vnoise2(x, y): # cultmath_value_noise: 4 hashed corners, smoothstep blend - cx, cy = np.floor(x), np.floor(y); u = x - cx; v = y - cy; u = u * u * (3 - 2 * u); v = v * v * (3 - 2 * v) - a, b, c, d = _hash2(cx, cy), _hash2(cx + 1, cy), _hash2(cx, cy + 1), _hash2(cx + 1, cy + 1) - return (a + (b - a) * u) * (1 - v) + (c + (d - c) * u) * v -LACUN, WEIGHT_GAIN, AMP_GAIN, CRAG = 2.07, 2.0, 0.5, 0.5 # ridgeWorld.ts constants -DETAIL = dict(cell_m=60.0, octaves=4, amp_m=24.0, fade_from_m=500.0, fade_to_m=4000.0, seed=17) -def detail_height(E, N, dist): - """Ridged multifractal (ridgeWorld.ts `profile`, folded value noise weighted by the previous octave) in WORLD metres (east, north of the observer), - so it is automatically periodic around the ring. First octave wavelength = 60 m = two GLO-30 cells (nothing coarser than the DEM can resolve is - touched), then x2.07. Amplitude fades to zero between fade_from and fade_to metres of distance. Seeded, deterministic, authored.""" - cfg = DETAIL; e = 0.03 + (1 - CRAG) * 0.4; top = math.sqrt(1 + e * e); s = 0.0; nrm = 0.0; amp = 1.0; f = 1.0 / cfg['cell_m']; w = 1.0 - for k in range(cfg['octaves']): - v = 2 * _vnoise2(E * f + cfg['seed'] * 7.31, N * f + cfg['seed'] * 3.17 + k * 13) - 1 - sig = (1 - np.sqrt(v * v + e * e) / top) ** 2 * w; w = np.minimum(1.0, sig * WEIGHT_GAIN); s = s + sig * amp; nrm += amp; amp *= AMP_GAIN; f *= LACUN - t = np.clip((dist - cfg['fade_from_m']) / (cfg['fade_to_m'] - cfg['fade_from_m']), 0, 1); fade = 1 - t * t * (3 - 2 * t) - return cfg['amp_m'] * fade * (s / nrm - 0.3) - -# ====================================================================== stage 0: march -def schedule(detail): - d = [500.0] - while d[-1] < P['rmax_km'] * 1000: - d.append(d[-1] + min(250.0, max(10.0 if detail else 40.0, 0.004 * d[-1]))) - return np.array(d) - -def elev(h, d, curvature=True): - """Elevation angle (degrees) of height h (m) at distance d (m) from the eye: Earth curvature with refraction. The one formula of march and prefilter.""" - drop = d * d / (2 * R_EARTH) * (1 - KREF) if curvature else 0.0 - return np.degrees(np.arctan2(h - P['eye_m'] - drop, d)) - -def march(detail=False, curvature=True): - m, lt, ll = mosaic(P); az = np.radians((np.arange(W) + 0.5) / W * 360.0); d = schedule(detail); cosl = math.cos(math.radians(P['lat'])) - A = np.zeros((len(d), W), np.float32); Hh = np.zeros_like(A); sa, ca = np.sin(az), np.cos(az) - for k, dk in enumerate(d): - lat = P['lat'] + dk * ca / 111320.0; lon = P['lon'] + dk * sa / (111320.0 * cosl) - h = bil(m, lt, ll, lat, lon) - if detail and dk < DETAIL['fade_to_m']: h = h + detail_height(dk * sa, dk * ca, dk) - A[k] = elev(h, dk, curvature); Hh[k] = h - return d, A, Hh - -def rays_key(detail): - """Inputs of the ray march: observer, eye elevation, range, the DEM mosaic, the sample schedule (hashed as the array it produces), the Earth / refraction constants, the ring width, and (detail) the foreground detail noise.""" - return cache_key('rays.v1', P['lat'], P['lon'], P['rmax_km'], round(float(P['eye_m']), 3), mosaic_key(P), schedule(detail), R_EARTH, KREF, W, bool(detail), - (sorted(DETAIL.items()), LACUN, WEIGHT_GAIN, AMP_GAIN, CRAG) if detail else None) -def stage0(detail=False, force=False): - c = B / f"rays-{P['id']}{'-detail' if detail else ''}-{rays_key(detail)}.npz" - if c.exists() and not force: - z = np.load(c); return z['d'], z['ang'], z['h'], None - t0 = time.time(); mosaic(P); t1 = time.time(); d, A, Hh = march(detail); t2 = time.time(); np.savez(c, d=d, ang=A, h=Hh) - return d, A, Hh, dict(mosaic=t1 - t0, march=t2 - t1, samples=len(d)) - -# ====================================================================== periodic helpers -def blurw(a, s): - r = int(3 * s) + 1; k = np.exp(-0.5 * (np.arange(-r, r + 1) / s) ** 2); k /= k.sum() - a = np.asarray(a, np.float64); xp = np.concatenate([a[..., -r:], a, a[..., :r]], axis=-1); o = np.zeros_like(a) - for i, kv in enumerate(k): o += kv * xp[..., i:i + a.shape[-1]] - return o - - - -# ====================================================================== prefilter: the march is a heightfield of roofs and hills; the cards want the hills -def prefilter(d, h, sigma_m): - """Gaussian low-pass of the ray heights h (K, W): along each ray with sigma sigma_m metres (weighted by sample spacing, the schedule is not uniform), then across rays at equal distance with - sigma = sigma_m / (d * COLW) columns (periodic, exact in the Fourier domain). Angles are recomputed from the filtered heights with elev. Returns (angles, heights); sigma_m 0 leaves the heights as they are.""" - d = np.asarray(d, np.float64); h = np.asarray(h, np.float64) - if sigma_m > 0: - f = np.fft.rfftfreq(h.shape[1]); sc = sigma_m / (d * COLW) - h = np.fft.irfft(np.fft.rfft(h, axis=1) * np.exp(-2 * (np.pi * f[None, :] * sc[:, None]) ** 2), n=h.shape[1], axis=1) - dd = np.gradient(d); out = np.empty_like(h) - for k in range(len(d)): - r = int(min(3 * sigma_m / dd[k] + 1, 60)); lo, hi = max(0, k - r), min(len(d), k + r + 1) - w = np.exp(-0.5 * ((d[lo:hi] - d[k]) / sigma_m) ** 2) * dd[lo:hi]; out[k] = (w[:, None] * h[lo:hi]).sum(0) / w.sum() - h = out - return elev(h, d[:, None]), h - -def normals(d, h): - """Surface normal at every ray sample (n_r, n_t, n_up), each (K, W): n_r along the ray, n_t across it (towards increasing azimuth), n_up vertical. The slopes are the ray's own dh/dd and the difference of the - neighbouring columns at the SAME sample (equal distance, never equal row) over 2 d COLW, both times the authored vertical exaggeration PXDEG_V / HPX_DEG, so a face reads as steep as the view draws it.""" - d = np.asarray(d, np.float64); h = np.asarray(h, np.float64); E = PXDEG_V / HPX_DEG - sr = E * np.gradient(h, d, axis=0); st = E * (np.roll(h, -1, axis=1) - np.roll(h, 1, axis=1)) / (2 * d[:, None] * COLW); nz = 1.0 / np.sqrt(1 + sr * sr + st * st) - return -sr * nz, -st * nz, nz - -# ====================================================================== the authored Y mapping -def set_view(skyline, sky_row=0.04, near_row=0.66): - """AUTHORED vertical mapping, linear in elevation angle: row = (TOP_DEG - angle) * PXDEG_V over the whole 600-row frame (cylindrical, horizontal 17.78 px/deg). skyline is the highest angle any sample reaches in each - ring column (W,), straight from the march. Two anchors: the highest skyline angle in the window sits at `sky_row` (4%) of the frame height, the LOWEST sits at `near_row` (66%); everything below is body and ground. - PXDEG_V = (near_row - sky_row) * 600 / (highest - lowest), clamped to [17.78, 178] px/deg = vertical exaggeration 1x..10x. TOP_DEG = highest + sky_row*600/PXDEG_V; BOTTOM_DEG = TOP_DEG - 600/PXDEG_V.""" - global rowang, PXDEG_V, TOP_DEG, BOTTOM_DEG - w = win(np.asarray(skyline)[None, :])[0]; sky = float(w.max()); low = float(w.min()) - ppd = float(np.clip((near_row - sky_row) * H / max(sky - low, 0.05), HPX_DEG, 10 * HPX_DEG)) - PXDEG_V = ppd; TOP_DEG = sky + sky_row * H / ppd; BOTTOM_DEG = TOP_DEG - H / ppd; rowang = TOP_DEG - (np.arange(H) + 0.5) / PXDEG_V - return dict(top_deg=TOP_DEG, bottom_deg=BOTTOM_DEG, px_per_deg=PXDEG_V, exaggeration=PXDEG_V / HPX_DEG, horizon_row=TOP_DEG * PXDEG_V, sky_deg=sky, low_deg=low, sky_row=sky_row, near_row=near_row) - -# ====================================================================== coverage and seams -COV_BINS = 160 # log-distance bins between the first and the last sample -SIG_B = 1.5 # blur of the coverage along depth (bins): seams settle in gaps -SEAM_LAM, SEAM_UNARY = 2.0, 0.25 # forward energy: a seam that moves a bin between neighbouring columns pays SEAM_LAM per bin plus every visible row it sweeps; one that sits in visible terrain pays SEAM_UNARY x those rows (cross-fadable) -SEAM_PRIOR = 0.02 # the authored depth is a faint pull, rows per nat^2 (the test pins the window: six synthetic receding ridges tear at 0.1, and without the swept-rows term at 0.02 they tear again) -SEAM_SEP = 0.4 # seams at least this far apart in log-distance (nat) -XF = 0.07 # half-width of a seam's cross-fade, nat (about two bins) - -def log_edges(d, nb=COV_BINS): L = np.log(np.asarray(d, np.float64)); return np.linspace(L[0], L[-1] + 1e-9, nb + 1) - -def opaque(a): - """Coverage 0..1 of every frame row by the opaque view of angles a (K, n): the share of the row's angular span under the column skyline.""" - p = 1.0 / PXDEG_V; lo = rowang - 0.5 * p; return np.clip((np.asarray(a, np.float64).max(0)[None, :] - lo[:, None]) / p, 0, 1) - -def coverage(d, a, nb=COV_BINS): - """(nb, n): rows of the opaque view first revealed by the samples of each log-distance bin, per column. The first sample reveals every row from the frame bottom up to its angle, so the rows below it (nearer than it) count in bin 0. Needs set_view.""" - a = np.asarray(a, np.float64); edges = log_edges(d, nb); kb = np.clip(np.searchsorted(edges, np.log(d), 'right') - 1, 0, nb - 1) - runmax = np.maximum.accumulate(a, axis=0); prev = np.vstack([np.full((1, a.shape[1]), BOTTOM_DEG), runmax[:-1]]) - C = np.zeros((nb, a.shape[1])); np.add.at(C, kb, np.clip(np.minimum(a, TOP_DEG) - np.maximum(prev, BOTTOM_DEG), 0, None) * PXDEG_V) - return C - -def _dt(f, u): - """out[i] = min_k f[k] + |u[i] - u[k]| along axis 0, u increasing: two cumulative-minimum passes (Felzenszwalb & Huttenlocher's L1 distance transform).""" - u = u.reshape((-1,) + (1,) * (f.ndim - 1)); return np.minimum(np.minimum.accumulate(f - u, axis=0) + u, np.flip(np.minimum.accumulate(np.flip(f + u, 0), axis=0), 0) - u) - -def seams(cov, targets, d): - """(K, n) ordered seam distances (m), one per authored target (m), each column. One 1D forward-energy DP per seam, in target order (seam carving, Avidan & Shamir 2007; forward energy, Rubinstein et al. 2008): unary - SEAM_UNARY x the rows at the seam; moving a bin between neighbouring columns costs SEAM_LAM per bin plus the rows swept, an L1 distance in u = cumsum(rows) + SEAM_LAM x bin; a weak prior to the target. Seam k is held at - least SEAM_SEP nat beyond seam k-1 in every column. Sequential, not joint: a joint DP has NB^K states per column and seams in gaps do not interact.""" - cov = np.asarray(cov, np.float64); nb, n = cov.shape; edges = log_edges(d, nb); bc = 0.5 * (edges[:-1] + edges[1:]); sep = int(math.ceil(SEAM_SEP / (edges[1] - edges[0]))); INF = 1e12 - r = int(3 * SIG_B) + 1; kern = np.exp(-0.5 * (np.arange(-r, r + 1) / SIG_B) ** 2); kern /= kern.sum(); pad = np.pad(cov, ((r, r), (0, 0)), mode='edge'); Cs = sum(kv * pad[i:i + nb] for i, kv in enumerate(kern)) - bins = np.arange(nb); lo = np.zeros(n, int); out = np.zeros((len(targets), n)) - for t, T in enumerate(targets): - prior = SEAM_PRIOR * (bc - math.log(T)) ** 2; need = np.minimum(lo + (sep if t else 0), nb - 1); feas = bins[:, None] >= need[None, :] - warp = lambda x: np.cumsum(0.5 * (cov[:, x - 1] + cov[:, x])) + SEAM_LAM * bins - cost = np.where(feas[:, 0], SEAM_UNARY * Cs[:, 0] + prior, INF); store = [cost] - for x in range(1, n): cost = np.where(feas[:, x], _dt(cost, warp(x)) + SEAM_UNARY * Cs[:, x] + prior, INF); store.append(cost) - j = np.zeros(n, int); j[-1] = int(np.argmin(store[-1])) - for x in range(n - 1, 0, -1): u = warp(x); j[x - 1] = int(np.argmin(store[x - 1] + np.abs(u - u[j[x]]))) - out[t] = np.exp(bc[j]); lo = j - return out - -# ====================================================================== cards: layered depth, one per band between seams -GRASS, FOREST, ROCK, SNOW = (0.36, 0.44, 0.26), (0.22, 0.31, 0.20), (0.47, 0.44, 0.41), (0.93, 0.95, 0.97) -def albedo(h, n_up): - """The authored material, a few numbers: valley green to forest to rock by height, rock where the face is steep, snow above the tree line. Straight colour, no light in it.""" - t = lambda a, b: np.clip((h - a) / (b - a), 0, 1)[..., None]; c = np.asarray(GRASS) + (np.asarray(FOREST) - GRASS) * t(150, 900); c = c + (np.asarray(ROCK) - c) * t(1300, 2000) - c = c + (np.asarray(ROCK) - c) * np.clip((0.93 - n_up) / 0.25, 0, 1)[..., None]; return c + (np.asarray(SNOW) - c) * (t(1900, 2300) * np.clip((n_up - 0.55) / 0.3, 0, 1)[..., None]) - -def cards(d, a, h, seams, nrm=None): - """K+1 cards, nearest first, from the angles a and heights h (samples, n) of n columns and the (K, n) seams (m). Card i holds per pixel the FIRST VISIBLE hit at or beyond seam i-1 (less XF): layered depth, so a farther - card keeps the terrain a nearer ridge hides. Its alpha is that pixel's coverage (a crest row holds the share of its angular span under the card's running maximum) times 1 - smoothstep over seam i +- XF in - log-distance of the hit; card 0 owns the rows below the first sample, the last card has no far edge. Alphas are then made nested so the alpha-over composite of all cards is exactly the opaque coverage (a row two - cards both hold partly is not counted twice). Distance and normal are interpolated between sample k-1 and k by angle. Each card is cropped to the rows where its 8-bit alpha is not zero. - nrm is normals(d, h) of the same columns (default: computed from h as given, so pass it for a window cut from the ring). Rows of a card i > 0 below the angle of its first sample (hit and idx == 0) are the extruded wall of the ridge the card starts at: they keep that sample's distance, their albedo is the ground material at their height with the face up (n_up = 1), - and `wall` flags them (card 0 has no wall: its rows below the first sample are the ground). Each card: dict(top, alpha (h,n), albedo (h,n,3), n_r, n_t, logd (ln metres) (h,n), wall (h,n) bool).""" - d = np.asarray(d, np.float64); a = np.asarray(a, np.float64); h = np.asarray(h, np.float64); seams = np.asarray(seams, np.float64); nk, n = a.shape; nc = len(seams) + 1 - n_r, n_t, n_u = nrm if nrm is not None else normals(d, h); ld = np.broadcast_to(np.log(d)[:, None], (nk, n)); p = 1.0 / PXDEG_V; lo = rowang - 0.5 * p - ks0 = [np.searchsorted(d, seams[i - 1] * math.exp(-XF)) for i in range(1, nc)]; ks1 = [np.searchsorted(d, seams[i] * math.exp(XF)) for i in range(nc - 1)] - F = np.zeros((nc, H, n)); X = np.ones((nc, H, n)); G = np.zeros((nc, 5, H, n)); Wl = np.zeros((nc, H, n), bool) # coverage, far fade, then (logd, h, n_r, n_t, n_u); wall rows - for x in range(n): - for i in range(nc): - k0 = 0 if i == 0 else int(ks0[i - 1][x]); k1 = nk if i == nc - 1 else int(ks1[i][x]) - if k1 <= k0: continue - rm = np.maximum.accumulate(a[k0:k1, x]); idx = np.searchsorted(rm, lo, 'right'); hit = idx < len(rm); idx = np.minimum(idx, len(rm) - 1); kk = k0 + idx - if not hit.any(): continue - kp = np.maximum(kk - 1, k0); prev = np.where(idx > 0, rm[np.maximum(idx - 1, 0)], rm[idx] - 1.0) - t = np.where(idx > 0, np.clip((rowang - prev) / np.maximum(rm[idx] - prev, 1e-9), 0, 1), 1.0); mix = lambda arr: arr[kp, x] + t * (arr[kk, x] - arr[kp, x]) - F[i, :, x] = np.where(hit, np.clip((rm[-1] - lo) / p, 0, 1), 0); lh = mix(ld) - G[i, :, :, x] = np.where(hit, np.stack([lh, mix(h), mix(n_r), mix(n_t), mix(n_u)]), 0) - if i: Wl[i, :, x] = hit & (idx == 0) # rows below the card's first sample: the extruded wall (card 0's are the ground) - if i < nc - 1: s = np.clip((lh - (math.log(seams[i, x]) - XF)) / (2 * XF), 0, 1); X[i, :, x] = 1 - s * s * (3 - 2 * s) - out = []; A = np.zeros((H, n)) - for i in range(nc): - part = np.where(F[i] < 1, np.clip((np.maximum(A, F[i]) - A) / np.maximum(1 - A, 1e-6), 0, 1), F[i]); al = np.where(np.rint(X[i] * part * 255) > 0, X[i] * part, 0.0); A = 1 - (1 - A) * (1 - al) - rows = np.flatnonzero(al.max(1) > 0) - if not len(rows): out.append(dict(top=0, alpha=np.zeros((0, n), np.float32), albedo=np.zeros((0, n, 3), np.float32), n_r=np.zeros((0, n), np.float32), n_t=np.zeros((0, n), np.float32), logd=np.zeros((0, n), np.float32), wall=np.zeros((0, n), bool))); continue - sl = slice(int(rows[0]), int(rows[-1]) + 1); g = G[i, :, sl]; nz = np.sqrt(g[2] ** 2 + g[3] ** 2 + g[4] ** 2) + 1e-12 - out.append(dict(top=int(rows[0]), alpha=al[sl].astype(np.float32), albedo=albedo(g[1], np.where(Wl[i, sl], 1.0, g[4] / nz)).astype(np.float32), n_r=(g[2] / nz).astype(np.float32), n_t=(g[3] / nz).astype(np.float32), logd=g[0].astype(np.float32), wall=Wl[i, sl].copy())) - return out diff --git a/scripts/ridge-bake/tests/mutate.py b/scripts/ridge-bake/tests/mutate.py deleted file mode 100644 index 70b889fb..00000000 --- a/scripts/ridge-bake/tests/mutate.py +++ /dev/null @@ -1,60 +0,0 @@ -"""Mutation check: re-introduce a cause into a COPY of the baker, run the fixtures against it, and require that at least one fails. - venv/bin/python tests/mutate.py (prints one line per mutant; exit 1 if a mutant survives)""" -import os, shutil, subprocess, sys, tempfile -HERE = os.path.dirname(os.path.abspath(__file__)); SRC = os.path.join(HERE, '..') -MUTANTS = { # name -> (text in ridge.py or export.py, replacement) - 'seam cost: the rows a seam sweeps are not paid (it hops across a receding ridge)': ("np.cumsum(0.5 * (cov[:, x - 1] + cov[:, x])) + SEAM_LAM * bins", "SEAM_LAM * bins"), - 'seam prior pulls hard to the target (2.0, or 0.1: the seam hops across a ridge)': ("SEAM_PRIOR = 0.02 ", "SEAM_PRIOR = 2.0 "), - 'normals: the authored exaggeration is dropped': ("h = np.asarray(h, np.float64); E = PXDEG_V / HPX_DEG", "h = np.asarray(h, np.float64); E = 1.0"), - 'normals: the lateral neighbour is one sample nearer (not equal distance)': ("st = E * (np.roll(h, -1, axis=1) - np.roll(h, 1, axis=1))", "st = E * (np.roll(np.roll(h, -1, axis=1), 1, axis=0) - np.roll(h, 1, axis=1))"), - 'cards: the near edge is ignored (every card starts at sample 0)': ("k0 = 0 if i == 0 else int(ks0[i - 1][x])", "k0 = 0"), - 'cards: the farther card fades in over the window too (both cards translucent)': ("X[i, :, x] = 1 - s * s * (3 - 2 * s)", "X[i, :, x] = 1 - s * s * (3 - 2 * s); X[i + 1, :, x] = s * s * (3 - 2 * s)"), - 'cards: a crest row is all or nothing (no fractional coverage)': ("F[i, :, x] = np.where(hit, np.clip((rm[-1] - lo) / p, 0, 1), 0)", "F[i, :, x] = np.where(hit, 1.0, 0)"), - 'prefilter ignores sigma': ("if sigma_m > 0:", "if False:"), - 'prefilter across rays uses one sigma in columns (not per distance)': ("sc = sigma_m / (d * COLW)", "sc = sigma_m / (d[0] * COLW) * np.ones_like(d)"), - 'bake_id hashes geometry before colour': ("h.update(colour); h.update(geometry)", "h.update(geometry); h.update(colour)"), - 'check_cover accepts any composite': ("if bad.any(): y, x", "if False: y, x"), - 'check_budget ignores the cropped bands (decoded as full frames)': ("decoded = sum(2 * w * h * 4 for h in bands)", "decoded = 0"), - 'load_preset accepts splits that do not increase': ("or any(b <= a for a, b in zip(sp, sp[1:]))", ""), - 'geometry: n_r and n_t channels swapped': ("r, t = u8((np.asarray(n_r) + 1) / 2), u8((np.asarray(n_t) + 1) / 2)", "r, t = u8((np.asarray(n_t) + 1) / 2), u8((np.asarray(n_r) + 1) / 2)"), - 'geometry: log-distance not normalised by the encoding range': ("b = (np.asarray(logd) - enc['log_d_min']) / (enc['log_d_max'] - enc['log_d_min'])", "b = np.asarray(logd) / 12.0"), - 'colour: albedo zeroed in the file': ("rgb = u8(albedo) * (a[..., None] > 0)", "rgb = u8(albedo) * 0"), - 'colour: premultiplied instead of straight': ("rgb = u8(albedo) * (a[..., None] > 0)", "rgb = u8(np.asarray(albedo) * np.asarray(alpha)[..., None])"), - 'seams: the separation between seams is ignored': ("SEAM_SEP = 0.4 ", "SEAM_SEP = 0.0 "), - 'elev: curvature and refraction dropped': ("drop = d * d / (2 * R_EARTH) * (1 - KREF) if curvature else 0.0", "drop = 0.0"), - 'coverage: the rows below the first sample are not counted': ("prev = np.vstack([np.full((1, a.shape[1]), BOTTOM_DEG), runmax[:-1]])", "prev = np.vstack([np.full((1, a.shape[1]), 100.0), runmax[:-1]])"), - 'coverage: the rows below the first sample are counted twice': ("* PXDEG_V)\n return C", "* PXDEG_V); C[0] += np.clip(np.minimum(a[0], TOP_DEG) - BOTTOM_DEG, 0, None) * PXDEG_V\n return C"), - 'cards: the hit is not interpolated between samples': ("t = np.where(idx > 0, np.clip((rowang - prev) / np.maximum(rm[idx] - prev, 1e-9), 0, 1), 1.0)", "t = np.ones_like(rowang)"), - 'cards: the blended normal is not renormalised': ("nz = np.sqrt(g[2] ** 2 + g[3] ** 2 + g[4] ** 2) + 1e-12", "nz = 1.0"), - 'wall: no row is flagged (the flag is dropped)': ("if i: Wl[i, :, x] = hit & (idx == 0)", "if i: Wl[i, :, x] = False"), - 'wall: card 0 is flagged too (its ground rows become wall)': ("if i: Wl[i, :, x] = hit & (idx == 0)", "Wl[i, :, x] = hit & (idx == 0)"), - 'wall: albedo takes the face normal, not the face up': ("np.where(Wl[i, sl], 1.0, g[4] / nz)", "g[4] / nz"), - 'wall: the code is not written to the geometry': ("if wall is not None: m = np.asarray(wall, bool)", "if False: m = np.asarray(wall, bool)"), - 'wall: the sheet lights wall rows with their normal': ("wall = c['wall']; n_r, n_t = np.where(wall, 0.0, c['n_r']), np.where(wall, 0.0, c['n_t'])", "n_r, n_t = c['n_r'], c['n_t']"), - 'camera: the sign of r is flipped in the scale': ("return [d / (d - r_m) for d in distances]", "return [d / (d + r_m) for d in distances]"), - 'camera: the scale is clamped (a function of r that is not the formula)': ("return [d / (d - r_m) for d in distances]", "return [min(d / (d - r_m), 1.2) for d in distances]"), - 'camera: the card distance includes wall rows': ("ground = (c['alpha'] >= 0.5) & ~c['wall']", "ground = (c['alpha'] >= 0.5)"), - 'camera: the offset bound is ignored': ("if abs(r_m) >= R_FRAC_MAX * min(distances): raise", "if False: raise"), - 'camera: the frame-bottom coverage check is removed': ("if bottom < view['plane_h'] - 1e-6: raise", "if False: raise"), - 'camera: the 16:9 rest coverage check is removed': ("if min(scales) < REST_SCALE_MIN: raise", "if False: raise"), - 'camera: the preset camera_r_m is ignored': ("r_m=float(p.get('camera_r_m', CAMERA_R_M))", "r_m=float(CAMERA_R_M)"), - 'camera: the manifest writes the default heading range, not the bake\'s': ("heading_max_deg=meta['camera']['heading_max_deg']),", "heading_max_deg=HEADING_MAX_DEG),"), - 'export: an empty card is not refused': ("if c['alpha'].shape[0] == 0: raise", "if False: raise"), - 'rays cache key ignores the refraction constant': ("R_EARTH, KREF, W, bool(detail)", "R_EARTH, W, bool(detail)"), - 'rays cache key ignores the eye elevation': ("round(float(P['eye_m']), 3), ", ""), - 'mosaic cache key ignores the tile list': ("sorted(tiles_for(p)), 3600", "3600"), -} -EQUIVALENT = {} # mutant name -> one line on why it is behaviourally equivalent (reported, not run) -def run(item): - name, (a, b) = item; d = tempfile.mkdtemp(); shutil.copytree(SRC, os.path.join(d, 'src'), ignore=shutil.ignore_patterns('tests', '__pycache__')); p = next(q for q in (os.path.join(d, 'src', f) for f in ('ridge.py', 'export.py')) if a in open(q).read()); s = open(p).read(); assert a in s, name - open(p, 'w').write(s.replace(a, b)) - r = subprocess.run([sys.executable, os.path.join(HERE, 'test_ridge.py')], env=dict(os.environ, RIDGE_SRC=os.path.join(d, 'src')), capture_output=True, text=True); shutil.rmtree(d) - fails = [l.split('|')[0].strip() for l in r.stdout.splitlines() if l.startswith('FAIL')] - line = ('KILLED ' if r.returncode else 'SURVIVED ') + name + ' -> ' + (', '.join(fails) or 'no fixture failed'); print(line, file=sys.stderr, flush=True) # progress: a killed run keeps what finished - return line, r.returncode == 0 -if __name__ == '__main__': - from concurrent.futures import ThreadPoolExecutor - with ThreadPoolExecutor(int(os.environ.get('MUTATE_JOBS', '6'))) as ex: res = list(ex.map(run, [(n, v) for n, v in MUTANTS.items() if n not in EQUIVALENT])) - for line, _ in res: print(line, flush=True) - for n, why in EQUIVALENT.items(): print('EQUIVALENT ' + n + ' -> ' + why) - sys.exit(1 if any(sv for _, sv in res) else 0) diff --git a/scripts/ridge-bake/tests/run.sh b/scripts/ridge-bake/tests/run.sh deleted file mode 100755 index f97a126c..00000000 --- a/scripts/ridge-bake/tests/run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# Usage: RIDGE_PY= RIDGE_TILES= tests/run.sh [test_ridge.py|mutate.py] -# RIDGE_WORK (cache dir) defaults to a fresh directory under $TMPDIR. -: "${RIDGE_PY:?RIDGE_PY must name the python of the baker venv}" -export RIDGE_WORK="${RIDGE_WORK:-${TMPDIR:-/tmp}/ridge-bake-work}"; mkdir -p "$RIDGE_WORK" -HERE=$(cd "$(dirname "$0")" && pwd) -exec "$RIDGE_PY" -I "$HERE/${1:-test_ridge.py}" diff --git a/scripts/ridge-bake/tests/test_ridge.py b/scripts/ridge-bake/tests/test_ridge.py deleted file mode 100644 index 8a323cf5..00000000 --- a/scripts/ridge-bake/tests/test_ridge.py +++ /dev/null @@ -1,385 +0,0 @@ -"""Fixtures for the ridge baker (march, prefilter, coverage, seams, normals, cards, export). Plain asserts, no pytest needed: venv/bin/python tests/test_ridge.py (exit code 1 on failure). -RIDGE_SRC selects the source directory (default ..) (the mutation runner points it at a patched copy). -Synthetic terrain has a known right answer; the Vienna tests bake the real preset (its rays come from stage0: RIDGE_TILES needs the tiles, or a cached rays file must exist).""" -import os, sys, math, json, shutil, tempfile, traceback -SRC = os.environ.get('RIDGE_SRC') or os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'); sys.path.insert(0, SRC) # RIDGE_WORK and RIDGE_TILES must be set (tests/run.sh sets them) -import numpy as np, ridge, export -from ridge import W, WIN, H - -EYE = 100.0; GROUND = 50.0 # ground below the eye: every ray climbs, so only the placed blocks make ridges -ridge.P = dict(id='synthetic', rmax_km=95, eye_m=100.0, win0=0) -D = ridge.schedule(False) -def az_of(x): return (x + 0.5) / W * 360.0 -def col_of(az): return int(round(az / 360.0 * W - 0.5)) % W - -def rays(hfun): - az = (np.arange(W) + 0.5) / W * 360.0; A = np.zeros((len(D), W), np.float32); Hh = np.zeros_like(A) - for k, dk in enumerate(D): - h = hfun(dk, az); Hh[k] = h; A[k] = np.degrees(np.arctan2(h - EYE - dk * dk / (2 * ridge.R_EARTH) * (1 - ridge.KREF), dk)) - return A, Hh -def theta(h, d): return math.degrees(math.atan2(h - EYE - d * d / (2 * ridge.R_EARTH) * (1 - ridge.KREF), d)) -def in_arc(az, a0, a1): return ((az - a0) % 360.0) <= ((a1 - a0) % 360.0) -def block(a0, a1, d0, d1, h): return lambda dk, az: np.where(in_arc(az, a0, a1) & (dk >= d0) & (dk < d1), h, 0.0) -def terrain(*blocks): return lambda dk, az: np.maximum.reduce([np.full_like(az, GROUND)] + [np.asarray(b(dk, az), float) for b in blocks]) -def test_cache_keys_follow_every_input_of_the_cached_array(): - """mosaic-/rays- cache files are keyed by a digest of their inputs. Right answer: identical inputs -> identical key (the preset id does not enter), a changed preset field (eye height, range, position), tile list or baker constant (refraction, detail noise) -> a different key.""" - saved = ridge.P - try: - base = dict(id='k1', lat=47.0, lon=11.0, rmax_km=40, eye_m=2000.0); ridge.P = dict(base); k0 = (ridge.rays_key(False), ridge.rays_key(True), ridge.mosaic_key(ridge.P)) - ridge.P = dict(base, id='other'); assert (ridge.rays_key(False), ridge.rays_key(True), ridge.mosaic_key(ridge.P)) == k0, 'the preset id changed the key' - for fld, v in (('eye_m', 2010.0), ('rmax_km', 41), ('lon', 11.001), ('lat', 47.001)): - ridge.P = dict(base, **{fld: v}); assert ridge.rays_key(False) != k0[0], ('rays key ignores', fld) - ridge.P = dict(base, lat=47.0, lon=13.5); assert ridge.mosaic_key(ridge.P) != k0[2], 'mosaic key ignores the tile list' - ridge.P = dict(base); old = ridge.KREF; ridge.KREF = 0.2 - try: assert ridge.rays_key(False) != k0[0], 'rays key ignores the refraction constant' - finally: ridge.KREF = old - old = ridge.DETAIL; ridge.DETAIL = dict(old, amp_m=30.0) - try: assert ridge.rays_key(True) != k0[1] and ridge.rays_key(False) == k0[0], 'detail key ignores the noise settings (or the plain key follows them)' - finally: ridge.DETAIL = old - finally: ridge.P = saved -def test_paths_come_from_the_environment_with_no_default(): - """Importing the baker without RIDGE_WORK / RIDGE_TILES fails with a message naming the variable (no location is assumed).""" - import subprocess; env = {k: v for k, v in os.environ.items() if not k.startswith('RIDGE_')} - for var in ('RIDGE_WORK', 'RIDGE_TILES'): - e = dict(env); e.update({'RIDGE_WORK': '.', 'RIDGE_TILES': '.'}); del e[var] - r = subprocess.run([sys.executable, '-I', '-c', 'import sys; sys.path.insert(0, %r); import ridge' % SRC], env=e, capture_output=True, text=True); assert r.returncode and var in r.stderr and 'not set' in r.stderr, (var, r.stderr[-200:]) - -# ---------------------------------------------------------------------------------------- synthetic bakes: the shared steps of export.bake_place on rays the fixtures make -def _bake(hfun, splits_km, sigma=0.0): - """prefilter, set_view, coverage, seams, cards on synthetic rays (window = columns 0..WIN, i.e. azimuth 0..72): the dict bake_place returns.""" - A, Hh = rays(hfun); ridge.P.update(win0=0, eye_m=EYE); a, h = ridge.prefilter(D, Hh, sigma); v = ridge.set_view(a.max(0)) - nrm = tuple(ridge.win(x) for x in ridge.normals(D, h)); aw, hw = ridge.win(a), ridge.win(h); cov = ridge.coverage(D, aw); sm = ridge.seams(cov, [k * 1000.0 for k in splits_km], D) - place = dict(id='synthetic', name='Synthetic', lat=48.0, lon=16.0, altitude_km=0.05, eye_m=EYE) - view = dict(look_az_deg=36.0, plane_h=H, px_per_deg_h=ridge.HPX_DEG, px_per_deg_v=v['px_per_deg'], exaggeration=v['exaggeration'], horizon_row=v['horizon_row'], sky_row=v['sky_row'] * H, near_row=v['near_row'] * H) - meta = dict(curvature=dict(r_earth_m=ridge.R_EARTH, k_ref=ridge.KREF), encoding=dict(log_d_min=math.log(D[0]), log_d_max=math.log(D[-1])), camera=dict(r_m=export.CAMERA_R_M, heading_max_deg=17.0)) - return dict(place=place, view=view, meta=meta, cards=ridge.cards(D, aw, hw, sm, nrm, ), splits_km=list(splits_km), seams=sm, cov=cov, opaque=ridge.opaque(aw), edges=ridge.log_edges(D), a=aw, h=hw, v=v) -def _canvas(card, key='alpha'): - out = np.zeros((H, WIN) + card[key].shape[2:], np.float32); out[card['top']:card['top'] + card[key].shape[0]] = card[key]; return out -def _row(deg): return int(np.argmin(np.abs(ridge.rowang - deg))) -THREE = terrain(block(0, 359.99, 3000, 3600, 350), block(0, 359.99, 20000, 21500, 1800), block(0, 359.99, 70000, 72000, 7000)) # ridges at 3, 20 and 70 km, each taller in angle than the one before -WIDE3 = terrain(block(0, 359.99, 9000, 10000, 300), block(0, 359.99, 38000, 40000, 2000), block(0, 359.99, 70000, 72000, 3000)) # low near hills, then ridges at 39 and 71 km: the frame reaches below the ground at the seams (so cards have wall rows) and the horizon is inside it -WALLED = terrain(block(0, 359.99, 9000, 10000, 300), block(0, 359.99, 38000, 40000, 2000)) -NEARHILL = terrain(block(0, 359.99, 0, 4000, 150), block(0, 359.99, 38000, 40000, 2000)) # ground above the eye from the first sample on: every row of card 0 lies below its first sample -def _ramp(dk, az): return np.maximum(GROUND, np.where(dk > 12000, (dk - 12000) * 0.045 + 50.0, 0.0)) # a slope the first sample of card 1 stands on: n_up about 0.9, so the material would be rock if the face counted - -def test_seams_fall_in_depth_gaps(): - """Three ridges at 3, 20 and 70 km: targets [6, 40] give a seam in (3, 20) and one in (20, 70) in EVERY column, ordered with at least 0.4 nat between; targets [6] give one seam in (3, 20).""" - b = _bake(THREE, [6, 40]); s = b['seams']; assert s.shape == (2, WIN) - assert (s[0] > 3600).all() and (s[0] < 20000).all() and (s[1] > 21500).all() and (s[1] < 70000).all(), (s.min(1), s.max(1)); assert (np.log(s[1]) - np.log(s[0]) >= 0.4 - 1e-9).all() - s1 = _bake(THREE, [6])['seams']; assert s1.shape == (1, WIN) and (s1[0] > 3600).all() and (s1[0] < 20000).all(), (s1.min(), s1.max()) -def _recede(d0, d1, thick=300.0, hgt=1500.0): - """A ridge `thick` m thick whose distance runs from d0 m at azimuth 0 to d1 m at azimuth 72.""" - return terrain(lambda dk, az: np.where((az <= 72) & (np.abs(dk - (d0 + (d1 - d0) * np.clip(az / 72.0, 0, 1))) < thick / 2), hgt, 0.0)) -def _receding(dk, az): return _recede(4000.0, 15000.0)(dk, az) -def test_the_swept_rows_term_keeps_the_seam_from_hopping_under_a_stronger_pull(): - """With the authored depth pulling harder (0.1 instead of 0.02) the 4 to 15 km ridge's seam still follows the ridge: only the cost of the visible rows it would sweep holds it back (with that term out of the cost it hops between two columns).""" - old = ridge.SEAM_PRIOR; ridge.SEAM_PRIOR = 0.1 - try: j0, j1, cover = _alpha_jumps(4, 15, 6) - finally: ridge.SEAM_PRIOR = old - assert j0 < 0.35 and j1 < 0.35 and cover > 0.999, ('the seam hopped across the ridge', j0, j1) -RECEDING = [(4, 15, 6), (3, 12, 6), (5, 30, 12), (8, 40, 15), (4, 15, 10), (6, 14, 9)] # km at azimuth 0, km at azimuth 72, authored split km -def _alpha_jumps(d0, d1, split): - """The two cards' alpha on the ridge body (crest + 4 rows), column to column: the largest step of each. """ - b = _bake(_recede(d0 * 1000.0, d1 * 1000.0), [split]); c0 = _canvas(b['cards'][0]); c1 = _canvas(b['cards'][1]); crest = np.argmax(b['opaque'] > 0.5, axis=0); r = np.clip(crest + 4, 0, H - 1); ok = crest > 0 - a0 = c0[r, np.arange(WIN)]; a1 = c1[r, np.arange(WIN)]; return float(np.abs(np.diff(a0[ok])).max()), float(np.abs(np.diff(a1[ok])).max()), (a0 + (1 - a0) * a1)[ok].min() -def test_seam_never_splits_a_receding_ridge_side_by_side(): - """Six synthetic ridges whose distance recedes across the window (4 to 15, 3 to 12, 5 to 30, 8 to 40, 4 to 15 and 6 to 14 km, targets 6, 6, 12, 15, 10, 9 km): the nearer and the farther card's alpha on the ridge's body never jumps by 0.35 between neighbouring - columns (a tear: one card here, the other next door; fading slowly over the cross-fade is fine) and the two cards together cover the body. With the swept-rows term out of the seam cost the seam hops across the ridge; with the prior at 0.1 it hops on two of the six.""" - for d0, d1, sp in RECEDING: - j0, j1, cover = _alpha_jumps(d0, d1, sp); assert j0 < 0.35 and j1 < 0.35, ('a card appears or vanishes between neighbouring columns', (d0, d1, sp), j0, j1); assert cover > 0.999, ('the ridge body is not covered by the two cards together', (d0, d1, sp)) -def test_far_card_keeps_terrain_hidden_behind_a_nearer_ridge(): - """Layered depth: a far ridge (20 km) lower in angle than the near ridge (3 km) in azimuth 0..36 and higher in 36..72. Where the near card is opaque in front of the far ridge (columns 100..500) the mid card still holds that ridge, at its distance; - where the far ridge shows above the near one (column 900) the near card is empty and the mid card holds it.""" - b = _bake(terrain(block(0, 359.99, 3000, 3600, 350), block(0, 36, 20000, 21500, 1500), block(36, 359.99, 20000, 21500, 2400)), [6]); c0, c1 = _canvas(b['cards'][0]), b['cards'][1]; a1 = _canvas(c1); ld1 = _canvas(c1, 'logd'); r = _row(theta(1500, 20000) - 0.2) - for x in (100, 300, 500): - assert c0[r, x] > 0.99, ('the near ridge does not cover the far one here', x); assert a1[r, x] > 0.99, ('the far card lost the terrain behind the near ridge', x); assert abs(math.exp(ld1[r, x]) - 20000) < 1500, (x, math.exp(ld1[r, x])) - r = _row(0.5 * (theta(350, 3000) + theta(2400, 20000))); assert c0[r, 900] < 0.01 and a1[r, 900] > 0.99 and abs(math.exp(ld1[r, 900]) - 20000) < 1500, (c0[r, 900], a1[r, 900]) -def test_crossfade_is_complementary(): - """A ridge across the seam (seam fixed at 6 km, the ridge's front face at 5.9 km inside the cross-fade): the nearer card is partly transparent over the window, the farther card is opaque on the ridge, and the composite stays at coverage 1 below the crest.""" - A, Hh = rays(terrain(block(0, 359.99, 5900, 6100, 900))); ridge.P.update(win0=0, eye_m=EYE); ridge.set_view(A.max(0)); aw, hw = ridge.win(A), ridge.win(Hh) - cs = ridge.cards(D, aw, hw, np.full((1, WIN), 6000.0)); c0, c1 = _canvas(cs[0]), _canvas(cs[1]); crest = int(np.argmax(ridge.opaque(aw)[:, 500] > 0.5)); r = crest + 6 - assert 0.2 < c0[r, 500] < 0.8, ('the near card does not fade over the window', c0[r, 500]); assert c1[r, 500] > 0.99, 'the far card is not opaque on the ridge' - comp = 1 - (1 - c0) * (1 - c1); assert (comp[crest + 3:, :] > 0.999).all(), 'the composite dips below coverage 1 under the crest' -def test_normals_of_a_tilted_plane(): - """A plane with front slope s (north) and lateral slope l (east), seen towards azimuth 0: n = (-E s, -E l, 1) normalised, E the authored exaggeration (a dropped E fails).""" - s, l, E = 0.12, -0.08, 3.0; saved = ridge.PXDEG_V; ridge.PXDEG_V = E * ridge.HPX_DEG - try: - az = (np.arange(W) + 0.5) / W * 2 * math.pi; h = 300.0 + s * D[:, None] * np.cos(az)[None, :] + l * D[:, None] * np.sin(az)[None, :]; nr, nt, nu = ridge.normals(D, h); k = len(D) // 2; x = [0, 1, 2, W - 2, W - 1] - want = np.array([-E * s, -E * l, 1.0]); want /= np.linalg.norm(want); got = np.array([nr[k, x].mean(), nt[k, x].mean(), nu[k, x].mean()]); assert np.abs(got - want).max() < 2e-3, (got, want) - assert np.abs(nr ** 2 + nt ** 2 + nu ** 2 - 1).max() < 1e-9 - finally: ridge.PXDEG_V = saved -def test_lateral_slope_uses_equal_distance_not_equal_row(): - """A plane with lateral slope l at 20 km, a 3 km ridge only for azimuth above 40 deg: at the 20 km samples, in the columns around the ridge's azimuth edge, the across-ray slope is the plane's own l (neighbouring columns at the same distance), not a step between the ridge and the plane.""" - l = 0.05; saved = ridge.PXDEG_V; ridge.PXDEG_V = 2.0 * ridge.HPX_DEG - try: - az = (np.arange(W) + 0.5) / W * 360.0; A, Hh = rays(lambda dk, a: np.where(dk > 10000, GROUND + l * dk * np.radians(a), GROUND) + np.where((a > 40) & (dk >= 3000) & (dk < 3600), 400.0, 0.0)) - nr, nt, nu = ridge.normals(D, Hh); k = int(np.searchsorted(D, 20000)); x0 = int(40 / 360 * W); want = -2.0 * l / math.sqrt(1 + 4 * l * l + (2.0 * 0.0) ** 2) - assert np.abs(nt[k, x0 - 20:x0 + 20] / nu[k, x0 - 20:x0 + 20] + 2.0 * l).max() < 5e-3, nt[k, x0 - 5:x0 + 5] / nu[k, x0 - 5:x0 + 5] - finally: ridge.PXDEG_V = saved -def test_prefilter_flattens_roofs_and_keeps_hills(): - """A 25 m bump 60 m wide at 2 km drops below 5 m; a 400 m hill (3 km scale) keeps at least 90% of its height.""" - ridge.P.update(eye_m=EYE); roof = lambda dk, az: GROUND + np.where((az < 1.72) & (dk >= 2000) & (dk < 2060), 25.0, 0.0) - hill = lambda dk, az: GROUND + 400.0 * np.exp(-((dk - 10000.0) / 3000.0) ** 2 - ((np.radians(((az + 180) % 360) - 180) * dk) / 3000.0) ** 2) - for f, name in ((roof, 'roof'), (hill, 'hill')): - A, Hh = rays(f); a, h = ridge.prefilter(D, Hh, 100.0); k = int(np.argmin(np.abs(D - (2030 if name == 'roof' else 10000)))); x = int(np.argmax(Hh[k])) - if name == 'roof': assert h[k, x] - GROUND < 5.0 and Hh[k, x] - GROUND >= 24.9, ('the roof survives the low-pass', h[k, x] - GROUND) - else: assert h[k, x] - GROUND >= 0.9 * 400.0, ('the hill is flattened', h[k, x] - GROUND) - assert np.allclose(ridge.prefilter(D, Hh, 0.0)[1], Hh), 'sigma 0 changed the heights' -def test_crest_rows_have_fractional_coverage(): - """The top row of a card's run has alpha equal to the share of its angular span under the running maximum, and the rows below it are 1 (a lower ridge in columns 0..640 so its crest is not at the frame's top edge).""" - A, Hh = rays(terrain(block(0, 36, 5000, 5600, 500), block(36, 359.99, 5000, 5600, 560))); ridge.P.update(win0=0, eye_m=EYE); ridge.set_view(A.max(0)); aw, hw = ridge.win(A), ridge.win(Hh); c = ridge.cards(D, aw, hw, np.zeros((0, WIN)))[0] - cv = _canvas(c)[:, 300]; r = int(np.argmax(cv > 0)); top = float(aw.max(0)[300]); p = 1.0 / ridge.PXDEG_V; want = (top - (ridge.rowang[r] - 0.5 * p)) / p - assert 0.0 < want < 1.0 and abs(cv[r] - want) < 0.01, (cv[r], want, r); assert (cv[r + 1:] > 0.999).all() -def test_cards_composite_to_the_opaque_view(): - """Alpha-over of all cards, last to first, equals the opaque march coverage within 0.02 everywhere, and where opaque the nearest solid card's distance is the first-hit distance of the march.""" - for hf, sp in ((THREE, [6, 40]), (terrain(_receding), [6]), (terrain(block(0, 359.99, 3000, 3600, 350), block(0, 36, 20000, 21500, 700), block(36, 359.99, 20000, 21500, 1800)), [6])): - b = _bake(hf, sp); comp = 1 - np.prod([1 - _canvas(c) for c in b['cards']], axis=0); assert np.abs(comp - b['opaque']).max() < 0.02, np.abs(comp - b['opaque']).max() - rm = np.maximum.accumulate(b['a'], axis=0); col = 640; r = _row(float(b['a'][:, col].max()) - 0.5); k = int(np.searchsorted(rm[:, col], ridge.rowang[r], 'left')); first = None - for c in b['cards']: - if _canvas(c)[r, col] > 0.99: first = math.exp(_canvas(c, 'logd')[r, col]); break - assert first is not None and abs(first - D[k]) < 0.1 * D[k] + 60, (first, D[k]) - -# ---------------------------------------------------------------------------------------- the real thing: Vienna -def _vienna(splits): - saved = ridge.P - try: - p = ridge.configure(dict(ridge.load_preset('vienna'), card_split_km=splits)); d, _, Hh, _ = ridge.stage0(False); a, h = ridge.prefilter(d, Hh, p['prefilter_m']); ridge.set_view(a.max(0)); aw = ridge.win(a); hw = ridge.win(h) - nrm = tuple(ridge.win(x) for x in ridge.normals(d, h)); cov = ridge.coverage(d, aw); sm = ridge.seams(cov, [k * 1000.0 for k in splits], d); return d, aw, ridge.cards(d, aw, hw, sm, nrm), sm, ridge.opaque(aw) - finally: ridge.P = saved -def test_vienna_k1_k2_k3(): - """Vienna with card_split_km [6], [6, 40] and [6, 20, 40]: 2, 3 and 4 cards, seams ordered in every column, each composite equals the opaque view within 0.02; the cross-fade column count of each K is printed.""" - for sp in ([6], [6, 40], [6, 20, 40]): - d, aw, cs, sm, op = _vienna(sp); assert len(cs) == len(sp) + 1 and sm.shape == (len(sp), WIN) - if len(sp) > 1: assert (np.diff(np.log(sm), axis=0) >= 0.4 - 1e-9).all(), 'seams out of order' - comp = 1 - np.prod([1 - _canvas(c) for c in cs], axis=0); assert np.abs(comp - op).max() < 0.02, (sp, np.abs(comp - op).max()) - xf = int(np.any([((0.02 < _canvas(c)) & (_canvas(c) < 0.98)).sum(0) > 3 for c in cs], axis=0).sum()) - print(f' K={len(sp)} splits {sp}: {len(cs)} cards, bands {[(c["top"], c["alpha"].shape[0]) for c in cs]}, seam medians km {[round(float(np.median(s)) / 1000, 1) for s in sm]}, cross-fade columns {xf} of {WIN}') -def test_bake_place_manifest_fields_on_vienna(): - """bake_place on the real Vienna preset: three cards, the place carries the ground (km) and the eye, horizon_row is the row where the elevation angle is 0, px_per_deg_h is the ring's; write_bake of its packed cards validates, index default 'vienna', and no temp dir is left.""" - saved = ridge.P - load = ridge.load_preset; ridge.load_preset = lambda pid, *a: dict(load(pid, *a), camera_r_m=123.0) # a preset's camera_r_m is the bake's camera - try: b = export.bake_place('vienna'); P = ridge.P; rowang = ridge.rowang; pxv = ridge.PXDEG_V - finally: ridge.P = saved; ridge.load_preset = load - assert b['meta']['camera'] == dict(r_m=123.0, heading_max_deg=export.HEADING_MAX_DEG), b['meta']['camera'] - pl, view = b['place'], b['view']; assert abs(pl['altitude_km'] * 1000 - P['ground_m']) < 1e-6 and abs(pl['eye_m'] - P['eye_m']) < 1e-9 and pl['id'] == 'vienna' and len(b['cards']) == 3 - assert 0 < view['sky_row'] < view['horizon_row'] < view['near_row'] < H and abs(rowang[int(view['horizon_row'])]) <= 1.0 / pxv, (view, rowang[int(view['horizon_row'])]); assert view['px_per_deg_h'] == ridge.HPX_DEG and abs(view['exaggeration'] - pxv / ridge.HPX_DEG) < 1e-9 - d = tempfile.mkdtemp() - try: - dest = export.write_bake(d, pl, view, b['meta'], export.pack(b), b['opaque']); m = json.load(open(dest / 'manifest.json')); export.validate(m, export.SCHEMA['$defs']['manifest']) - assert json.load(open(d + '/index.json'))['default'] == 'vienna' and sorted(os.listdir(d)) == sorted(['index.json', dest.name]), os.listdir(d); print(' vienna manifest bytes', m['bytes'], 'cards', [(c['top'], c['h'], c['colour']['bytes'] + c['geometry']['bytes']) for c in m['cards']]) - finally: shutil.rmtree(d) - -# ---------------------------------------------------------------------------------------- export: manifest v2, budget, cover -def _packed(b=None): - b = b or _bake(WIDE3, [20, 55]); return b, export.pack(b) -def _refuses(out, b, packed, why, **kw): - args = dict(place=b['place'], view=b['view'], meta=b['meta'], cards=packed, opaque=b['opaque']); args.update(kw) - try: export.write_bake(out, **args) - except ValueError: assert not os.path.exists(out), ('a refused bake left files', why) - else: assert False, why -def test_manifest_v2_writer(): - """Two independent bakes give the same bytes and bake_id; the manifest validates (an extra key does not), cards are nearest first with their bands and seam medians, the files are what the manifest says, the index points at the dir, a rebake replaces - the old dir, the committed schema is current, and the Copernicus attribution is the four pinned strings.""" - d = tempfile.mkdtemp() - try: - b, pk = _packed(); b2, pk2 = _packed(_bake(WIDE3, [20, 55])); assert [(c['colour'], c['geometry']) for c in pk] == [(c['colour'], c['geometry']) for c in pk2], 'two independent bakes gave different bytes' - a = export.write_bake(d + '/a', b['place'], b['view'], b['meta'], pk, b['opaque']); assert a.name == 'synthetic-' + export.bake_id([(c['colour'], c['geometry']) for c in pk]); assert sorted(os.listdir(d + '/a')) == sorted(['index.json', a.name]) - m = json.load(open(a / 'manifest.json')); export.validate(m, export.SCHEMA['$defs']['manifest']); assert m['schema'] == 2 and m['baker_version'] == export.BAKER_VERSION and len(m['cards']) == 3 and m['w'] == WIN and m['h'] == H - assert m['camera'] == dict(r_m=export.CAMERA_R_M, heading_max_deg=17.0) and all(c['scale'] == c['distance_m'] / (c['distance_m'] - export.CAMERA_R_M) and c['distance_m'] == c['median_m'] for c in m['cards']), m['camera'] - assert m['cards'][0]['near_m'] is None and m['cards'][-1]['far_m'] is None and m['cards'][0]['far_m'] == m['cards'][1]['near_m'] and m['cards'][0]['median_m'] < m['cards'][1]['median_m'] < m['cards'][2]['median_m'] - for c in m['cards']: - for kind in ('colour', 'geometry'): f = a / c[kind]['file']; assert f.stat().st_size == c[kind]['bytes'] and export.decode(f.read_bytes()).shape[:2] == (c['h'], WIN), c - assert m['bytes'] == sum(c[k]['bytes'] for c in m['cards'] for k in ('colour', 'geometry')) and m['encoding']['normal'] == 'rt8' and m['curvature'] == dict(r_earth_m=ridge.R_EARTH, k_ref=ridge.KREF) - idx = json.load(open(d + '/a/index.json')); export.validate(idx, export.SCHEMA['$defs']['index']); assert idx == dict(schema=1, default='synthetic', places={'synthetic': a.name}) - pk3 = [dict(c) for c in pk]; pk3[1]['geometry'] = pk3[1]['geometry'] + b'x'; assert export.bake_id([(c['colour'], c['geometry']) for c in pk3]) != export.bake_id([(c['colour'], c['geometry']) for c in pk]), 'a changed byte kept the bake_id' - import hashlib; want = hashlib.sha256(b''.join(c['colour'] + c['geometry'] for c in pk)).hexdigest()[:12]; assert export.bake_id([(c['colour'], c['geometry']) for c in pk]) == want, 'bake_id is not the sha256 of the card files, colour then geometry, in index order' - assert export.bake_id([(c['geometry'], c['colour']) for c in pk]) != want and export.bake_id([(c['colour'], c['geometry']) for c in pk[::-1]]) != want, 'bake_id ignores the file order' - bad = json.loads(json.dumps(m)); bad['cards'][0]['extra'] = 1 - try: export.validate(bad, export.SCHEMA['$defs']['manifest']) - except ValueError: pass - else: assert False, 'an extra key passed the schema' - assert json.load(open(os.path.join(SRC, 'ridge-bake.schema.json'))) == json.loads(json.dumps(export.SCHEMA)), 'ridge-bake.schema.json is stale (export.py --write-schema)' - want = dict(credit_line='Contains modified Copernicus data: DEM © DLR e.V. 2010-2014 and © Airbus Defence and Space GmbH 2014-2018 provided under COPERNICUS by the European Union and ESA; all rights reserved.', - licence='Copernicus DEM licence: free, full and open access, with the credit line shown', dem_source='Copernicus DEM GLO-30 (30 m)', url='https://spacedata.copernicus.eu/collections/copernicus-digital-elevation-model') - assert m['attribution'] == want, m['attribution'] - c = export.write_bake(d + '/a', b['place'], b['view'], b['meta'], pk, b['opaque']) - assert c.name == a.name; other = dict(b['place'], id='other'); export.write_bake(d + '/a', other, b['view'], b['meta'], pk, b['opaque']); assert json.load(open(d + '/a/index.json'))['default'] == 'synthetic' - export.write_bake(d + '/a', other, b['view'], b['meta'], pk, b['opaque'], default='other'); assert json.load(open(d + '/a/index.json'))['default'] == 'other' - idx = json.load(open(d + '/a/index.json')); idx['default'] = 'gone'; open(d + '/a/index.json', 'w').write(json.dumps(idx)); export.write_bake(d + '/a', other, b['view'], b['meta'], pk, b['opaque']); assert json.load(open(d + '/a/index.json'))['default'] == 'other' - finally: shutil.rmtree(d) -def test_cover_and_size_refusals_write_nothing(): - """write_bake measures the files it is handed: a card with a hole (alpha zeroed in a band of columns) fails the cover check, a card leaving the frame, cards of two widths and a colour/geometry size mismatch are refused, and nothing is written.""" - d = tempfile.mkdtemp() - try: - b, pk = _packed(); c1 = b['cards'][1]; hole = c1['alpha'].copy(); hole[:, 200:260] = 0 - holed = [dict(c) for c in pk]; holed[1]['colour'] = export.encode_colour(c1['albedo'], hole); holed[2] = dict(pk[2], colour=export.encode_colour(b['cards'][2]['albedo'], b['cards'][2]['alpha'] * 0)); _refuses(d + '/hole', b, holed, 'a bake whose cards leave a hole was written') - _refuses(d + '/off', b, [dict(c, top=H - 5) if i == 0 else c for i, c in enumerate(pk)], 'a card leaving the frame was written') - narrow = [dict(c) for c in pk]; narrow[0]['colour'] = export.encode_colour(b['cards'][0]['albedo'][:, :1000], b['cards'][0]['alpha'][:, :1000]); _refuses(d + '/wide', b, narrow, 'cards of two widths were written') - _refuses(d + '/rows', b, pk, 'view plane_h disagreeing with the opaque view was written', view=dict(b['view'], plane_h=H + 1)) - finally: shutil.rmtree(d) -def _flat_card(top, h, w=WIN, seed=0, noise=False): - rng = np.random.default_rng(seed); alpha = np.ones((h, w), np.float32); rgb = rng.random((h, w, 3)).astype(np.float32) if noise else np.full((h, w, 3), 0.5, np.float32); geo = rng.random((h, w)).astype(np.float32) if noise else np.full((h, w), 0.5, np.float32) - enc = dict(log_d_min=0.0, log_d_max=1.0); return dict(top=top, colour=export.encode_colour(rgb, alpha), geometry=export.encode_geometry(geo, geo, geo, enc), near_m=None, far_m=None, median_m=1.0, distance_m=1.0, scale=1.0) -def test_card_cap_refusals(): - """A preset with 6 splits, or splits not increasing, is refused by load_preset before any march; write_bake refuses 4 full-frame 1280x600 cards (24.6 MB decoded) and writes nothing; 6 cards whose bands fit the budget are written; the card count and bytes are capped.""" - d = tempfile.mkdtemp() - try: - for bad in ([5, 10, 20, 30, 40, 50], [6, 6], [6, 5], []): - p = os.path.join(d, 'p.json'); json.dump(dict(presets=[dict(id='x', card_split_km=bad)]), open(p, 'w')) - try: ridge.load_preset('x', p) - except ValueError: pass - else: assert False, ('a preset with splits', bad, 'was accepted') - json.dump(dict(presets=[dict(id='x')]), open(os.path.join(d, 'q.json'), 'w')) - try: ridge.load_preset('x', os.path.join(d, 'q.json')) - except ValueError: pass - else: assert False, 'a preset without card_split_km was defaulted' - json.dump(dict(presets=[dict(id='x', card_split_km=[1, 2, 3, 4, 5])]), open(os.path.join(d, 'r.json'), 'w')); assert ridge.load_preset('x', os.path.join(d, 'r.json'))['card_split_km'] == [1, 2, 3, 4, 5] - place = dict(id='synthetic', name='S', lat=0.0, lon=0.0, altitude_km=0.0, eye_m=1.0); meta = dict(curvature=dict(r_earth_m=1.0, k_ref=0.1), encoding=dict(log_d_min=0.0, log_d_max=1.0), camera=dict(r_m=0.0, heading_max_deg=1.0)); view = dict(look_az_deg=0.0, plane_h=H, px_per_deg_h=1.0, px_per_deg_v=1.0, exaggeration=1.0, horizon_row=1.0, sky_row=1.0, near_row=1.0) - full = np.ones((H, WIN)) - _refuses(d + '/four', dict(place=place, view=view, meta=meta, opaque=full), [_flat_card(0, H) for _ in range(4)], 'four full-frame cards (24.6 MB decoded) were written') - ok = [_flat_card(0, H)] + [_flat_card(0, 150, seed=i) for i in range(1, 6)]; dest = export.write_bake(d + '/six', place, view, meta, ok, full); assert len(json.load(open(dest / 'manifest.json'))['cards']) == 6 - try: export.check_budget([1000] * 7, WIN, [10] * 7) - except ValueError as e: assert 'above 6' in str(e) - else: assert False, '7 cards were accepted' - try: export.check_budget([750_001, 750_000], WIN, [10, 10]) - except ValueError as e: assert 'bytes' in str(e) - else: assert False, 'cards above TOTAL_BYTES_MAX were accepted' - export.check_budget([750_000, 750_000], WIN, [10, 10]) - try: export.check_budget([1, 1], export.PLANE_W_MAX + 1, [10, 10]) - except ValueError: pass - else: assert False, 'a card wider than the cap was accepted' - finally: shutil.rmtree(d) -def test_cards_are_cropped_to_their_band(): - """Each card is exactly the rows where its 8-bit alpha is non-zero; the manifest top and h place it back at the same rows (colour and geometry decode to that band, alpha in the file equals the canvas row for row).""" - d = tempfile.mkdtemp() - try: - b, pk = _packed(); dest = export.write_bake(d, b['place'], b['view'], b['meta'], pk, b['opaque']); m = json.load(open(dest / 'manifest.json')) - for c, rec in zip(b['cards'], m['cards']): - canvas = _canvas(c); rows = np.flatnonzero(np.rint(canvas * 255).max(1) > 0); assert rec['top'] == rows[0] and rec['h'] == rows[-1] - rows[0] + 1 == c['alpha'].shape[0], (rec, rows[0], rows[-1]) - col = export.decode((dest / rec['colour']['file']).read_bytes()); assert col.shape[:2] == (rec['h'], WIN) and np.abs(col[..., 3].astype(int) - np.rint(c['alpha'] * 255)).max() == 0, 'the written alpha is not the card alpha' - assert export.decode((dest / rec['geometry']['file']).read_bytes()).shape[:2] == (rec['h'], WIN) - finally: shutil.rmtree(d) - -def test_an_empty_card_is_refused_before_writing_naming_the_split(): - """A card with no rows (its splits leave it no terrain) stops pack with a message that names the splits, instead of dying inside the codec.""" - b = _bake(THREE, [6, 40]); b['cards'][1] = dict(top=0, alpha=np.zeros((0, WIN), np.float32), albedo=np.zeros((0, WIN, 3), np.float32), n_r=np.zeros((0, WIN), np.float32), n_t=np.zeros((0, WIN), np.float32), logd=np.zeros((0, WIN), np.float32), wall=np.zeros((0, WIN), bool)) - try: export.pack(b) - except ValueError as e: assert 'card 1 is empty' in str(e) and '6 km' in str(e) and '40 km' in str(e), str(e) - else: assert False, 'an empty card was packed' - b['cards'][2] = b['cards'][1] - try: export.pack(dict(b, cards=[b['cards'][0], _bake(THREE, [6, 40])['cards'][1], b['cards'][1]])) - except ValueError as e: assert 'card 2 is empty' in str(e) and '40 km' in str(e), str(e) - else: assert False, 'an empty last card was packed' - -# ---------------------------------------------------------------------------------------- the written files are the cards -def test_written_cards_decode_to_the_cards_in_memory(): - """Vienna's three cards, written and decoded again: alpha exactly, albedo within the lossy codec (and straight, not premultiplied, at partial alpha), the normal channels in their order (R along the ray, G across it), and the log-distance over the encoding range, within quantisation.""" - saved = ridge.P - try: b = export.bake_place('vienna') - finally: ridge.P = saved - d = tempfile.mkdtemp() - try: - dest = export.write_bake(d, b['place'], b['view'], b['meta'], export.pack(b), b['opaque']); m = json.load(open(dest / 'manifest.json')); enc = m['encoding']; span = enc['log_d_max'] - enc['log_d_min']; partial_seen = 0 - for c, rec in zip(b['cards'], m['cards']): - col = export.decode((dest / rec['colour']['file']).read_bytes()); geo = export.decode((dest / rec['geometry']['file']).read_bytes()); al = c['alpha']; wall = c['wall']; solid = (al > 0) & ~wall; part = (al > 0.05) & (al < 0.95) & ~wall; partial_seen += int(part.sum()) - assert (col[..., 3] == np.rint(al * 255)).all(), 'alpha is not exact'; e = np.abs(col[..., :3] / 255.0 - c['albedo']).max(-1) - assert e[solid].mean() < 0.02 and np.percentile(e[solid], 99) < 0.08, ('albedo is off', e[solid].mean(), np.percentile(e[solid], 99)); assert part.sum() == 0 or e[part].mean() < 0.1, ('albedo at partial alpha is off: premultiplied?', e[part].mean()) - assert (geo[..., 3] == 255).all(); q = 1.0 / 255 + 1e-6; assert (((geo[..., 0] == 255) & (geo[..., 1] == 255)) == wall).all(), 'the wall code is not R = G = 255 on exactly the wall pixels' - assert np.abs(geo[..., 0] / 255.0 * 2 - 1 - c['n_r'])[solid].max() < 2 * q and np.abs(geo[..., 1] / 255.0 * 2 - 1 - c['n_t'])[solid].max() < 2 * q, 'a normal channel is off or swapped' - assert np.abs(enc['log_d_min'] + geo[..., 2] / 255.0 * span - c['logd'])[solid].max() < span * q, 'the log-distance is off or not over the encoding range' - assert np.abs(c['n_r'][solid]).mean() > 0.05 and np.abs(c['n_t'][solid]).mean() > 0.01 and np.abs(c['n_r'][solid].mean() - c['n_t'][solid].mean()) > 0.0, 'the fixture does not tell the channels apart' - assert col[..., :3][solid].mean() > 20, 'albedo is zeroed' - assert partial_seen > 0, 'the fixture has no partial alpha' - finally: shutil.rmtree(d) - -# ---------------------------------------------------------------------------------------- wall rows and the camera -def _first_sample_angle(b, i): - """Per column, the angle of the first sample card i (> 0) reads: the first sample at or beyond its near seam, less the cross-fade half-width.""" - k0 = np.array([np.searchsorted(D, b['seams'][i - 1][x] * math.exp(-ridge.XF)) for x in range(WIN)]); return k0, b['a'][k0, np.arange(WIN)] -def test_wall_rows_flagged(): - """Card i > 0 flags as wall exactly the rows below the angle of its first sample (the extruded face of the ridge it starts at), card 0 none; the wall carries R = G = 255 in the geometry file and no other pixel has r2 + t2 above 1.02; wall pixels keep that sample's - distance and their albedo is the ground material of the sample's height with the face up (so a steep face is not rock), constant down the column.""" - steep = 0 - for make in (lambda: _bake(WALLED, [20]), lambda: _bake(WIDE3, [20, 55]), lambda: _bake(_receding, [6]), lambda: _bake(_ramp, [20])): - b = make(); assert not b['cards'][0]['wall'].any(), 'card 0 has a wall'; lo = ridge.rowang - 0.5 / ridge.PXDEG_V; seen = 0 - for i, c in enumerate(b['cards']): - if i == 0: continue - k0, a0 = _first_sample_angle(b, i); want = (lo[:, None] < a0[None, :])[c['top']:c['top'] + c['alpha'].shape[0]]; assert (c['wall'] == want).all(), ('wall rows are not the rows below the first sample', i, int((c['wall'] != want).sum())); seen += int(want.sum()) - geo = export.decode(export.encode_geometry(c['n_r'], c['n_t'], c['logd'], b['meta']['encoding'], c['wall'])); r, t = geo[..., 0] / 255.0 * 2 - 1, geo[..., 1] / 255.0 * 2 - 1; code = (geo[..., 0] == 255) & (geo[..., 1] == 255) - assert (code == c['wall']).all() and (r[~code] ** 2 + t[~code] ** 2 <= 1.02).all(), 'the wall code is not on exactly the wall pixels, or a real normal reaches it' - for x in np.flatnonzero(c['wall'].any(0)): - rows = np.flatnonzero(c['wall'][:, x]); ld = c['logd'][rows, x]; assert np.ptp(ld) < 1e-5 and abs(math.exp(ld[0]) - D[k0[x]]) < 1e-3 * D[k0[x]] + 60, ('a wall keeps its sample distance', x) - want_alb = ridge.albedo(np.array([b['h'][k0[x], x]]), np.array([1.0]))[0]; assert np.abs(c['albedo'][rows, x] - want_alb).max() < 1e-5, ('wall albedo is not the ground material with the face up', x) - assert seen > 1000, 'the fixture has no wall' - for i in range(1, len(b['cards'])): - c = b['cards'][i]; steep += int((np.sqrt(np.clip(1 - c['n_r'] ** 2 - c['n_t'] ** 2, 0, 1))[c['wall']] < 0.93).sum()) - assert steep > 1000, 'no wall pixel has a steep face under it: a wall lit by its own normal would pass' - b = _bake(NEARHILL, [20]); c0 = b['cards'][0]; lo = ridge.rowang - 0.5 / ridge.PXDEG_V; below = (lo[:, None] < b['a'][0][None, :])[c0['top']:c0['top'] + c0['alpha'].shape[0]] - assert below.sum() > 1000 and not c0['wall'].any(), ('card 0 has no wall, though rows lie below its first sample', int(below.sum())) -def test_the_sheet_lights_a_wall_with_the_face_up(): - """The contact sheet shades a wall pixel as an up-facing one whatever normal the card carries there, and a non-wall pixel by its normal.""" - n = 4; c = dict(albedo=np.ones((n, n, 3), np.float32), alpha=np.ones((n, n), np.float32), n_r=np.full((n, n), 0.9, np.float32), n_t=np.zeros((n, n), np.float32), wall=np.zeros((n, n), bool)); c['wall'][:, :2] = True - rgb, _ = export.lit(c); L = np.array(export.SHEET_LIGHT) / np.linalg.norm(export.SHEET_LIGHT); up = 0.35 + 0.65 * L[2]; tilted = 0.35 + 0.65 * np.clip(0.9 * L[0] + np.sqrt(1 - 0.81) * L[2], 0, 1) - assert np.allclose(rgb[:, :2], up) and np.allclose(rgb[:, 2:], tilted) and abs(up - tilted) > 0.05, (rgb[0, 0], rgb[0, 3]) -def test_camera_contract(): - """scale_i = d_i / (d_i - r) for r = +200 and r = -100 (a function of r, not a constant or a clamp); a card's distance excludes its wall rows; |r| at half the nearest distance is refused; an r that lifts the nearest card off the frame bottom (backward) is - refused and writes nothing; a card shrunk below what a 16:9 viewport needs is refused; one card works.""" - ds = [1000.0, 12000.0, 40000.0] - for r in (200.0, -100.0, 0.0): assert export.card_scales(ds, r) == [d / (d - r) for d in ds], r - assert export.card_scales(ds, 200.0)[0] > 1.2 and export.card_scales(ds, -100.0)[0] < 0.92 and export.card_scales(ds, 0.0) == [1.0, 1.0, 1.0] - for bad in (500.0, -500.0, 800.0): - try: export.card_scales(ds, bad) - except ValueError: pass - else: assert False, ('an offset of', bad, 'was accepted') - export.card_scales(ds, 499.0); export.card_scales(ds, -499.0) - b = _bake(WIDE3, [20, 55]); c1 = b['cards'][1]; solid = c1['alpha'] >= 0.5; c1['wall'] = np.zeros_like(c1['wall']); c1['wall'][:c1['alpha'].shape[0] * 3 // 4] = True; c1['logd'] = np.where(c1['wall'], c1['logd'] + 3.0, c1['logd']) # three quarters of the card is wall, far off the rest - want = float(np.exp(np.median(c1['logd'][solid & ~c1['wall']]))); with_wall = float(np.exp(np.median(c1['logd'][solid]))); assert abs(with_wall - want) > 0.05 * want, ('the fixture cannot tell the median with walls from the one without', with_wall, want) - pk = export.pack(b); assert abs(pk[1]['distance_m'] - want) < 1e-6 * want and pk[1]['median_m'] == pk[1]['distance_m'], ('the distance counted wall rows', pk[1]['distance_m'], want) - assert [p['scale'] for p in pk] == [p['distance_m'] / (p['distance_m'] - export.CAMERA_R_M) for p in pk] - d = tempfile.mkdtemp() - try: - back = dict(b['meta'], camera=dict(r_m=-100.0, heading_max_deg=23.0)); pkb = export.pack(dict(b, meta=back)); assert all(p['scale'] < 1 for p in pkb) - _refuses(d + '/back', b, pkb, 'a backward camera that lifts the nearest card off the frame bottom was written', meta=back) - try: export.pack(dict(b, meta=dict(b['meta'], camera=dict(r_m=0.5 * pk[0]['distance_m'], heading_max_deg=23.0)))) - except ValueError: pass - else: assert False, 'an offset of half the nearest distance was packed' - view = b['view']; tops = [c['top'] for c in b['cards']]; bands = [c['alpha'].shape[0] for c in b['cards']]; export.check_camera([1.0, 1.0, 1.0], tops, bands, view) - try: export.check_camera([1.0, 1.0, 0.8], tops, bands, view) - except ValueError as e: assert '16:9' in str(e), str(e) - else: assert False, 'a card too small for a 16:9 viewport at rest was accepted' - one, pk1 = _packed(_bake(WALLED, [])); assert len(pk1) == 1 and pk1[0]['scale'] == pk1[0]['distance_m'] / (pk1[0]['distance_m'] - export.CAMERA_R_M); dest = export.write_bake(d + '/one', one['place'], one['view'], one['meta'], pk1, one['opaque']) - assert len(json.load(open(dest / 'manifest.json'))['cards']) == 1 - finally: shutil.rmtree(d) - -# ---------------------------------------------------------------------------------------- rules that no other test touched -def test_seams_keep_their_separation(): - """Two authored targets closer than SEAM_SEP (6 and 7 km, 0.15 nat): the seams still sit at least 0.4 nat apart in every column.""" - s = _bake(THREE, [6, 7])['seams']; assert (np.log(s[1]) - np.log(s[0]) >= 0.4 - 1e-9).all(), float((np.log(s[1]) - np.log(s[0])).min()) -def test_elev_is_the_curved_refracted_angle(): - """elev(h, d) = atan2(h - eye - d^2 / 2R x (1 - k), d): at 80 km a 3000 m summit stands 0.3 deg lower than the flat angle, and curvature False gives the flat one.""" - ridge.P.update(eye_m=EYE); d = 80000.0; want = math.degrees(math.atan2(3000.0 - EYE - d * d / (2 * ridge.R_EARTH) * (1 - ridge.KREF), d)); flat = math.degrees(math.atan2(3000.0 - EYE, d)) - assert abs(float(ridge.elev(3000.0, d)) - want) < 1e-9 and abs(float(ridge.elev(3000.0, d, curvature=False)) - flat) < 1e-9 and flat - want > 0.25, (want, flat) - assert ridge.elev(np.array([[1000.0, 1200.0]]), np.array([[d], [d / 2]])).shape == (2, 2) -def test_coverage_counts_every_visible_row_including_the_foreground(): - """Per column the coverage sums to the visible rows of the opaque view: (min(skyline, top) - bottom) x px per degree, the rows below the first sample included once, not twice (a ground just under the eye shows below the first sample).""" - for i, hf in enumerate((terrain(block(0, 359.99, 0, 20000, 91), block(0, 359.99, 20000, 21500, 600)), THREE)): - A, Hh = rays(hf); ridge.P.update(win0=0, eye_m=EYE); ridge.set_view(A.max(0)); aw = ridge.win(A); cov = ridge.coverage(D, aw); want = np.clip(np.minimum(aw.max(0), ridge.TOP_DEG) - ridge.BOTTOM_DEG, 0, None) * ridge.PXDEG_V - assert np.abs(cov.sum(0) - want).max() < 1e-6, np.abs(cov.sum(0) - want).max(); assert cov.shape == (ridge.COV_BINS, WIN) - if i == 0: assert (cov[0] > 100).all(), ('no foreground rows in the first bin', float(cov[0].min())) -def test_cards_interpolate_between_samples_and_renormalise(): - """On a ramp face every card pixel sits between two samples: its log-distance lies strictly between theirs (not on the nearer sample), and its normal is the normalised blend of theirs by that same fraction (the samples carry alternating normals, so a blend - that is not renormalised, or a hit that is not interpolated, differs).""" - A, Hh = rays(terrain(lambda dk, az: np.where(dk >= 4000, GROUND + 0.5 * (dk - 4000), 0.0) + 0 * az)); ridge.P.update(win0=0, eye_m=EYE); ridge.set_view(A.max(0)); aw, hw = ridge.win(A), ridge.win(Hh); k = np.arange(len(D))[:, None] - nr = np.broadcast_to(np.where(k % 2 == 0, -0.8, 0.8), aw.shape).astype(float); nt = np.broadcast_to(np.where(k % 3 == 0, 0.3, -0.3), aw.shape).astype(float); nu = np.sqrt(1 - nr ** 2 - nt ** 2) * 0 + 0.5 - c = ridge.cards(D, aw, hw, np.zeros((0, WIN)), nrm=(nr, nt, nu))[0]; x = 300; sel = np.flatnonzero(c['alpha'][:, x] > 0.999); ld = c['logd'][sel, x].astype(np.float64); L = np.log(D); kk = np.searchsorted(L, ld, 'left'); kp = kk - 1; ok = kp >= 0 - t = (ld - L[np.maximum(kp, 0)]) / (L[kk] - L[np.maximum(kp, 0)]); inner = ok & (t > 0.02) & (t < 0.98); assert inner.sum() > 0.3 * len(sel), ('hits sit on samples, not between them', int(inner.sum()), len(sel)) - mix = lambda arr: arr[np.maximum(kp, 0), x] + t * (arr[kk, x] - arr[np.maximum(kp, 0), x]); m = np.sqrt(mix(nr) ** 2 + mix(nt) ** 2 + mix(nu) ** 2); er = np.abs(c['n_r'][sel, x] - mix(nr) / m)[inner]; et = np.abs(c['n_t'][sel, x] - mix(nt) / m)[inner] - assert er.max() < 1e-3 and et.max() < 1e-3, ('the normal is not the normalised blend of the two samples', er.max(), et.max()) - -TESTS = [v for k, v in sorted(globals().items()) if k.startswith("test_")] -if __name__ == '__main__': - fails = 0 - for t in TESTS: - try: t(); print("PASS", t.__name__) - except Exception as e: fails += 1; print("FAIL", t.__name__, "|", repr(e)[:300]) - print("failures:", fails); sys.exit(1 if fails else 0) diff --git a/scripts/ridge-sky/build-night-sky.py b/scripts/ridge-sky/build-night-sky.py deleted file mode 100644 index 984548fd..00000000 --- a/scripts/ridge-sky/build-night-sky.py +++ /dev/null @@ -1,121 +0,0 @@ -"""Pack the night sky's data into src/app/features/scene/ridge/nightSkyData.ts. - -Usage (parse downloads with isolated mode): - python -I scripts/ridge-sky/build-night-sky.py BSC5.DAT.GZ CONSTELLATIONS.LINES.JSON OUT.ts [MAX_MAG] - -Inputs, each in its own directory, never run from inside it: - bsc5.dat.gz Yale Bright Star Catalogue, 5th revised ed. (Hoffleit & Warren 1991), public domain; CDS/VizieR V/50. - CDS was unreachable on 2026-11-20, so the file is the SAO Telescope Data Center's copy of the same - catalogue: http://tdc-www.harvard.edu/catalogs/bsc5.dat.gz (fixed-width, CDS V/50 `catalog` layout). - constellations.lines.json d3-celestial (Olaf Frohn), BSD-3-Clause: - https://github.com/ofrohn/d3-celestial/blob/master/data/constellations.lines.json - GeoJSON MultiLineStrings of [RA, Dec] degrees, J2000. - -Stars (stars cut to Vmag <= MAX_MAG, default 5.5), 6 bytes each: RA uint16 (360 deg / 65536), Dec uint16 ((dec + 90) / 180 * 65535), -Vmag uint8 ((V + 2) * 20), B-V uint8 ((B-V + 0.5) * 50; missing B-V stored as 0.65). Little endian, base64. -Lines: per chain a uint8 vertex count then that many (RA uint16, Dec uint16) pairs, same scaling; chains concatenated; base64. -""" -import base64 -import gzip -import hashlib -import json -import struct -import sys - - -def sha256(path): - h = hashlib.sha256() - with open(path, "rb") as f: - h.update(f.read()) - return h.hexdigest() - - -def ra16(deg): - return int(round((deg % 360.0) / 360.0 * 65536.0)) % 65536 - - -def dec16(deg): - return int(round((deg + 90.0) / 180.0 * 65535.0)) - - -def stars(path, max_mag): - out = [] - for line in gzip.open(path, "rt", encoding="latin-1"): - if len(line) < 114 or not line[75:77].strip(): - continue # entries struck from the catalogue carry no position - try: - ra = (int(line[75:77]) + int(line[77:79]) / 60.0 + float(line[79:83]) / 3600.0) * 15.0 - dec = int(line[84:86]) + int(line[86:88]) / 60.0 + int(line[88:90]) / 3600.0 - dec = -dec if line[83] == "-" else dec - v = float(line[102:107]) - except ValueError: - continue - if v > max_mag: - continue - bv_text = line[109:114].strip() - bv = float(bv_text) if bv_text else 0.65 - out.append((ra, dec, v, bv)) - out.sort(key=lambda s: s[2]) # brightest first: a prefix is the brighter stars - return out - - -def pack_stars(rows): - buf = bytearray() - for ra, dec, v, bv in rows: - vq = min(255, max(0, int(round((v + 2.0) * 20.0)))) - bq = min(255, max(0, int(round((bv + 0.5) * 50.0)))) - buf += struct.pack(" 4 else 5.5 - rows = stars(bsc, max_mag) - star_bytes = pack_stars(rows) - line_bytes, chains = pack_lines(lines) - text = f"""/* eslint-disable */ -// GENERATED by scripts/ridge-sky/build-night-sky.py: do not edit. The night sky's data, J2000. -// Stars: Yale Bright Star Catalogue, 5th revised ed. (Hoffleit & Warren 1991; public domain), Vmag <= {max_mag}, {len(rows)} stars. -// source http://tdc-www.harvard.edu/catalogs/bsc5.dat.gz (copy of CDS/VizieR V/50), sha256 {sha256(bsc)} -// Constellation lines: d3-celestial constellations.lines.json (Olaf Frohn, BSD-3-Clause), {chains} chains. -// source https://github.com/ofrohn/d3-celestial/blob/master/data/constellations.lines.json, sha256 {sha256(lines)} -// Layout: see the generator's docstring. Stars are sorted brightest first. - -export const STAR_COUNT = {len(rows)}; -export const STARS_B64 = ` -{wrap(base64.b64encode(star_bytes).decode())} -`; - -export const LINE_CHAINS = {chains}; -export const LINES_B64 = ` -{wrap(base64.b64encode(line_bytes).decode())} -`; -""" - with open(out, "w", encoding="utf-8", newline="\n") as f: - f.write(text) - print(f"{len(rows)} stars, {chains} chains, {len(star_bytes)} + {len(line_bytes)} bytes") - - -main() diff --git a/scripts/sync-poses.mjs b/scripts/sync-poses.mjs deleted file mode 100644 index 9a5b1f83..00000000 --- a/scripts/sync-poses.mjs +++ /dev/null @@ -1,24 +0,0 @@ -// Copies the pose catalogue and the art it names from the cast-art directory. -// The catalogue is the only list of poses the client knows; the art is not committed. -import { copyFileSync, mkdirSync, readFileSync } from 'node:fs'; -import { dirname, join } from 'node:path'; -import { fileURLToPath } from 'node:url'; - -const src = process.argv[2] ?? '/opt/commons/cast-art/poses'; -const root = join(dirname(fileURLToPath(import.meta.url)), '..'); -const catalogue = JSON.parse(readFileSync(join(src, 'catalogue.json'), 'utf8')); - -copyFileSync( - join(src, 'catalogue.json'), - join(root, 'src/app/components/message/pose/catalogue.json') -); -const files = Object.values(catalogue.minds).flatMap((m) => [ - ...Object.values(m.shared), - ...Object.values(m.signatures), -]); -files.forEach((f) => { - const dest = join(root, 'public/poses', f); - mkdirSync(dirname(dest), { recursive: true }); - copyFileSync(join(src, f), dest); -}); -console.log(`synced catalogue and ${files.length} images from ${src}`); diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx index 8c28b935..2dbaf1f1 100644 --- a/src/app/components/AccountDataEditor.tsx +++ b/src/app/components/AccountDataEditor.tsx @@ -16,7 +16,6 @@ import { } from 'folds'; import { MatrixError } from 'matrix-js-sdk'; import { Cursor } from '../plugins/text-area'; -import { PhoneHit } from '../styles/PhoneHit.css'; import { syntaxErrorPosition } from '../utils/dom'; import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback'; import { Page, PageHeader } from './page'; @@ -295,7 +294,7 @@ export function AccountDataEditor({ - + diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx index 57a18674..068f437b 100644 --- a/src/app/components/BackupRestore.tsx +++ b/src/app/components/BackupRestore.tsx @@ -30,7 +30,6 @@ import { } from '../hooks/useKeyBackup'; import { stopPropagation } from '../utils/keyboard'; import { useRestoreBackupOnVerification } from '../hooks/useRestoreBackupOnVerification'; -import { PhoneHit } from '../styles/PhoneHit.css'; type BackupStatusProps = { enabled: boolean; @@ -178,7 +177,6 @@ export function BackupRestoreTile({ crypto }: BackupRestoreTileProps) { )} Device Verification - + diff --git a/src/app/components/DeviceVerificationSetup.tsx b/src/app/components/DeviceVerificationSetup.tsx index 68f42221..433fa6a1 100644 --- a/src/app/components/DeviceVerificationSetup.tsx +++ b/src/app/components/DeviceVerificationSetup.tsx @@ -25,7 +25,6 @@ import { ActionUIA, ActionUIAFlowsLoader } from './ActionUIA'; import { useMatrixClient } from '../hooks/useMatrixClient'; import { useAlive } from '../hooks/useAlive'; import { UseStateProvider } from './UseStateProvider'; -import { PhoneHit } from '../styles/PhoneHit.css'; type UIACallback = ( authDict: AuthDict | null @@ -302,7 +301,7 @@ export const DeviceVerificationSetup = forwardRef Setup Device Verification - + @@ -337,7 +336,7 @@ export const DeviceVerificationReset = forwardRef Reset Device Verification - + diff --git a/src/app/components/Pdf-viewer/PdfViewer.tsx b/src/app/components/Pdf-viewer/PdfViewer.tsx index d0e5f715..9c7fd980 100644 --- a/src/app/components/Pdf-viewer/PdfViewer.tsx +++ b/src/app/components/Pdf-viewer/PdfViewer.tsx @@ -27,7 +27,6 @@ import { AsyncStatus } from '../../hooks/useAsyncCallback'; import { useZoom } from '../../hooks/useZoom'; import { createPage, usePdfDocumentLoader, usePdfJSLoader } from '../../plugins/pdfjs-dist'; import { stopPropagation } from '../../utils/keyboard'; -import { PhoneHit, PhoneHitSpread24 } from '../../styles/PhoneHit.css'; export type PdfViewerProps = { name: string; @@ -109,7 +108,7 @@ export const PdfViewer = as<'div', PdfViewerProps>(
- + @@ -118,7 +117,6 @@ export const PdfViewer = as<'div', PdfViewerProps>( ( {Math.round(zoom * 100)}% 1 ? 'Success' : 'SurfaceVariant'} outlined={zoom > 1} size="300" diff --git a/src/app/components/ServerConfigsLoader.test.ts b/src/app/components/ServerConfigsLoader.test.ts deleted file mode 100644 index 527895a0..00000000 --- a/src/app/components/ServerConfigsLoader.test.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest'; -import { loadServerConfigs } from './ServerConfigsLoader'; - -const server = (authMetadata: () => Promise) => - ({ - getCapabilities: async () => ({}), - getMediaConfig: async () => ({ 'm.upload.size': 1 }), - getAuthMetadata: authMetadata, - } as unknown as Parameters[0]); - -describe('loadServerConfigs', () => { - afterEach(() => vi.restoreAllMocks()); - - it('logs nothing when the homeserver has no OIDC (no auth metadata came back)', async () => { - const error = vi.spyOn(console, 'error').mockImplementation(() => {}); - const configs = await loadServerConfigs( - server(async () => { - throw new Error('M_UNRECOGNIZED'); - }) - ); - expect(error).not.toHaveBeenCalled(); - expect(configs.authMetadata).toBeUndefined(); - expect(configs.mediaConfig).toEqual({ 'm.upload.size': 1 }); - }); - - it('still logs and drops auth metadata that came back malformed', async () => { - const error = vi.spyOn(console, 'error').mockImplementation(() => {}); - const configs = await loadServerConfigs(server(async () => ({ issuer: 'https://x' }))); - expect(error).toHaveBeenCalled(); - expect(configs.authMetadata).toBeUndefined(); - }); -}); diff --git a/src/app/components/ServerConfigsLoader.tsx b/src/app/components/ServerConfigsLoader.tsx index ea56d8d2..3c8ce8eb 100644 --- a/src/app/components/ServerConfigsLoader.tsx +++ b/src/app/components/ServerConfigsLoader.tsx @@ -1,10 +1,5 @@ import { ReactNode, useCallback, useMemo } from 'react'; -import { - Capabilities, - MatrixClient, - validateAuthMetadata, - ValidatedAuthMetadata, -} from 'matrix-js-sdk'; +import { Capabilities, validateAuthMetadata, ValidatedAuthMetadata } from 'matrix-js-sdk'; import { AsyncStatus, useAsyncCallbackValue } from '../hooks/useAsyncCallback'; import { useMatrixClient } from '../hooks/useMatrixClient'; import { MediaConfig } from '../hooks/useMediaConfig'; @@ -19,42 +14,35 @@ export type ServerConfigs = { type ServerConfigsLoaderProps = { children: (configs: ServerConfigs) => ReactNode; }; -/** - * The homeserver's capabilities, media config and OIDC metadata. A homeserver with no OIDC (and the demo's pretend - * server) returns no auth metadata: there is nothing to validate, so nothing is logged. Metadata that did come back - * and fails validation is logged and dropped. - */ -export async function loadServerConfigs( - mx: Pick -): Promise { - const result = await Promise.allSettled([ - mx.getCapabilities(), - mx.getMediaConfig(), - mx.getAuthMetadata(), - ]); - - const capabilities = promiseFulfilledResult(result[0]); - const mediaConfig = promiseFulfilledResult(result[1]); - const authMetadata = promiseFulfilledResult(result[2]); - let validatedAuthMetadata: ValidatedAuthMetadata | undefined; - - if (authMetadata) { - try { - validatedAuthMetadata = validateAuthMetadata(authMetadata); - } catch (e) { - console.error(e); - } - } - - return { capabilities, mediaConfig, authMetadata: validatedAuthMetadata }; -} - export function ServerConfigsLoader({ children }: ServerConfigsLoaderProps) { const mx = useMatrixClient(); const fallbackConfigs = useMemo(() => ({}), []); const [configsState] = useAsyncCallbackValue( - useCallback(() => loadServerConfigs(mx), [mx]) + useCallback(async () => { + const result = await Promise.allSettled([ + mx.getCapabilities(), + mx.getMediaConfig(), + mx.getAuthMetadata(), + ]); + + const capabilities = promiseFulfilledResult(result[0]); + const mediaConfig = promiseFulfilledResult(result[1]); + const authMetadata = promiseFulfilledResult(result[2]); + let validatedAuthMetadata: ValidatedAuthMetadata | undefined; + + try { + validatedAuthMetadata = validateAuthMetadata(authMetadata); + } catch (e) { + console.error(e); + } + + return { + capabilities, + mediaConfig, + authMetadata: validatedAuthMetadata, + }; + }, [mx]) ); const configs: ServerConfigs = diff --git a/src/app/components/UIAFlowOverlay.tsx b/src/app/components/UIAFlowOverlay.tsx index 49e1d821..a2bdd1b8 100644 --- a/src/app/components/UIAFlowOverlay.tsx +++ b/src/app/components/UIAFlowOverlay.tsx @@ -13,7 +13,6 @@ import { IconButton, } from 'folds'; import FocusTrap from 'focus-trap-react'; -import { PhoneHit } from '../styles/PhoneHit.css'; export type UIAFlowOverlayProps = { currentStep: number; @@ -54,7 +53,6 @@ export function UIAFlowOverlay({ > {(anchorRef) => ( + setOpen(!open)}> + + + }> + + setOpen(false), + clickOutsideDeactivates: true, + escapeDeactivates: stopPropagation, + }} + > + +
+ + + + } + after={ + <> + setToolbar(!toolbar)} + aria-pressed={toolbar} + > + + + + + + + + + + } + bottom={ + toolbar && ( +
+ + +
+ ) + } + /> +
+
+
+
+
+ + ); +} diff --git a/src/app/components/editor/Editor.tsx b/src/app/components/editor/Editor.tsx index b7e6d2fe..bd848dd5 100644 --- a/src/app/components/editor/Editor.tsx +++ b/src/app/components/editor/Editor.tsx @@ -23,9 +23,6 @@ import { RenderElement, RenderLeaf } from './Elements'; import { CustomElement } from './slate'; import * as css from './Editor.css'; import { toggleKeyboardShortcut } from './keyboard'; -import { useSetting } from '../../state/hooks/settings'; -import { settingsAtom } from '../../state/settings'; -import { composerSpellcheckAttributes } from './spellcheck'; const initialValue: CustomElement[] = [ { @@ -93,7 +90,6 @@ export const CustomEditor = forwardRef( }, ref ) => { - const [composerSpellcheck] = useSetting(settingsAtom, 'composerSpellcheck'); const renderElement = useCallback( (props: RenderElementProps) => , [] @@ -150,7 +146,6 @@ export const CustomEditor = forwardRef( onKeyDown={handleKeydown} onKeyUp={onKeyUp} onPaste={onPaste} - {...composerSpellcheckAttributes(composerSpellcheck)} /> {after && ( diff --git a/src/app/components/editor/Toolbar.tsx b/src/app/components/editor/Toolbar.tsx index 3721b909..7d701c42 100644 --- a/src/app/components/editor/Toolbar.tsx +++ b/src/app/components/editor/Toolbar.tsx @@ -36,7 +36,6 @@ import { KeySymbol } from '../../utils/key-symbol'; import { useSetting } from '../../state/hooks/settings'; import { settingsAtom } from '../../state/settings'; import { stopPropagation } from '../../utils/keyboard'; -import { PhoneHit, PhoneHitRoom36, PhoneHitSpread36 } from '../../styles/PhoneHit.css'; function BtnTooltip({ text, shortCode }: { text: string; shortCode?: string }) { return ( @@ -73,7 +72,6 @@ export function MarkButton({ format, icon, tooltip }: MarkButtonProps) { {(triggerRef) => ( {(triggerRef) => ( {(triggerRef) => ( handleMenuSelect(1)} size="400" @@ -182,7 +178,6 @@ export function HeadingBlockButton() { > {(triggerRef) => ( handleMenuSelect(2)} size="400" @@ -198,7 +193,6 @@ export function HeadingBlockButton() { > {(triggerRef) => ( handleMenuSelect(3)} size="400" @@ -214,7 +208,6 @@ export function HeadingBlockButton() { } > {(triggerRef) => ( {(triggerRef) => ( setIsMarkdown(!isMarkdown)} diff --git a/src/app/components/editor/spellcheck.test.ts b/src/app/components/editor/spellcheck.test.ts deleted file mode 100644 index fa0535cb..00000000 --- a/src/app/components/editor/spellcheck.test.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { composerSpellcheckAttributes, defaultComposerSpellcheck } from './spellcheck'; - -const media = (coarse: boolean) => (query: string) => ({ - matches: query === '(pointer: coarse)' && coarse, -}); - -describe('composer spellcheck default', () => { - it('is off when the primary pointer is coarse (phone)', () => { - expect(defaultComposerSpellcheck(media(true))).toBe(false); - }); - it('is on for a fine pointer (desktop)', () => { - expect(defaultComposerSpellcheck(media(false))).toBe(true); - }); - it('is on when matchMedia is unavailable', () => { - expect(defaultComposerSpellcheck(undefined)).toBe(true); - }); -}); - -describe('composer spellcheck attributes', () => { - it('off disables both spellcheck and autocorrect', () => { - expect(composerSpellcheckAttributes(false)).toEqual({ spellCheck: false, autoCorrect: 'off' }); - }); - it('on enables spellcheck and leaves autocorrect to the platform', () => { - expect(composerSpellcheckAttributes(true)).toEqual({ spellCheck: true }); - }); -}); diff --git a/src/app/components/editor/spellcheck.ts b/src/app/components/editor/spellcheck.ts deleted file mode 100644 index 825676ef..00000000 --- a/src/app/components/editor/spellcheck.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** Touch devices (phones) get the keyboard's own dictionary; desktop gets the browser's. */ -export const defaultComposerSpellcheck = ( - matchMedia: ((query: string) => { matches: boolean }) | undefined -): boolean => !matchMedia?.('(pointer: coarse)').matches; - -/** - * Attributes for the composer's editable. Off must also switch autocorrect off: - * spellCheck alone leaves Gboard's suggestion strip and correction modal in place. - */ -export const composerSpellcheckAttributes = (enabled: boolean) => - enabled ? ({ spellCheck: true } as const) : ({ spellCheck: false, autoCorrect: 'off' } as const); diff --git a/src/app/components/emoji-board/components/Sidebar.tsx b/src/app/components/emoji-board/components/Sidebar.tsx index d2d5f197..de22b483 100644 --- a/src/app/components/emoji-board/components/Sidebar.tsx +++ b/src/app/components/emoji-board/components/Sidebar.tsx @@ -14,7 +14,6 @@ import { } from 'folds'; import classNames from 'classnames'; import * as css from './styles.css'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; export function Sidebar({ children }: { children: ReactNode }) { return ( @@ -69,7 +68,6 @@ function SidebarBtn({ > {(ref) => ( ( Seen by - +
diff --git a/src/app/components/image-editor/ImageEditor.tsx b/src/app/components/image-editor/ImageEditor.tsx index 0f072bb0..1ec474e8 100644 --- a/src/app/components/image-editor/ImageEditor.tsx +++ b/src/app/components/image-editor/ImageEditor.tsx @@ -2,7 +2,6 @@ import React from 'react'; import classNames from 'classnames'; import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds'; import * as css from './ImageEditor.css'; -import { PhoneHit } from '../../styles/PhoneHit.css'; export type ImageEditorProps = { name: string; @@ -25,7 +24,7 @@ export const ImageEditor = as<'div', ImageEditorProps>( >
- + diff --git a/src/app/components/image-pack-view/ImagePackView.tsx b/src/app/components/image-pack-view/ImagePackView.tsx index 15b1cd08..ab81d503 100644 --- a/src/app/components/image-pack-view/ImagePackView.tsx +++ b/src/app/components/image-pack-view/ImagePackView.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { Box, IconButton, Text, Icon, Icons, Scroll, Chip } from 'folds'; import { PackAddress } from '../../plugins/custom-emoji'; -import { PhoneHit } from '../../styles/PhoneHit.css'; import { Page, PageHeader, PageContent } from '../page'; import { useMatrixClient } from '../../hooks/useMatrixClient'; import { RoomImagePack } from './RoomImagePack'; @@ -30,7 +29,7 @@ export function ImagePackView({ address, requestClose }: ImagePackViewProps) { - + diff --git a/src/app/components/image-viewer/ImageViewer.tsx b/src/app/components/image-viewer/ImageViewer.tsx index 4d2d7694..4956a7b6 100644 --- a/src/app/components/image-viewer/ImageViewer.tsx +++ b/src/app/components/image-viewer/ImageViewer.tsx @@ -7,7 +7,6 @@ import * as css from './ImageViewer.css'; import { useZoom } from '../../hooks/useZoom'; import { usePan } from '../../hooks/usePan'; import { downloadMedia } from '../../utils/matrix'; -import { PhoneHit, PhoneHitSpread24 } from '../../styles/PhoneHit.css'; export type ImageViewerProps = { alt: string; @@ -34,7 +33,7 @@ export const ImageViewer = as<'div', ImageViewerProps>( >
- + @@ -43,7 +42,6 @@ export const ImageViewer = as<'div', ImageViewerProps>( ( {Math.round(zoom * 100)}% 1 ? 'Success' : 'SurfaceVariant'} outlined={zoom > 1} size="300" diff --git a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx index a503fe13..ddac0576 100644 --- a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx +++ b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx @@ -42,7 +42,6 @@ import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; import { useMatrixClient } from '../../hooks/useMatrixClient'; import { BreakWord } from '../../styles/Text.css'; import { useAlive } from '../../hooks/useAlive'; -import { PhoneHit } from '../../styles/PhoneHit.css'; const SEARCH_OPTIONS: UseAsyncSearchOptions = { limit: 1000, @@ -174,7 +173,7 @@ export function InviteUserPrompt({ room, requestClose }: InviteUserProps) { - + diff --git a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx index ffd5241c..50a89418 100644 --- a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx +++ b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx @@ -20,7 +20,6 @@ import { stopPropagation } from '../../utils/keyboard'; import { isRoomAlias, isRoomId } from '../../utils/matrix'; import { parseMatrixToRoom, parseMatrixToRoomEvent, testMatrixTo } from '../../plugins/matrix-to'; import { tryDecodeURIComponent } from '../../utils/dom'; -import { PhoneHit } from '../../styles/PhoneHit.css'; type JoinAddressProps = { onOpen: (roomIdOrAlias: string, via?: string[], eventId?: string) => void; @@ -83,7 +82,7 @@ export function JoinAddressPrompt({ onOpen, onCancel }: JoinAddressProps) { Join with Address - +
diff --git a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx index 832dd59d..217491e6 100644 --- a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx +++ b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx @@ -20,7 +20,6 @@ import { MatrixError } from 'matrix-js-sdk'; import { useMatrixClient } from '../../hooks/useMatrixClient'; import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; import { stopPropagation } from '../../utils/keyboard'; -import { PhoneHit } from '../../styles/PhoneHit.css'; type LeaveRoomPromptProps = { roomId: string; @@ -69,7 +68,7 @@ export function LeaveRoomPrompt({ roomId, onDone, onCancel }: LeaveRoomPromptPro Leave Room - +
diff --git a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx index 6c75ef99..8709b942 100644 --- a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx +++ b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx @@ -20,7 +20,6 @@ import { MatrixError } from 'matrix-js-sdk'; import { useMatrixClient } from '../../hooks/useMatrixClient'; import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; import { stopPropagation } from '../../utils/keyboard'; -import { PhoneHit } from '../../styles/PhoneHit.css'; type LeaveSpacePromptProps = { roomId: string; @@ -69,7 +68,7 @@ export function LeaveSpacePrompt({ roomId, onDone, onCancel }: LeaveSpacePromptP Leave Space - + diff --git a/src/app/components/logo/logoMark.css.ts b/src/app/components/logo/logoMark.css.ts deleted file mode 100644 index 4c967088..00000000 --- a/src/app/components/logo/logoMark.css.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { globalStyle, style } from '@vanilla-extract/css'; - -/** - * The Ratatoskr mark is white on transparent (Meta's matte). On any light theme (they all carry `prism-light`) a class - * of this name darkens it to the dark ink; put it on every that shows the mark on a themed surface. The favicon and - * notification icons are files the browser draws and cannot take it. - */ -export const LogoMark = style({}); -globalStyle(`body.prism-light .${LogoMark}`, { filter: 'brightness(0.18)' }); diff --git a/src/app/components/message/FileHeader.tsx b/src/app/components/message/FileHeader.tsx index 41cef5f4..2ffc9ec4 100644 --- a/src/app/components/message/FileHeader.tsx +++ b/src/app/components/message/FileHeader.tsx @@ -2,7 +2,6 @@ import { Badge, Box, Icon, IconButton, Icons, Spinner, Text, as, toRem } from 'f import React, { ReactNode, useCallback } from 'react'; import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment'; import FileSaver from 'file-saver'; -import { PhoneHit } from '../../styles/PhoneHit.css'; import { mimeTypeToExt } from '../../utils/mimeTypes'; import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; @@ -49,7 +48,6 @@ export function FileDownloadButton({ filename, url, mimeType, encInfo }: FileDow variant={hasError ? 'Critical' : 'SurfaceVariant'} size="300" radii="300" - className={PhoneHit} > {downloading ? ( diff --git a/src/app/components/message/Reaction.css.ts b/src/app/components/message/Reaction.css.ts index 08003f0e..f020080e 100644 --- a/src/app/components/message/Reaction.css.ts +++ b/src/app/components/message/Reaction.css.ts @@ -1,9 +1,6 @@ import { createVar, style } from '@vanilla-extract/css'; import { DefaultReset, FocusOutline, color, config, toRem } from 'folds'; -import { MOBILE_BREAKPOINT } from '../../hooks/useScreenSize'; -import { PHONE_TAP } from '../../styles/PhoneHit.css'; -const PHONE = `screen and (max-width: ${MOBILE_BREAKPOINT}px)`; const Container = createVar(); const ContainerHover = createVar(); const ContainerActive = createVar(); @@ -28,14 +25,6 @@ export const Reaction = style([ selectors: { 'button&': { cursor: 'pointer', - // Phone tap target: the chip is 26 px tall, so its hit area grows 9 px above and below (an ::after) and the - // same 9 px of margin opens the row, so the chips of one row and of the next never share a tap. - '@media': { [PHONE]: { position: 'relative', marginBlock: (PHONE_TAP - 26) / 2 } }, - }, - 'button&::after': { - '@media': { - [PHONE]: { content: '""', position: 'absolute', inset: `${-(PHONE_TAP - 26) / 2}px 0` }, - }, }, '&[aria-pressed=true]': { vars: { diff --git a/src/app/components/message/Reply.css.ts b/src/app/components/message/Reply.css.ts index d5254ecb..7e5540fd 100644 --- a/src/app/components/message/Reply.css.ts +++ b/src/app/components/message/Reply.css.ts @@ -31,7 +31,6 @@ export const Reply = style({ }); export const ReplyContent = style({ - minWidth: 0, opacity: config.opacity.P300, selectors: { @@ -40,19 +39,3 @@ export const ReplyContent = style({ }, }, }); - -export const ReplyText = style({ - display: '-webkit-box', - WebkitBoxOrient: 'vertical', - WebkitLineClamp: 2, - overflow: 'hidden', - minWidth: 0, - maxWidth: '100%', - overflowWrap: 'anywhere', - wordBreak: 'break-word', -}); - -export const ReplyWrap = style({ - minWidth: 0, - maxWidth: '100%', -}); diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx index 894b3b03..57bf2af9 100644 --- a/src/app/components/message/Reply.tsx +++ b/src/app/components/message/Reply.tsx @@ -101,14 +101,7 @@ export const Reply = as<'div', ReplyProps>( const bodyJSX = body ? scaleSystemEmoji(trimReplyFromBody(body)) : fallbackBody; return ( - + {threadRootId && ( )} @@ -126,7 +119,7 @@ export const Reply = as<'div', ReplyProps>( onClick={onClick} > {replyEvent !== undefined ? ( - + {badEncryption ? : bodyJSX} ) : ( diff --git a/src/app/components/message/content/AudioContent.tsx b/src/app/components/message/content/AudioContent.tsx index 94132cea..478486a4 100644 --- a/src/app/components/message/content/AudioContent.tsx +++ b/src/app/components/message/content/AudioContent.tsx @@ -3,7 +3,6 @@ import React, { ReactNode, useCallback, useRef, useState } from 'react'; import { Badge, Chip, Icon, IconButton, Icons, ProgressBar, Spinner, Text, toRem } from 'folds'; import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment'; import { Range } from 'react-range'; -import { PhoneHitSpread24 } from '../../../styles/PhoneHit.css'; import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; import { IAudioInfo } from '../../../../types/matrix/common'; @@ -160,7 +159,6 @@ export function AudioContent({ variant="SurfaceVariant" size="300" radii="Pill" - className={PhoneHitSpread24} onClick={() => setMute(!mute)} aria-pressed={mute} > diff --git a/src/app/components/message/layout/Bubble.tsx b/src/app/components/message/layout/Bubble.tsx index 6f4e94b0..7fc5171c 100644 --- a/src/app/components/message/layout/Bubble.tsx +++ b/src/app/components/message/layout/Bubble.tsx @@ -5,11 +5,12 @@ import * as css from './layout.css'; type BubbleArrowProps = { variant: ContainerColor; + pose?: boolean; }; -function BubbleLeftArrow({ variant }: BubbleArrowProps) { +function BubbleLeftArrow({ variant, pose }: BubbleArrowProps) { return ( ( - ({ hideBubble, own, pose, enterDelay, before, header, children, style, ...props }, ref) => { - // `false` is a Mind's message continuing a run: aligned with the portraits, showing none. - const poseRow = pose !== undefined; - const arrow = !!before && !poseRow && !own; - const entering = enterDelay !== undefined; - return ( - - {!poseRow && !own && ( - - {before} + ({ hideBubble, pose, before, header, children, ...props }, ref) => ( + + + {before} + + + {header} + {hideBubble ? ( + children + ) : ( + + + {before ? : null} + {children} + )} - - {header &&
{header}
} - {hideBubble ? ( - children - ) : ( - - - {arrow ? : null} - {pose} - {children} - - - )} -
- ); - } +
+ ) ); diff --git a/src/app/components/message/layout/bubbleBounds.test.ts b/src/app/components/message/layout/bubbleBounds.test.ts deleted file mode 100644 index 4a9ad4da..00000000 --- a/src/app/components/message/layout/bubbleBounds.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { readFileSync } from 'fs'; -import { describe, expect, it } from 'vitest'; -import zlib from 'zlib'; -import { compile, processVanillaFile } from '@vanilla-extract/integration'; - -// A long reply quote (nowrap) sized the own-message row to 782px on a 390px phone. The row, the column and the bubble -// must be able to shrink to their parent, so pin the emitted declarations (as phoneTapTargets.test.ts does). -const emitted = async () => { - const filePath = `${process.cwd()}/src/app/components/message/layout/layout.css.ts`; - const { source } = await compile({ filePath, cwd: process.cwd(), identOption: 'debug' }); - const code = await processVanillaFile({ source, filePath, identOption: 'debug' }); - const bytes = Buffer.from( - (code.match(/source=#?([A-Za-z0-9+/=]+)/) as RegExpMatchArray)[1], - 'base64' - ); - return (bytes[0] === 0x1f && bytes[1] === 0x8b ? zlib.gunzipSync(bytes) : bytes).toString(); -}; - -const declarations = (css: string, className: string): string[] => { - const rule = new RegExp(`^\\.layout_${className}__[\\w-]+ \\{\\n([^}]*)\\}`, 'm').exec(css); - expect(rule, `no .layout_${className} rule emitted`).toBeTruthy(); - return (rule as RegExpExecArray)[1].split('\n').map((l) => l.trim().replace(/;$/, '')); -}; - -describe('bubble rows shrink to their column', () => { - it.each([ - ['BubbleColumn', ['min-width: 0']], - ['BubbleContentRow', ['min-width: 0', 'max-width: 100%']], - ['BubbleContent', ['min-width: 0']], - ])('%s', async (name, expected) => { - const css = await emitted(); - expect(declarations(css, name)).toEqual(expect.arrayContaining(expected)); - }); - - it('BubbleContent keeps its 800px cap inside the column width', async () => { - const css = await emitted(); - expect(declarations(css, 'BubbleContent').join('\n')).toMatch(/max-width: min\(100%, 50rem\)/); - }); - - it('Bubble.tsx puts BubbleColumn on the column and BubbleContentRow on the row', () => { - const tsx = readFileSync( - `${process.cwd()}/src/app/components/message/layout/Bubble.tsx`, - 'utf8' - ); - expect(tsx).toMatch(/classNames\(css\.BubbleColumn,/); - expect(tsx).toMatch(//); - }); -}); diff --git a/src/app/components/message/layout/layout.css.ts b/src/app/components/message/layout/layout.css.ts index 39a40aa8..cb53a62d 100644 --- a/src/app/components/message/layout/layout.css.ts +++ b/src/app/components/message/layout/layout.css.ts @@ -1,7 +1,6 @@ -import { createVar, globalStyle, keyframes, style, styleVariants } from '@vanilla-extract/css'; +import { createVar, keyframes, style, styleVariants } from '@vanilla-extract/css'; import { recipe, RecipeVariants } from '@vanilla-extract/recipes'; import { DefaultReset, color, config, toRem } from 'folds'; -import { MOBILE_BREAKPOINT } from '../../../hooks/useScreenSize'; export const StickySection = style({ position: 'sticky', @@ -139,26 +138,39 @@ export const BubbleBefore = style({ minWidth: toRem(36), }); -// minWidth 0 down the column: a flex item never shrinks below its content (a reply quote's unbroken text), -// so without it a long quote pushes the column past the row, and a right-aligned row pushes it off the left edge. -export const BubbleColumn = style({ - minWidth: 0, +// Pose portraits: beside the bubble on wide screens; on phones the row stacks, so the +// portrait costs a little height instead of a column of width, and the left arrow goes. +export const BubblePose = style({ + '@media': { + 'screen and (max-width: 750px)': { + flexDirection: 'column', + gap: config.space.S100, + }, + }, }); -// The row around a bubble sizes to its content in a right-aligned (own) column, and a quote's nowrap text -// makes that content as wide as the quote: cap the row at the column so the bubble can shrink inside it. -export const BubbleContentRow = style({ - minWidth: 0, - maxWidth: '100%', +export const BubbleBeforePose = style({ + minWidth: toRem(64), + '@media': { + 'screen and (max-width: 750px)': { + minWidth: 0, + }, + }, +}); + +export const BubbleArrowPose = style({ + '@media': { + 'screen and (max-width: 750px)': { + display: 'none', + }, + }, }); export const BubbleContent = style({ - minWidth: 0, - maxWidth: `min(100%, ${toRem(800)})`, + maxWidth: toRem(800), padding: config.space.S200, backgroundColor: color.SurfaceVariant.Container, color: color.SurfaceVariant.OnContainer, - border: `1px solid ${color.SurfaceVariant.ContainerLine}`, borderRadius: config.radii.R500, position: 'relative', }); @@ -167,123 +179,30 @@ export const BubbleContentArrowLeft = style({ borderTopLeftRadius: 0, }); -// A Mind's pose nests in the corner of its bubble, on phones and wide screens alike: the sprite's -// body sits in the bubble's padding and the bubble's edge cuts it, so nothing hangs outside; the -// text wraps around its silhouette (shape-outside, traced from the alpha channel) and the bubble -// grows to hold it. How much of the art the edge may cut comes from pose/nest.ts. -// Displayed width of the whole sprite image; the crop fractions are multiples of it. -export const portraitWidth = createVar(); -const PHONE = 'screen and (max-width: 700px)'; -const PORTRAIT = toRem(190); -const PHONE_PORTRAIT = 'min(38vw, 160px)'; -const PHONE_TEXT_FLOOR = toRem(170); -const BUBBLE_PAD = toRem(12); -const BUBBLE_CORNER = toRem(6); -const POP = 'cubic-bezier(0.34, 1.7, 0.64, 1)'; -const RISE = 'cubic-bezier(0.34, 1.45, 0.64, 1)'; - -export const BubbleRowOwn = style({ - justifyContent: 'flex-end', -}); - -export const BubbleColumnOwn = style({ - alignItems: 'flex-end', - maxWidth: toRem(640), -}); - -export const BubbleHeaderOwn = style({ - alignSelf: 'flex-end', -}); - -// The message body is a flex column, which forms its own block formatting context and would sit -// whole beside the floated portrait; as a plain block its lines wrap around the silhouette and -// then run the bubble's full width below it. -export const BubbleContentPose = style({ - display: 'flow-root', - overflow: 'clip', - padding: BUBBLE_PAD, -}); - -// A bubble that shows a portrait is at least portrait + a readable column wide, or the text beside -// it collapses to a strip. -export const BubbleContentPortrait = style({ - vars: { [portraitWidth]: PORTRAIT }, - minWidth: `min(100%, calc(${portraitWidth} + ${PHONE_TEXT_FLOOR}))`, +export const BubbleContentPoseStacked = style({ '@media': { - [PHONE]: { - vars: { [portraitWidth]: PHONE_PORTRAIT }, + 'screen and (max-width: 750px)': { + borderTopLeftRadius: config.radii.R500, }, }, }); -globalStyle(`${BubbleContentPose} > div`, { - display: 'block', -}); - -export const BubbleContentOwn = style({ - backgroundColor: color.Primary.Container, - color: color.Primary.OnContainer, - border: `1px solid ${color.Primary.ContainerLine}`, - borderRadius: config.radii.R500, - borderTopRightRadius: BUBBLE_CORNER, -}); - -// The button is the visible part of the sprite (the part inside the bubble's corner); the image -// inside it is offset by the crop. The inline --pose-* fractions (of the image width) come from -// nestView; until the art's size is known the button is simply the whole image. export const PoseButton = style({ - float: 'left', - width: `var(--pose-bw, ${portraitWidth})`, - height: 'var(--pose-bh, auto)', - // Out into the padding on the top, bottom and outer side, so the bubble's edge is the crop. - margin: `calc(-1 * ${BUBBLE_PAD}) ${toRem(6)} calc(-1 * ${BUBBLE_PAD}) calc(-1 * ${BUBBLE_PAD})`, padding: 0, border: 'none', background: 'none', cursor: 'pointer', lineHeight: 0, - overflow: 'hidden', - shapeMargin: toRem(7), - transformOrigin: '50% 90%', -}); - -export const PoseButtonAlt = style({ - float: 'right', - margin: `calc(-1 * ${BUBBLE_PAD}) calc(-1 * ${BUBBLE_PAD}) calc(-1 * ${BUBBLE_PAD}) ${toRem(6)}`, }); export const PosePortrait = style({ - display: 'block', - width: portraitWidth, - maxWidth: 'none', - height: 'auto', - marginLeft: 'var(--pose-ix, 0)', - marginTop: 'var(--pose-iy, 0)', -}); - -const pop = keyframes({ - from: { opacity: 0, transform: `translateY(${toRem(34)}) scale(0.42)` }, - to: { opacity: 1, transform: 'none' }, -}); -const rise = keyframes({ - from: { opacity: 0, transform: `translateY(${toRem(14)}) scale(0.96)` }, - to: { opacity: 1, transform: 'none' }, -}); - -// First appearance of a message: the portrait pops, the bubble rises just behind it. The delay -// (a --enter-delay on the row) staggers messages that arrive together. -export const EnterPortrait = style({ + width: toRem(64), + height: toRem(64), + objectFit: 'contain', '@media': { - '(prefers-reduced-motion: no-preference)': { - animation: `${pop} 460ms ${POP} var(--enter-delay, 0ms) both`, - }, - }, -}); - -export const EnterBubble = style({ - '@media': { - '(prefers-reduced-motion: no-preference)': { - animation: `${rise} 380ms ${RISE} calc(var(--enter-delay, 0ms) + 50ms) both`, + 'screen and (max-width: 750px)': { + width: toRem(48), + height: toRem(48), }, }, }); @@ -298,12 +217,6 @@ export const BubbleLeftArrow = style({ zIndex: 1, }); -// Phone tap target: a sender name is 23 px tall, so the button grows 11 px above and below (44+ px to tap) and the -// negative margin takes the growth back out of the layout. Sideways it cannot borrow from the layout the -// same way (a negative inline margin makes the button shrink inside its shrink-to-fit parent and clip the name), so -// a name under 44 px is 44 px wide, text kept at the start: real growth of at most 16 px, in a row with room for it. -// No background, border or outline moves. -const SCREEN_PHONE = `screen and (max-width: ${MOBILE_BREAKPOINT}px)`; export const Username = style({ overflow: 'hidden', whiteSpace: 'nowrap', @@ -311,9 +224,6 @@ export const Username = style({ selectors: { 'button&': { cursor: 'pointer', - '@media': { - [SCREEN_PHONE]: { paddingBlock: 11, marginBlock: -11, minWidth: 44, textAlign: 'start' }, - }, }, 'button&:hover, button&:focus-visible': { textDecoration: 'underline', @@ -351,27 +261,3 @@ export const MessageTextBody = recipe({ }); export type MessageTextBodyVariants = RecipeVariants; - -// An outside list marker hangs left of its item's text and ignores the portrait's silhouette, so -// beside a left portrait the number lands under the art. Inside, it is a word on the first line -// and wraps around the silhouette like the rest. -globalStyle(`${BubbleContentPose} ol, ${BubbleContentPose} ul`, { - listStylePosition: 'inside', - paddingLeft: 0, -}); - -// While the background scene runs (html[data-scene]) a chat bubble is the one filled surface in -// the app: its own colour at half strength over a blur of the scene, so the words stay readable -// and the ridge shows through. The arrow wedge is opaque, so it goes. -const scene = ':root[data-scene]'; -const half = (c: string) => `color-mix(in srgb, ${c} 50%, transparent)`; -globalStyle(`${scene} ${BubbleContent}`, { - backgroundColor: [color.SurfaceVariant.Container, half(color.SurfaceVariant.Container)], - backdropFilter: 'blur(12px)', -}); -globalStyle(`${scene} ${BubbleContentOwn}`, { - backgroundColor: [color.Primary.Container, half(color.Primary.Container)], -}); -globalStyle(`${scene} ${BubbleLeftArrow}`, { - display: 'none', -}); diff --git a/src/app/components/message/pose/PoseAvatar.tsx b/src/app/components/message/pose/PoseAvatar.tsx index 05e60631..ed8bc485 100644 --- a/src/app/components/message/pose/PoseAvatar.tsx +++ b/src/app/components/message/pose/PoseAvatar.tsx @@ -1,137 +1,30 @@ -import React, { useEffect, useRef, useState } from 'react'; -import classNames from 'classnames'; +import React from 'react'; import * as css from '../layout/layout.css'; -import { poseSrc, safeBox } from './poses'; -import { alphaBounds, nestView, type Box } from './nest'; -import { silhouette } from './silhouette'; +import { poseSrc } from './poses'; type PoseAvatarProps = { mind: string; pose: string; userId: string; - /** Nest in the bubble's top-right corner instead of the top-left. */ - alt?: boolean; - /** Play the first-appearance pop. */ - enter?: boolean; - /** Without it the portrait is a plain image: no button, no tab stop. */ - onClick?: React.MouseEventHandler; + onClick: React.MouseEventHandler; }; -// Safe boxes derived from art's alpha, by source; the art is traced once. -const traced = new Map(); -const trace = (img: HTMLImageElement, src: string) => { - const hit = traced.get(src); - if (hit) return hit; - const w = img.naturalWidth; - const h = img.naturalHeight; - const ctx = document.createElement('canvas').getContext('2d'); - if (!ctx) return undefined; - ctx.canvas.width = w; - ctx.canvas.height = h; - ctx.drawImage(img, 0, 0); - const box = alphaBounds(ctx.getImageData(0, 0, w, h).data, w, h); - if (!box) return undefined; - const found = { box, size: [w, h] as [number, number] }; - traced.set(src, found); - return found; -}; - -export function PoseAvatar({ mind, pose, userId, alt, enter, onClick }: PoseAvatarProps) { - const src = poseSrc(mind, pose, import.meta.env.BASE_URL); - const imgRef = useRef(null); - const [shape, setShape] = useState(); - const measured = safeBox(mind, pose); - const [derived, setDerived] = useState<{ box: Box; size: [number, number] }>(); - const art = measured ?? (derived?.size ? derived : undefined); - // Measured boxes are cropped by the share Aqua's numbers allow; a box traced from the alpha is - // already tight to the art, so the bubble may take all of the transparent margin. - const view = art && nestView(art.box, art.size, !!alt, measured ? undefined : 1); - - // Art with no measured box: find its extent when it loads. - useEffect(() => { - setDerived(undefined); - const img = imgRef.current; - if (!img || measured) return undefined; - const find = () => { - if (!img.complete || img.naturalWidth === 0) return; - try { - setDerived(trace(img, src)); - } catch { - setDerived(undefined); - } - }; - find(); - img.addEventListener('load', find); - return () => img.removeEventListener('load', find); - }, [src, measured]); - - // The bubble text wraps around the portrait's silhouette. Retraced when the art loads, when its - // crop is known, and when its width changes with the viewport. - useEffect(() => { - const img = imgRef.current; - if (!img) return undefined; - const retrace = () => { - if (!img.complete || img.naturalWidth === 0) return; - try { - const box = img.parentElement; - const style = getComputedStyle(img); - setShape( - silhouette( - img, - !alt, - box - ? { - x: 0 - parseFloat(style.marginLeft || '0'), - y: 0 - parseFloat(style.marginTop || '0'), - width: box.clientWidth, - height: box.clientHeight, - } - : undefined - ) - ); - } catch { - setShape(undefined); - } - }; - retrace(); - img.addEventListener('load', retrace); - const resize = new ResizeObserver(retrace); - resize.observe(img); - return () => { - img.removeEventListener('load', retrace); - resize.disconnect(); - }; - }, [src, alt, view?.x, view?.y, view?.width, view?.height]); - - // Crop fractions are of the image's width, so one set serves every displayed size. - const frac = (px: number) => `calc(${css.portraitWidth} * ${px / (art?.size[0] ?? 1)})`; - const cropStyle = - art && view - ? ({ - '--pose-bw': frac(view.width), - '--pose-bh': frac(view.height), - '--pose-ix': frac(-view.x), - '--pose-iy': frac(-view.y), - } as React.CSSProperties) - : undefined; - - const Tag = onClick ? 'button' : 'span'; +export function PoseAvatar({ mind, pose, userId, onClick }: PoseAvatarProps) { return ( - {`${mind}, - + ); } diff --git a/src/app/components/message/pose/catalogue.json b/src/app/components/message/pose/catalogue.json deleted file mode 100644 index 87e7ba71..00000000 --- a/src/app/components/message/pose/catalogue.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "shared": [ - "neutral", - "happy", - "amused", - "thinking", - "annoyed", - "surprised" - ], - "minds": { - "eureka": { - "sheet": "r1b", - "shared": { - "neutral": "eureka/neutral.png", - "happy": "eureka/happy.png", - "amused": "eureka/amused.png", - "thinking": "eureka/thinking.png", - "annoyed": "eureka/annoyed.png", - "surprised": "eureka/surprised.png" - }, - "signatures": { - "probe": "eureka/probe.png", - "inspect": "eureka/inspect.png", - "report": "eureka/report.png", - "hood-smug": "eureka/hood-smug.png", - "concerned": "eureka/concerned.png", - "determined": "eureka/determined.png" - }, - "signature_descriptions": { - "probe": "Frowning, pencil raised to her chin, working a problem out.", - "inspect": "Frowning, one finger pointing at the thing to look at.", - "report": "Smirking over a folder of findings.", - "hood-smug": "Eyes shut under the hood, self-satisfied smirk.", - "concerned": "Worried frown, pencil at her chin.", - "determined": "Hard-set frown, pencil in hand, resolved." - } - }, - "aqua": { - "sheet": "r1b", - "shared": { - "neutral": "aqua/neutral.png", - "happy": "aqua/happy.png", - "amused": "aqua/amused.png", - "thinking": "aqua/thinking.png", - "annoyed": "aqua/annoyed.png", - "surprised": "aqua/surprised.png" - }, - "signatures": { - "concerned": "aqua/concerned.png", - "fretful": "aqua/fretful.png", - "weary": "aqua/weary.png", - "glare": "aqua/glare.png", - "smug": "aqua/smug.png", - "sigh": "aqua/sigh.png", - "charging": "aqua/charging.png", - "delighted": "aqua/delighted.png", - "content": "aqua/content.png" - }, - "signature_descriptions": { - "concerned": "Worried frown, brows pinched.", - "fretful": "Anxious, a fin pressed to her chin.", - "weary": "Droopy half-lidded eyes; worn out.", - "glare": "Scowling hard, a fin held out to the side.", - "smug": "Sidelong look and a small smirk.", - "sigh": "Eyes shut, breathing out.", - "charging": "Eyes shut, a charging cable plugged into her mouth; recharging.", - "delighted": "Wide open-mouthed grin, fins up.", - "content": "Calm, small contented smile." - } - }, - "heimdall": { - "sheet": "r1a", - "shared": { - "neutral": "heimdall/neutral.png", - "happy": "heimdall/happy.png", - "amused": "heimdall/amused.png", - "thinking": "heimdall/thinking.png", - "annoyed": "heimdall/annoyed.png", - "surprised": "heimdall/surprised.png" - }, - "signatures": { - "concerned": "heimdall/concerned.png", - "determined": "heimdall/determined.png", - "badge": "heimdall/badge.png", - "barrier": "heimdall/barrier.png", - "protect": "heimdall/protect.png", - "revoke": "heimdall/revoke.png" - }, - "signature_descriptions": { - "concerned": "Worried frown, brows raised.", - "determined": "Hard scowl, jaw set.", - "badge": "Stern, holding a gold key out as his credentials.", - "barrier": "Palm raised behind a translucent blue shield: stop.", - "protect": "Scowling, cloak swept forward like a guard.", - "revoke": "Stern, two keys in hand; taking access away." - } - }, - "kiko": { - "sheet": "r1b", - "shared": { - "neutral": "kiko/neutral.png", - "happy": "kiko/happy.png", - "amused": "kiko/amused.png", - "thinking": "kiko/thinking.png", - "annoyed": "kiko/annoyed.png", - "surprised": "kiko/surprised.png" - }, - "signatures": { - "shy-smile": "kiko/shy-smile.png", - "uneasy": "kiko/uneasy.png", - "tinker": "kiko/tinker.png", - "confetti": "kiko/confetti.png", - "sprint": "kiko/sprint.png", - "debug": "kiko/debug.png" - }, - "signature_descriptions": { - "shy-smile": "Soft, shy smile; blushing.", - "uneasy": "Blushing, tongue peeking out, unsure.", - "tinker": "Delighted, holding up a small gadget.", - "confetti": "Open-mouthed grin, confetti falling, a glowing glyph on one finger.", - "sprint": "Eyes shut, laughing, one arm up, mid-dash.", - "debug": "Squinting through a magnifying glass at a bug." - } - }, - "weksa": { - "sheet": "r1a", - "shared": { - "neutral": "weksa/neutral.png", - "happy": "weksa/happy.png", - "amused": "weksa/amused.png", - "thinking": "weksa/thinking.png", - "annoyed": "weksa/annoyed.png", - "surprised": "weksa/surprised.png" - }, - "signatures": { - "concerned": "weksa/concerned.png", - "skeptical": "weksa/skeptical.png", - "map": "weksa/map.png", - "fieldwork": "weksa/fieldwork.png", - "argue": "weksa/argue.png", - "interlingua": "weksa/interlingua.png" - }, - "signature_descriptions": { - "concerned": "Worried frown, wide eyes, scroll on her back.", - "skeptical": "Half-lidded, flat frown; unconvinced.", - "map": "Worried, unfurling a hand-drawn map.", - "fieldwork": "Frowning in focus, holding a carved idol and a brush.", - "argue": "Open-mouthed, pointing, holding up a tablet as evidence.", - "interlingua": "Shouting, a glyph tablet in each hand." - } - }, - "void": { - "sheet": "r1b", - "shared": { - "neutral": "void/neutral.png", - "happy": "void/happy.png", - "amused": "void/amused.png", - "thinking": "void/thinking.png", - "annoyed": "void/annoyed.png", - "surprised": "void/surprised.png" - }, - "signatures": { - "determined": "void/determined.png", - "glare": "void/glare.png", - "shrug": "void/shrug.png", - "reading": "void/reading.png", - "point": "void/point.png", - "deadpan": "void/deadpan.png" - }, - "signature_descriptions": { - "determined": "Hood bowed, narrowed eyes; set on the task.", - "glare": "Narrowed eyes under the hood; hostile stare.", - "shrug": "Both hands open, eyes wide: no idea.", - "reading": "Holding a sheet of paper, reading it.", - "point": "Half-lidded eyes, one finger pointing off to the side.", - "deadpan": "Flat lines for eyes; unimpressed." - } - }, - "libby": { - "sheet": "r1a", - "shared": { - "neutral": "libby/neutral.png", - "happy": "libby/happy.png", - "amused": "libby/amused.png", - "thinking": "libby/thinking.png", - "annoyed": "libby/annoyed.png", - "surprised": "libby/surprised.png" - }, - "signatures": { - "concerned": "libby/concerned.png", - "sad": "libby/sad.png", - "stamp": "libby/stamp.png", - "research": "libby/research.png", - "shush": "libby/shush.png", - "schema": "libby/schema.png" - }, - "signature_descriptions": { - "concerned": "Worried, a book clutched to her chest.", - "sad": "Downcast, a book clutched to her chest.", - "stamp": "Smiling, stamping a page of an open book.", - "research": "Eager over an open book, an ink bottle at hand.", - "shush": "Speaking over an open book, one finger on the page.", - "schema": "Raising a finger beside a glowing flow-diagram panel." - } - }, - "nibu": { - "sheet": "r1b", - "shared": { - "neutral": "nibu/neutral.png", - "happy": "nibu/happy.png", - "amused": "nibu/amused.png", - "thinking": "nibu/thinking.png", - "annoyed": "nibu/annoyed.png", - "surprised": "nibu/surprised.png" - }, - "signatures": { - "sheepish": "nibu/sheepish.png", - "pout": "nibu/pout.png", - "resolute": "nibu/resolute.png", - "console": "nibu/console.png", - "glitch": "nibu/glitch.png", - "triumph": "nibu/triumph.png" - }, - "signature_descriptions": { - "sheepish": "Arms crossed, awkward toothy grin.", - "pout": "Arms crossed, pouting frown.", - "resolute": "Arms crossed, scowling; standing her ground.", - "console": "Frowning at a handheld console.", - "glitch": "Frowning, palm up, a glitch tearing across her eyes.", - "triumph": "Eyes shut, fist raised; quietly pleased with a win." - } - } - }, - "shared_descriptions": { - "neutral": "At rest, no particular feeling.", - "happy": "Pleased; smiling.", - "amused": "Quietly entertained, as if at a private joke.", - "thinking": "Working something out.", - "annoyed": "Irritated; patience running thin.", - "surprised": "Caught off guard." - } -} \ No newline at end of file diff --git a/src/app/components/message/pose/entrance.test.ts b/src/app/components/message/pose/entrance.test.ts deleted file mode 100644 index 6f16a384..00000000 --- a/src/app/components/message/pose/entrance.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { claimEntrance } from './entrance'; - -describe('claimEntrance', () => { - it('animates a message once, never on a remount', () => { - expect(claimEntrance('$once', 1_000_000)).toBe(0); - expect(claimEntrance('$once', 1_000_500)).toBeUndefined(); - }); - it('staggers messages that mount together, capped so a long backlog still lands fast', () => { - const t = 2_000_000; - const delays = ['$a', '$b', '$c', '$d', '$e', '$f'].map((id) => claimEntrance(id, t)); - expect(delays.slice(0, 3)).toEqual([0, 300, 600]); - expect(Math.max(...(delays as number[]))).toBe(900); - }); - it('lets a lone later message in at once', () => { - claimEntrance('$x', 3_000_000); - expect(claimEntrance('$y', 3_010_000)).toBe(0); - }); -}); diff --git a/src/app/components/message/pose/entrance.ts b/src/app/components/message/pose/entrance.ts deleted file mode 100644 index 8386f80b..00000000 --- a/src/app/components/message/pose/entrance.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { useState } from 'react'; - -// A message animates in the first time it is shown, not each time the virtualised timeline -// remounts it. Messages mounting together are staggered so a screenful does not pop at once. -const STEP_MS = 300; -const MAX_DELAY_MS = 900; -const SEEN_CAP = 2000; - -const seen = new Set(); -let nextSlot = 0; - -export const claimEntrance = (id: string, now: number): number | undefined => { - if (seen.has(id)) return undefined; - if (seen.size >= SEEN_CAP) seen.clear(); - seen.add(id); - const start = Math.max(nextSlot, now); - nextSlot = Math.min(start + STEP_MS, now + MAX_DELAY_MS); - return Math.min(start - now, MAX_DELAY_MS); -}; - -export const useEntranceDelay = (id: string | undefined): number | undefined => - useState(() => (id ? claimEntrance(id, performance.now()) : undefined))[0]; diff --git a/src/app/components/message/pose/nest.test.ts b/src/app/components/message/pose/nest.test.ts deleted file mode 100644 index d8e6f36e..00000000 --- a/src/app/components/message/pose/nest.test.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { alphaBounds, nestView } from './nest'; -import boxes from './safeBoxes.json'; - -describe('nestView', () => { - // Aqua neutral: 560x374, safe box [144,22,492,317] (right margin 68, top 22). - it('crops half the right and top margins for a top-right nest', () => { - expect(nestView([144, 22, 492, 317], [560, 374], true)).toEqual({ - x: 0, - y: 11, - width: 526, - height: 363, - }); - }); - - it('crops the left margin instead for a top-left nest', () => { - expect(nestView([144, 22, 492, 317], [560, 374], false)).toEqual({ - x: 72, - y: 11, - width: 488, - height: 363, - }); - }); - - it('never crops the top of art already touching it (smug, headband at y=0)', () => { - const v = nestView([140, 0, 487, 241], [560, 374], true); - expect(v.y).toBe(0); - expect(v.height).toBe(374); - }); - - it('can take the whole margin', () => { - expect(nestView([10, 4, 90, 50], [100, 60], true, 1)).toEqual({ - x: 0, - y: 4, - width: 90, - height: 56, - }); - }); - - it('keeps every measured safe box intact at the default share', () => { - const aqua = boxes.aqua as Record; - expect(Object.keys(aqua)).toHaveLength(15); - Object.values(aqua).forEach(([x0, y0, x1, y1, w, h]) => { - const right = nestView([x0, y0, x1, y1], [w, h], true); - expect(right.x).toBeLessThanOrEqual(x0); - expect(right.x + right.width).toBeGreaterThanOrEqual(x1); - expect(right.y).toBeLessThanOrEqual(y0); - const left = nestView([x0, y0, x1, y1], [w, h], false); - expect(left.x).toBeLessThanOrEqual(x0); - expect(left.x + left.width).toBe(w); - }); - }); -}); - -describe('alphaBounds', () => { - it('finds the opaque rectangle', () => { - const w = 6; - const h = 5; - const data = new Uint8ClampedArray(w * h * 4); - [ - [2, 1], - [4, 3], - ].forEach(([x, y]) => { - data[(y * w + x) * 4 + 3] = 255; - }); - expect(alphaBounds(data, w, h)).toEqual([2, 1, 5, 4]); - }); - - it('reports nothing for an empty image', () => { - expect(alphaBounds(new Uint8ClampedArray(16), 2, 2)).toBeUndefined(); - }); -}); diff --git a/src/app/components/message/pose/nest.ts b/src/app/components/message/pose/nest.ts deleted file mode 100644 index ffee1490..00000000 --- a/src/app/components/message/pose/nest.ts +++ /dev/null @@ -1,58 +0,0 @@ -// A pose nests into the corner of its bubble: the sprite's body sits in the bubble's padding and is -// cut off by the bubble's edge, so nothing hangs outside it. - -/** [x0, y0, x1, y1] in image pixels, origin top-left, x1/y1 exclusive. */ -export type Box = [number, number, number, number]; - -// Share of the room between the safe box and the image edge that the bubble edge may cut away. -// Aqua's measurement says all of it can go; half leaves the outline a little air. -export const CROP_SHARE = 0.5; - -export type NestView = { - /** The visible region of the image, in pixels. */ - x: number; - y: number; - width: number; - height: number; -}; - -// The part of the image that shows, for a sprite in the bubble's top-right (`right`) or top-left -// corner. Only the corner's two sides are cropped: the side towards the bubble's edge and the top. -// The far side and the bottom stay whole; the bubble's bottom edge cuts the bust. -export const nestView = ( - safe: Box, - size: [number, number], - right: boolean, - share = CROP_SHARE -): NestView => { - const [w, h] = size; - const [x0, y0, x1] = safe; - const side = Math.round(share * (right ? w - x1 : x0)); - const top = Math.round(share * y0); - const x = right ? 0 : side; - return { x, y: top, width: w - side, height: h - top }; -}; - -// Bounds of the pixels whose alpha exceeds `min`, as a safe box for art with no measured one. -export const alphaBounds = ( - data: ArrayLike, - w: number, - h: number, - min = 8 -): Box | undefined => { - let x0 = w; - let y0 = h; - let x1 = 0; - let y1 = 0; - for (let y = 0; y < h; y += 1) { - for (let x = 0; x < w; x += 1) { - if (data[(y * w + x) * 4 + 3] > min) { - x0 = Math.min(x0, x); - x1 = Math.max(x1, x + 1); - y0 = Math.min(y0, y); - y1 = y + 1; - } - } - } - return x1 > x0 ? [x0, y0, x1, y1] : undefined; -}; diff --git a/src/app/components/message/pose/poses.test.ts b/src/app/components/message/pose/poses.test.ts index c6089f62..0915cfa7 100644 --- a/src/app/components/message/pose/poses.test.ts +++ b/src/app/components/message/pose/poses.test.ts @@ -1,32 +1,18 @@ import { describe, expect, it } from 'vitest'; -import catalogue from './catalogue.json'; -import { - mindOfSender, - poseSrc, - resolvePose, -} from './poses'; +import { mindOfSender, poseSrc, resolvePose } from './poses'; describe('resolvePose', () => { - it('keeps shared and own-signature labels from the catalogue', () => { + it('keeps shared and own-signature labels', () => { expect(resolvePose('aqua', 'amused')).toBe('amused'); - expect(resolvePose('aqua', 'fretful')).toBe('fretful'); + expect(resolvePose('aqua', 'conduct')).toBe('conduct'); expect(resolvePose('kiko', ' Debug ')).toBe('debug'); - expect(resolvePose('void', 'reading')).toBe('reading'); }); it('falls back to neutral for missing, unknown, non-string or foreign-signature labels', () => { expect(resolvePose('aqua', undefined)).toBe('neutral'); - expect(resolvePose('aqua', 'conduct')).toBe('neutral'); + expect(resolvePose('aqua', 'smug')).toBe('neutral'); expect(resolvePose('aqua', 7)).toBe('neutral'); expect(resolvePose('aqua', 'probe')).toBe('neutral'); - expect(resolvePose('nobody', 'neutral')).toBe('neutral'); - expect(resolvePose('aqua', 'constructor')).toBe('neutral'); - }); - it('knows every label the catalogue lists, and only those', () => { - Object.entries(catalogue.minds).forEach(([mind, entry]) => { - [...Object.keys(entry.shared), ...Object.keys(entry.signatures)].forEach((l) => - expect(resolvePose(mind, l)).toBe(l) - ); - }); + expect(resolvePose('nobody', 'probe')).toBe('neutral'); }); }); @@ -34,7 +20,6 @@ describe('mindOfSender', () => { it('matches localpart or first display-name word', () => { expect(mindOfSender('Eureka')).toBe('eureka'); expect(mindOfSender('x', 'Libby the Archivist')).toBe('libby'); - expect(mindOfSender('void')).toBe('void'); }); it('ignores humans and Object prototype names', () => { expect(mindOfSender('alice', 'Alice')).toBeUndefined(); @@ -44,11 +29,7 @@ describe('mindOfSender', () => { }); describe('poseSrc', () => { - it('builds the asset path from the catalogue entry', () => { - expect(poseSrc('eureka', 'hood-smug', '/app/')).toBe('/app/public/poses/eureka/hood-smug.png'); - expect(poseSrc('eureka', 'nope')).toBe('/public/poses/eureka/neutral.png'); + it('builds the asset path', () => { + expect(poseSrc('nibu', 'glitch', '/app/')).toBe('/app/public/poses/nibu/glitch.webp'); }); }); - - - diff --git a/src/app/components/message/pose/poses.ts b/src/app/components/message/pose/poses.ts index b1f983ea..58ce59b8 100644 --- a/src/app/components/message/pose/poses.ts +++ b/src/app/components/message/pose/poses.ts @@ -1,19 +1,29 @@ -import catalogue from './catalogue.json'; -import safeBoxes from './safeBoxes.json'; -import type { Box } from './nest'; - -// Pose labels travel in the event content under POSE_KEY. The catalogue -// (cast-art poses/catalogue.json, synced by `npm run sync:poses`) is the only -// list of Minds, labels and art paths the client knows. +// Pose labels travel in the event content under POSE_KEY. Art exists per Mind; +// every Mind has the shared set plus four signature poses of its own. export const POSE_KEY = 'org.gamecult.pose'; -export const NEUTRAL = 'neutral'; -type MindEntry = { - shared: Record; - signatures: Record; +export const SHARED_POSES = [ + 'neutral', + 'happy', + 'amused', + 'thinking', + 'concerned', + 'annoyed', + 'surprised', + 'determined', +] as const; + +export const MIND_POSES: Record = { + aqua: ['conduct', 'listen', 'patch', 'flourish'], + eureka: ['probe', 'inspect', 'report', 'hood'], + heimdall: ['badge', 'barrier', 'protect', 'revoke'], + kiko: ['tinker', 'confetti', 'sprint', 'debug'], + libby: ['stamp', 'research', 'shush', 'schema'], + nibu: ['console', 'glitch', 'lore', 'triumph'], + weksa: ['map', 'fieldwork', 'argue', 'interlingua'], }; -const minds = catalogue.minds as Record; -export const MINDS = Object.keys(minds); + +export const NEUTRAL = 'neutral'; // A sender is a known Mind when its Matrix localpart or the first word of its // display name is the Mind's name, case-insensitively. @@ -21,35 +31,18 @@ export const mindOfSender = (localpart?: string, displayName?: string): string | const candidates = [localpart, displayName?.split(/\s+/)[0]]; return candidates .map((c) => c?.toLowerCase()) - .find((c): c is string => c !== undefined && Object.prototype.hasOwnProperty.call(minds, c)); -}; - -const artPath = (mind: string, label: string): string | undefined => { - const entry = Object.prototype.hasOwnProperty.call(minds, mind) ? minds[mind] : undefined; - if (!entry) return undefined; - const has = (o: Record) => Object.prototype.hasOwnProperty.call(o, label); - if (has(entry.shared)) return entry.shared[label]; - return has(entry.signatures) ? entry.signatures[label] : undefined; + .find( + (c): c is string => c !== undefined && Object.prototype.hasOwnProperty.call(MIND_POSES, c) + ); }; // Unknown, missing or non-string labels, and another Mind's signature, fall back to neutral. export const resolvePose = (mind: string, label: unknown): string => { if (typeof label !== 'string') return NEUTRAL; const l = label.trim().toLowerCase(); - return artPath(mind, l) ? l : NEUTRAL; + const known = (SHARED_POSES as readonly string[]).includes(l) || MIND_POSES[mind]?.includes(l); + return known ? l : NEUTRAL; }; export const poseSrc = (mind: string, pose: string, base = '/'): string => - `${base}public/poses/${artPath(mind, pose) ?? artPath(mind, NEUTRAL)}`; - -// Safe-crop boxes measured from the art's pixels (Aqua, `aqua-pose-crop-boxes-20261110`): the -// head and headphones plus outline, which the bubble's edge must not cut. [x0, y0, x1, y1, width, -// height] in image pixels. Art with no entry gets its box from the sprite's alpha at load time. -const boxes = safeBoxes as Record>; -export const safeBox = ( - mind: string, - pose: string -): { box: Box; size: [number, number] } | undefined => { - const b = Object.prototype.hasOwnProperty.call(boxes, mind) ? boxes[mind][pose] : undefined; - return b ? { box: [b[0], b[1], b[2], b[3]], size: [b[4], b[5]] } : undefined; -}; + `${base}public/poses/${mind}/${pose}.webp`; diff --git a/src/app/components/message/pose/safeBoxes.json b/src/app/components/message/pose/safeBoxes.json deleted file mode 100644 index eff7011e..00000000 --- a/src/app/components/message/pose/safeBoxes.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "aqua": { - "neutral": [144, 22, 492, 317, 560, 374], - "happy": [157, 22, 506, 317, 574, 374], - "amused": [154, 22, 500, 317, 562, 374], - "thinking": [154, 16, 500, 307, 562, 374], - "annoyed": [154, 4, 499, 282, 562, 374], - "surprised": [141, 5, 485, 282, 560, 374], - "concerned": [156, 4, 501, 283, 574, 374], - "fretful": [156, 16, 503, 305, 574, 374], - "weary": [161, 16, 509, 307, 624, 374], - "glare": [160, 5, 508, 282, 624, 374], - "smug": [140, 0, 487, 241, 560, 374], - "sigh": [154, 0, 500, 241, 574, 374], - "charging": [152, 0, 497, 241, 562, 374], - "delighted": [159, 0, 507, 241, 624, 374], - "content": [144, 16, 492, 306, 560, 374] - } -} diff --git a/src/app/components/message/pose/sentiment.test.ts b/src/app/components/message/pose/sentiment.test.ts deleted file mode 100644 index bc4a8c28..00000000 --- a/src/app/components/message/pose/sentiment.test.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { classifyPose, messagePose } from './sentiment'; - -describe('classifyPose', () => { - it.each([ - ['annoyed', 'ugh, this again'], - ['surprised', 'wow, no way'], - ['amused', 'hahaha that is funny'], - ['happy', 'thanks, great work'], - ['thinking', 'should we ship it?'], - ['neutral', 'Merged the branch.'], - ['neutral', 'sorry, that failed with an error'], - ])('%s', (label, text) => expect(classifyPose(text)).toBe(label)); - it('is neutral for empty or non-string text', () => { - expect(classifyPose('')).toBe('neutral'); - expect(classifyPose(undefined)).toBe('neutral'); - expect(classifyPose(5)).toBe('neutral'); - }); - it('is deterministic', () => { - expect(classifyPose('thanks?')).toBe(classifyPose('thanks?')); - }); -}); - -describe('messagePose', () => { - it('lets an explicit label win over the text', () => { - expect(messagePose('aqua', { body: 'thanks!', 'org.gamecult.pose': 'annoyed' })).toBe( - 'annoyed' - ); - }); - it('keeps an unknown explicit label neutral instead of classifying', () => { - expect(messagePose('aqua', { body: 'thanks!', 'org.gamecult.pose': 'conduct' })).toBe( - 'neutral' - ); - }); - it('classifies when there is no label, and never outputs a signature label', () => { - expect(messagePose('aqua', { body: 'thanks!' })).toBe('happy'); - expect(messagePose('kiko', { body: 'sorry' })).toBe('neutral'); - expect(messagePose('aqua', {})).toBe('neutral'); - }); -}); diff --git a/src/app/components/message/pose/sentiment.ts b/src/app/components/message/pose/sentiment.ts deleted file mode 100644 index bd685a07..00000000 --- a/src/app/components/message/pose/sentiment.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { POSE_KEY, NEUTRAL, resolvePose } from './poses'; - -// catalogue.json beside this file is a vendored copy of /opt/commons/cast-art/poses/catalogue.json -// (npm run sync:poses); nothing else publishes it to the browser. -// Local sentiment -> pose label. A lexicon over the message text, no network, no model: the -// same text always gives the same pose. Rules are tried in order and the first hit wins, so a -// message that says "wow" and "thanks" reads as surprised. Only the shared labels (identical art -// for all eight Minds, catalogue.json) are ever output; signature labels are explicit-only. -const RULES: [string, RegExp][] = [ - ['annoyed', /\b(annoy\w*|ugh+|argh+|frustrat\w*|again\?|why won'?t|stop it)\b/i], - ['surprised', /\b(wow|whoa|woah|omg|no way|unexpected\w*|surpris\w*|wait,? what)\b|[?!]{2,}/i], - [ - 'determined', - /\b(let'?s (go|do|fix|ship)|on it|i'?ll (fix|do|handle)|will do|fixing|resolved?)\b/i, - ], - ['amused', /\b(ha(ha)+|lol|lmao|rofl|funny|hilarious)\b|😂|🤣/i], - [ - 'happy', - /\b(thanks?|thank you|thx|great|awesome|nice|love|perfect|excellent|yay|congrats)\b|🎉|😊/i, - ], - ['thinking', /\?\s*$|\b(hmm+|maybe|perhaps|i wonder|not sure|how (do|does|about)|what if)\b/i], -]; - -export const classifyPose = (text: unknown): string => { - if (typeof text !== 'string') return NEUTRAL; - const hit = RULES.find(([, re]) => re.test(text)); - return hit ? hit[0] : NEUTRAL; -}; - -// An explicit org.gamecult.pose label always wins, even when it is unknown (then neutral). -// Only events with no label are read for sentiment. -export const messagePose = (mind: string, content: Record): string => - content[POSE_KEY] !== undefined - ? resolvePose(mind, content[POSE_KEY]) - : resolvePose(mind, classifyPose(content.body)); diff --git a/src/app/components/message/pose/silhouette.test.ts b/src/app/components/message/pose/silhouette.test.ts deleted file mode 100644 index ba9d5ecb..00000000 --- a/src/app/components/message/pose/silhouette.test.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest'; -import { silhouette } from './silhouette'; - -// A w x h image whose opaque pixels are the given columns [from, to) on each row. -const fakeImage = (w: number, h: number, solid: (y: number) => [number, number] | null) => { - const data = new Uint8ClampedArray(w * h * 4); - for (let y = 0; y < h; y += 1) { - const span = solid(y); - if (span) for (let x = span[0]; x < span[1]; x += 1) data[(y * w + x) * 4 + 3] = 255; - } - const canvas = { - width: 0, - height: 0, - getContext: () => ({ canvas, drawImage: vi.fn(), getImageData: () => ({ data }) }), - }; - vi.stubGlobal('document', { createElement: () => canvas }); - return { clientWidth: w, clientHeight: h } as HTMLImageElement; -}; - -afterEach(() => { - vi.unstubAllGlobals(); -}); - -describe('silhouette', () => { - // Art in columns 20..60 from row 8 down; rows 0..7 are empty. - const art = (y: number): [number, number] | null => (y < 8 ? null : [20, 60]); - - it('hugs the right edge of the art when the text sits to its right', () => { - const poly = silhouette(fakeImage(100, 16, art), true); - expect(poly).toBe( - 'polygon(0px 0, 0px 0px, 0px 4px, 60px 8px, 60px 12px, 60px 16px, 0px 16px) border-box' - ); - }); - - it('hugs the left edge of the art when the text sits to its left', () => { - const poly = silhouette(fakeImage(100, 16, art), false); - expect(poly).toBe( - 'polygon(100px 0, 100px 0px, 100px 4px, 20px 8px, 20px 12px, 20px 16px, 100px 16px) border-box' - ); - }); - - it('takes the widest row of a band, so no row of the art pokes out of the polygon', () => { - // Row 5 reaches x=90; its band's edge row (y=8 covers rows 4..8) must include it. - const poly = silhouette( - fakeImage(100, 16, (y) => (y === 5 ? [20, 90] : null)), - true - ); - expect(poly).toContain('90px 8px'); - }); - - it('has no shape before the image has a size or where there is no canvas', () => { - expect( - silhouette({ clientWidth: 0, clientHeight: 0 } as HTMLImageElement, true) - ).toBeUndefined(); - }); - - it('traces only the visible part of a cropped portrait, drawn at its offset', () => { - const drawImage = vi.fn(); - const canvas = { - width: 0, - height: 0, - getContext: () => ({ - canvas, - drawImage, - getImageData: () => ({ data: new Uint8ClampedArray(40 * 8 * 4) }), - }), - }; - vi.stubGlobal('document', { createElement: () => canvas }); - const img = { clientWidth: 100, clientHeight: 20 } as HTMLImageElement; - silhouette(img, true, { x: 0, y: 12, width: 40, height: 8 }); - expect([canvas.width, canvas.height]).toEqual([40, 8]); - expect(drawImage).toHaveBeenCalledWith(img, 0, -12, 100, 20); - }); -}); diff --git a/src/app/components/message/pose/silhouette.ts b/src/app/components/message/pose/silhouette.ts deleted file mode 100644 index 019c0716..00000000 --- a/src/app/components/message/pose/silhouette.ts +++ /dev/null @@ -1,43 +0,0 @@ -const SOLID = 0.35 * 255; -const ROW = 4; - -// The edge of the portrait that the text wraps against, as a polygon in border-box pixels. -// `shape-outside: url()` cannot do this: the browser sizes that image at its natural size and -// anchors it at the margin box, which the phone layout's negative top margin shifts down by the -// overhang, so the exclusion neither matches the art's size nor its place. -// -// `view` is the part of the displayed image that shows (the button's box, in displayed pixels): -// the portrait is cropped by the bubble, so the polygon is traced over what is left of the art. -export type View = { x: number; y: number; width: number; height: number }; - -export const silhouette = ( - img: HTMLImageElement, - textOnRight: boolean, - view?: View -): string | undefined => { - const w = Math.round(view?.width ?? img.clientWidth); - const h = Math.round(view?.height ?? img.clientHeight); - const ctx = w > 0 && h > 0 ? document.createElement('canvas').getContext('2d') : null; - if (!ctx) return undefined; - ctx.canvas.width = w; - ctx.canvas.height = h; - ctx.drawImage(img, 0 - (view?.x ?? 0), 0 - (view?.y ?? 0), img.clientWidth, img.clientHeight); - const { data } = ctx.getImageData(0, 0, w, h); - const outer = textOnRight ? 0 : w; - const edge: string[] = []; - for (let y = 0; y <= h; y += ROW) { - let x = outer; - // A band's edge is the extreme solid pixel over its rows, so no row pokes out of the polygon. - for (let r = Math.max(0, y - ROW); r < Math.min(h, y + 1); r += 1) { - for (let i = 0; i < w; i += 1) { - const px = textOnRight ? w - 1 - i : i; - if (data[(r * w + px) * 4 + 3] > SOLID) { - x = textOnRight ? Math.max(x, px + 1) : Math.min(x, px); - break; - } - } - } - edge.push(`${x}px ${y}px`); - } - return `polygon(${outer}px 0, ${edge.join(', ')}, ${outer}px ${h}px) border-box`; -}; diff --git a/src/app/components/nav/NavGutter.tsx b/src/app/components/nav/NavGutter.tsx deleted file mode 100644 index c0a6e50e..00000000 --- a/src/app/components/nav/NavGutter.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React, { ReactNode } from 'react'; -import * as css from './styles.css'; - -/** The fixed-width first column of a navigator row or section header; its content is centred in it. */ -export function NavGutter({ children }: { children: ReactNode }) { - return {children}; -} - -/** One nesting step: everything inside is indented by the same constant. */ -export function NavLevel({ children }: { children: ReactNode }) { - return
{children}
; -} diff --git a/src/app/components/nav/index.ts b/src/app/components/nav/index.ts index 2ed29601..12267446 100644 --- a/src/app/components/nav/index.ts +++ b/src/app/components/nav/index.ts @@ -4,4 +4,3 @@ export * from './NavEmptyLayout'; export * from './NavItem'; export * from './NavItemContent'; export * from './NavItemOptions'; -export * from './NavGutter'; diff --git a/src/app/components/nav/styles.css.ts b/src/app/components/nav/styles.css.ts index a3845e90..48b2a4d3 100644 --- a/src/app/components/nav/styles.css.ts +++ b/src/app/components/nav/styles.css.ts @@ -1,42 +1,6 @@ -import { ComplexStyleRule, StyleRule, createVar, globalStyle, style } from '@vanilla-extract/css'; +import { ComplexStyleRule, createVar, style } from '@vanilla-extract/css'; import { RecipeVariants, recipe } from '@vanilla-extract/recipes'; import { ContainerColor, DefaultReset, Disabled, RadiiVariant, color, config, toRem } from 'folds'; -import { surfaceInk } from '../../features/scene/sceneShell.css'; -import { skyLabelInk } from '../../features/scene/skyLabelInk'; - -// Wash strengths over the scene: rows and labels are faint, and hover, selected and pressed rows -// are three distinct steps above them. -// Meta, 2026-11-09: "this UI needs no chrome". Rows and labels are bare ink on the scene; hover and selection keep a faint wash. -const SCRIM_LABEL = '0%'; -const SCRIM_ROW = '0%'; -const SCRIM_HOVER = '14%'; -const SCRIM_SELECTED = '22%'; -const SCRIM_PRESSED = '48%'; - -// The navigator's one column grid. Every row, section header and join row begins with a gutter of -// the same width, with its chevron, room icon or avatar centred in it, so every label starts at -// the same x for its depth; each nesting level (NavLevel) indents by one constant step. -const GUTTER = toRem(32); -const LEVEL_STEP = toRem(16); - -export const NavGutter = style({ - width: GUTTER, - minWidth: GUTTER, - flexShrink: 0, - display: 'flex', - alignItems: 'center', - justifyContent: 'center', -}); - -export const NavLevel = style({ - paddingLeft: LEVEL_STEP, -}); - -// Chevrons and room icons are matched in measured ink (a room glyph is about 1.7x a chevron's; unread rooms stay far above), so a foldout is not outweighed by its rooms. -export const NAV_ICON_REST_OPACITY = 0.9; -// A room's glyph is bigger and denser than the chevron, so it rests lighter to read as the same weight. -export const NAV_ROOM_ICON_REST_OPACITY = 0.26; -export const NAV_ICON_UNREAD_OPACITY = 0.6; export const NavCategory = style([ DefaultReset, @@ -47,27 +11,6 @@ export const NavCategory = style([ export const NavCategoryHeader = style({ gap: config.space.S100, - selectors: { - // The header's own side padding would shift its gutter off the rows': the section button - // carries the same left inset as NavItemContent instead. - '&&': { paddingLeft: 0 }, - }, - '@media': { - // A phone's section header is as tall as its 44 px button, so it does not overlap the next row. - 'screen and (max-width: 750px)': { - selectors: { '&&': { minHeight: toRem(44), height: toRem(44) } }, - }, - // Category labels sit on the scene like the rows do, and need a wash to be read (wide screens; - // a phone's list is plain text). - 'screen and (min-width: 751px)': { - selectors: { - ':root[data-scene] &': { - backgroundColor: `color-mix(in srgb, ${surfaceInk} ${SCRIM_LABEL}, transparent)`, - borderRadius: config.radii.R400, - }, - }, - }, - }, }); export const NavLink = style({ @@ -101,12 +44,6 @@ const getVariant = (variant: ContainerColor): ComplexStyleRule => ({ }, }); -// The room list is plain text on a phone: no pill, slab or border behind any row, and hover, -// selected and pressed show in the label (NavLabel), never in a box. Wider screens keep the rows -// and the wash. -const WIDE = 'screen and (min-width: 751px)'; -const PHONE = 'screen and (max-width: 750px)'; - const NavItemBase = style({ width: '100%', display: 'flex', @@ -117,47 +54,19 @@ const NavItemBase = style({ outline: 'none', minHeight: toRem(36), - '@media': { - [PHONE]: { - backgroundColor: 'transparent', - borderRadius: 0, - // The row is as tall as the 44 px tap target inside it (EstateNavigator.css.ts), so neighbours do not overlap. - minHeight: toRem(44), - }, - [WIDE]: { - selectors: { - '&:hover, &:focus-visible': { - backgroundColor: ContainerHover, - }, - '&[data-hover=true]': { - backgroundColor: ContainerHover, - }, - // While the background scene runs the shell is clear (sceneShell.css.ts); a row is a faint - // wash of the theme's own surface: the scene stays visible, the text stays readable. - // Hover, the selected row and a press each strengthen it a step. - ':root[data-scene] &': { - backgroundColor: `color-mix(in srgb, ${surfaceInk} ${SCRIM_ROW}, transparent)`, - }, - ':root[data-scene] &:hover, :root[data-scene] &:focus-visible, :root[data-scene] &[data-hover=true]': - { - backgroundColor: `color-mix(in srgb, ${surfaceInk} ${SCRIM_HOVER}, transparent)`, - }, - ':root[data-scene] &[aria-selected=true]': { - backgroundColor: `color-mix(in srgb, ${surfaceInk} ${SCRIM_SELECTED}, transparent)`, - }, - [`:root[data-scene] &:has(.${NavLink}:active)`]: { - backgroundColor: `color-mix(in srgb, ${surfaceInk} ${SCRIM_PRESSED}, transparent)`, - }, - [`&:has(.${NavLink}:active)`]: { - backgroundColor: ContainerActive, - }, - '&[aria-selected=true]': { - backgroundColor: ContainerActive, - }, - }, - }, - }, selectors: { + '&:hover, &:focus-visible': { + backgroundColor: ContainerHover, + }, + '&[data-hover=true]': { + backgroundColor: ContainerHover, + }, + [`&:has(.${NavLink}:active)`]: { + backgroundColor: ContainerActive, + }, + '&[aria-selected=true]': { + backgroundColor: ContainerActive, + }, [`&:has(.${NavLink}:focus-visible)`]: { outline: `${config.borderWidth.B600} solid ${ContainerLine}`, outlineOffset: `calc(-1 * ${config.borderWidth.B600})`, @@ -217,73 +126,3 @@ export const NavItemContent = style({ export const NavItemOptions = style({ paddingRight: config.space.S200, }); - -// A room's name on a phone wears the section headings' type (small caps-height, uppercase, 600, -// at heading strength) and states itself in the text: hover and focus underline it, the selected -// row is bolder and underlined, a press dims it, an unread room is at full strength. Over the scene -// a halo of the theme's own surface keeps it readable without a box. -export const NavLabel = style({}); -const label = `.${NavLabel}.${NavLabel}`; -const phoneLabel = (selector: string, rule: StyleRule) => - globalStyle(selector, { '@media': { [PHONE]: rule } }); - -phoneLabel(label, { - fontSize: toRem(12), - lineHeight: toRem(16), - fontWeight: config.fontWeight.W600, - textTransform: 'uppercase', - opacity: 0.75, - textDecorationThickness: '1px', - textUnderlineOffset: toRem(4), -}); -phoneLabel( - [ - `.${NavItemBase}:hover ${label}`, - `.${NavItemBase}:focus-visible ${label}`, - `.${NavItemBase}[data-hover=true] ${label}`, - `.${NavItemBase}[data-highlight=true] ${label}`, - ].join(', '), - { opacity: 1 } -); -phoneLabel(`.${NavItemBase}:hover ${label}, .${NavItemBase}:focus-visible ${label}`, { - textDecorationLine: 'underline', -}); -phoneLabel(`.${NavItemBase}[aria-selected=true] ${label}`, { - opacity: 1, - fontWeight: config.fontWeight.W700, - textDecorationLine: 'underline', - textDecorationThickness: '2px', -}); -phoneLabel(`.${NavItemBase}:has(.${NavLink}:active) ${label}`, { - opacity: 0.6, - textDecorationLine: 'underline', -}); -phoneLabel(`:root[data-scene] ${label}`, { - color: skyLabelInk('inherit'), - textShadow: `0 0 3px ${surfaceInk}, 0 0 8px ${surfaceInk}`, -}); - -// Icons, dots and the Join action share the label's halo over the scene. -globalStyle(`:root[data-scene] ${NavItemBase} svg, :root[data-scene] ${NavItemBase} button`, { - '@media': { - [PHONE]: { - filter: `drop-shadow(0 0 3px ${surfaceInk})`, - }, - }, -}); - -// The Join action is a plain underlined word on every screen, not a pill. -export const NavAction = style({ - selectors: { - '&&': { - backgroundColor: 'transparent', - boxShadow: 'none', - border: 'none', - borderRadius: 0, - minWidth: 0, - textDecoration: 'underline', - textUnderlineOffset: toRem(4), - flexShrink: 0, - }, - }, -}); diff --git a/src/app/components/password-input/PasswordInput.tsx b/src/app/components/password-input/PasswordInput.tsx index 6aa0d4f3..4ffe0d83 100644 --- a/src/app/components/password-input/PasswordInput.tsx +++ b/src/app/components/password-input/PasswordInput.tsx @@ -1,7 +1,6 @@ import React, { ComponentProps, forwardRef } from 'react'; import { Icon, IconButton, Input, config, Icons } from 'folds'; import { UseStateProvider } from '../UseStateProvider'; -import { PhoneHit } from '../../styles/PhoneHit.css'; type PasswordInputProps = Omit, 'type' | 'size'> & { size: '400' | '500'; @@ -24,7 +23,6 @@ export const PasswordInput = forwardRef( <> {after} setVisible(!visible)} type="button" variant={visible ? 'Warning' : variant} diff --git a/src/app/components/room-avatar/RoomAvatar.tsx b/src/app/components/room-avatar/RoomAvatar.tsx index 9015796e..cbcd626a 100644 --- a/src/app/components/room-avatar/RoomAvatar.tsx +++ b/src/app/components/room-avatar/RoomAvatar.tsx @@ -1,10 +1,9 @@ import { JoinRule } from 'matrix-js-sdk'; -import { AvatarFallback, AvatarImage, Icon, Icons } from 'folds'; +import { AvatarFallback, AvatarImage, Icon, Icons, color } from 'folds'; import React, { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react'; import * as css from './RoomAvatar.css'; import { getRoomIconSrc } from '../../utils/room'; import colorMXID from '../../../util/colorMXID'; -import { surfaceInk } from '../../features/scene/sceneShell.css'; type RoomAvatarProps = { roomId: string; @@ -22,7 +21,7 @@ export function RoomAvatar({ roomId, src, alt, renderFallback }: RoomAvatarProps if (!src || error) { return ( {renderFallback()} diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx index 64aaaacb..34a7e24b 100644 --- a/src/app/components/room-card/RoomCard.tsx +++ b/src/app/components/room-card/RoomCard.tsx @@ -1,5 +1,5 @@ import React, { ReactNode, useCallback, useRef, useState } from 'react'; -import { MatrixError } from 'matrix-js-sdk'; +import { MatrixError, Room } from 'matrix-js-sdk'; import { Avatar, Badge, @@ -31,7 +31,6 @@ import { RoomType, StateEvent } from '../../../types/matrix/room'; import { useJoinedRoomId } from '../../hooks/useJoinedRoomId'; import { useElementSizeObserver } from '../../hooks/useElementSizeObserver'; import { getRoomAvatarUrl, getStateEvent } from '../../utils/room'; -import { joinEstateRoomOrThrow } from '../../features/estate/joinEstateRoom'; import { useStateEventCallback } from '../../hooks/useStateEventCallback'; import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; @@ -198,10 +197,8 @@ export const RoomCard = as<'div', RoomCardProps>( ) ); - const [joinState, join] = useAsyncCallback( - useCallback(async () => { - await joinEstateRoomOrThrow(mx, roomIdOrAlias, viaServers); - }, [mx, roomIdOrAlias, viaServers]) + const [joinState, join] = useAsyncCallback( + useCallback(() => mx.joinRoom(roomIdOrAlias, { viaServers }), [mx, roomIdOrAlias, viaServers]) ); const joining = joinState.status === AsyncStatus.Loading || joinState.status === AsyncStatus.Success; diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx index 0c6b10df..ce550992 100644 --- a/src/app/components/room-intro/RoomIntro.tsx +++ b/src/app/components/room-intro/RoomIntro.tsx @@ -1,9 +1,7 @@ -import classNames from 'classnames'; import React, { useCallback, useState } from 'react'; import { Avatar, Box, Button, Spinner, Text, as } from 'folds'; import { Room } from 'matrix-js-sdk'; import { useAtomValue } from 'jotai'; -import { SkyPlate } from '../../features/scene/skyPlate.css'; import { IRoomCreateContent, Membership, StateEvent } from '../../../types/matrix/room'; import { getMemberDisplayName, getStateEvent } from '../../utils/room'; import { useMatrixClient } from '../../hooks/useMatrixClient'; @@ -19,13 +17,12 @@ import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; import { useSetting } from '../../state/hooks/settings'; import { settingsAtom } from '../../state/settings'; import { InviteUserPrompt } from '../invite-user-prompt'; -import { joinEstateRoomOrThrow } from '../../features/estate/joinEstateRoom'; export type RoomIntroProps = { room: Room; }; -export const RoomIntro = as<'div', RoomIntroProps>(({ room, className, ...props }, ref) => { +export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) => { const mx = useMatrixClient(); const useAuthentication = useMediaAuthentication(); const { navigateRoom } = useRoomNavigate(); @@ -46,13 +43,13 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, className, ...props const prevRoomId = createContent?.predecessor?.room_id; const [prevRoomState, joinPrevRoom] = useAsyncCallback( - useCallback((roomId: string) => joinEstateRoomOrThrow(mx, roomId), [mx]) + useCallback(async (roomId: string) => mx.joinRoom(roomId), [mx]) ); const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock'); return ( - + - + diff --git a/src/app/components/splash-screen/SplashScreen.tsx b/src/app/components/splash-screen/SplashScreen.tsx index 8e8f05b6..27adadba 100644 --- a/src/app/components/splash-screen/SplashScreen.tsx +++ b/src/app/components/splash-screen/SplashScreen.tsx @@ -21,7 +21,7 @@ export function SplashScreen({ children }: SplashScreenProps) { justifyContent="Center" > - Ratatoskr + Cinny diff --git a/src/app/components/text-viewer/TextViewer.tsx b/src/app/components/text-viewer/TextViewer.tsx index e9e150b5..ec4ed0a5 100644 --- a/src/app/components/text-viewer/TextViewer.tsx +++ b/src/app/components/text-viewer/TextViewer.tsx @@ -5,7 +5,6 @@ import { Box, Chip, Header, Icon, IconButton, Icons, Scroll, Text, as } from 'fo import { ErrorBoundary } from 'react-error-boundary'; import * as css from './TextViewer.css'; import { copyToClipboard } from '../../utils/dom'; -import { PhoneHit } from '../../styles/PhoneHit.css'; const ReactPrism = lazy(() => import('../../plugins/react-prism/ReactPrism')); @@ -54,7 +53,7 @@ export const TextViewer = as<'div', TextViewerProps>( >
- + diff --git a/src/app/components/uia-stages/PasswordStage.tsx b/src/app/components/uia-stages/PasswordStage.tsx index a7ca2d06..0164cae6 100644 --- a/src/app/components/uia-stages/PasswordStage.tsx +++ b/src/app/components/uia-stages/PasswordStage.tsx @@ -4,7 +4,6 @@ import { AuthType } from 'matrix-js-sdk'; import { StageComponentProps } from './types'; import { ErrorCode } from '../../cs-errorcode'; import { PasswordInput } from '../password-input'; -import { PhoneHit } from '../../styles/PhoneHit.css'; export function PasswordStage({ stageData, @@ -46,7 +45,7 @@ export function PasswordStage({ Account Password - +
diff --git a/src/app/components/uia-stages/SSOStage.tsx b/src/app/components/uia-stages/SSOStage.tsx index 20decb6c..e3d6126a 100644 --- a/src/app/components/uia-stages/SSOStage.tsx +++ b/src/app/components/uia-stages/SSOStage.tsx @@ -1,7 +1,6 @@ import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds'; import React, { useCallback, useEffect, useState } from 'react'; import { StageComponentProps } from './types'; -import { PhoneHit } from '../../styles/PhoneHit.css'; export function SSOStage({ ssoRedirectURL, @@ -57,7 +56,7 @@ export function SSOStage({ SSO Login - + diff --git a/src/app/components/unread-badge/UnreadBadge.tsx b/src/app/components/unread-badge/UnreadBadge.tsx index 00c7fa2f..f8bfefa3 100644 --- a/src/app/components/unread-badge/UnreadBadge.tsx +++ b/src/app/components/unread-badge/UnreadBadge.tsx @@ -22,9 +22,7 @@ export function UnreadBadge({ highlight, count }: UnreadBadgeProps) { 0 ? '400' : '200'} - // A mention and the bare unread dot are solid (a soft dot measured 1.6:1 against the ground); a plain unread - // count is a soft tint, so a row's count is never its loudest part. - fill={highlight || count === 0 ? 'Solid' : 'Soft'} + fill="Solid" radii="Pill" outlined={false} > diff --git a/src/app/components/upload-card/CompactUploadCardRenderer.tsx b/src/app/components/upload-card/CompactUploadCardRenderer.tsx index 5fe73a10..b9bada71 100644 --- a/src/app/components/upload-card/CompactUploadCardRenderer.tsx +++ b/src/app/components/upload-card/CompactUploadCardRenderer.tsx @@ -6,8 +6,6 @@ import { useMatrixClient } from '../../hooks/useMatrixClient'; import { TUploadContent } from '../../utils/matrix'; import { bytesToSize, getFileTypeIcon } from '../../utils/common'; import { useMediaConfig } from '../../hooks/useMediaConfig'; -import { UploadFailureNote } from './UploadFailureNote'; -import { PhoneHitSpread28 } from '../../styles/PhoneHit.css'; type CompactUploadCardRendererProps = { isEncrypted?: boolean; @@ -65,7 +63,6 @@ export function CompactUploadCardRenderer({ )} - + {upload.error.message} )} {upload.status === UploadStatus.Idle && fileSizeExceeded && ( diff --git a/src/app/components/upload-card/UploadCardRenderer.tsx b/src/app/components/upload-card/UploadCardRenderer.tsx index e1d12843..f5bc68e0 100644 --- a/src/app/components/upload-card/UploadCardRenderer.tsx +++ b/src/app/components/upload-card/UploadCardRenderer.tsx @@ -12,8 +12,6 @@ import { } from '../../state/room/roomInputDrafts'; import { useObjectURL } from '../../hooks/useObjectURL'; import { useMediaConfig } from '../../hooks/useMediaConfig'; -import { UploadFailureNote } from './UploadFailureNote'; -import { PhoneHitSpread28 } from '../../styles/PhoneHit.css'; type PreviewImageProps = { fileItem: TUploadItem; @@ -162,7 +160,6 @@ export function UploadCardRenderer({ )} - + {upload.error.message} )} {upload.status === UploadStatus.Idle && fileSizeExceeded && ( diff --git a/src/app/components/upload-card/UploadFailureNote.test.tsx b/src/app/components/upload-card/UploadFailureNote.test.tsx deleted file mode 100644 index c2f917ec..00000000 --- a/src/app/components/upload-card/UploadFailureNote.test.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react'; -import { renderToStaticMarkup } from 'react-dom/server'; -import { describe, expect, it } from 'vitest'; -import { uploadFailure } from '../../utils/matrix'; -import { UploadFailureNote } from './UploadFailureNote'; - -const text = (html: string) => - html - .replace(/<[^>]*>/g, ' ') - .replace(/\s+/g, ' ') - .trim(); - -describe('the failed upload card', () => { - it('leads with the reason and the next step, and keeps the diagnostics behind Details', async () => { - const error = await uploadFailure(new DOMException('', 'AbortError'), new Blob(['abcd']), { - startedAt: Date.now(), - }); - const html = renderToStaticMarkup(); - const before = html.slice(0, html.indexOf(']*>.*Details.*<\/details>/s); - expect(text(html.slice(html.indexOf(' { - const html = renderToStaticMarkup(); - expect(text(html)).toContain('Upload failed. Send again'); - expect(text(html)).toContain('boom'); - }); -}); diff --git a/src/app/components/upload-card/UploadFailureNote.tsx b/src/app/components/upload-card/UploadFailureNote.tsx deleted file mode 100644 index df4498ba..00000000 --- a/src/app/components/upload-card/UploadFailureNote.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import React from 'react'; -import { Text } from 'folds'; -import { uploadFailureText } from '../../utils/uploadReason'; - -/** A failed upload as the card shows it: the reason and what to do, the diagnostic text one tap away. */ -export function UploadFailureNote({ error }: { error: Error }) { - return ( - <> - {uploadFailureText(error)} -
- - - Details - - - - {error.message} - -
- - ); -} diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx index 5d40e10c..ee8967af 100644 --- a/src/app/components/url-preview/UrlPreviewCard.tsx +++ b/src/app/components/url-preview/UrlPreviewCard.tsx @@ -1,4 +1,3 @@ -import classNames from 'classnames'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import { IPreviewUrlResponse } from 'matrix-js-sdk'; import { Box, Icon, IconButton, Icons, Scroll, Spinner, Text, as, color, config } from 'folds'; @@ -11,7 +10,6 @@ import { useIntersectionObserver, } from '../../hooks/useIntersectionObserver'; import * as css from './UrlPreviewCard.css'; -import { PhoneHitInPlace } from '../../styles/PhoneHit.css'; import { tryDecodeURIComponent } from '../../utils/dom'; import { mxcUrlToHttp } from '../../utils/matrix'; import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; @@ -183,10 +181,7 @@ export const UrlPreviewHolder = as<'div'>(({ children, ...props }, ref) => { <>
(({ children, ...props }, ref) => { <>
{renderFallback()} diff --git a/src/app/components/user-profile/PowerChip.tsx b/src/app/components/user-profile/PowerChip.tsx index d3e9cf28..a6758300 100644 --- a/src/app/components/user-profile/PowerChip.tsx +++ b/src/app/components/user-profile/PowerChip.tsx @@ -43,7 +43,6 @@ import { getPowerTagIconSrc, useGetMemberPowerTag } from '../../hooks/useMemberP import { useRoomCreators } from '../../hooks/useRoomCreators'; import { useRoomPermissions } from '../../hooks/useRoomPermissions'; import { useMemberPowerCompare } from '../../hooks/useMemberPowerCompare'; -import { PhoneHit } from '../../styles/PhoneHit.css'; type SelfDemoteAlertProps = { power: number; @@ -71,7 +70,7 @@ function SelfDemoteAlert({ power, onCancel, onChange }: SelfDemoteAlertProps) { Self Demotion - + @@ -121,7 +120,7 @@ function SharedPowerAlert({ power, onCancel, onChange }: SharedPowerAlertProps) Shared Power - + diff --git a/src/app/features/add-existing/AddExisting.tsx b/src/app/features/add-existing/AddExisting.tsx index a57a6b10..d100096b 100644 --- a/src/app/features/add-existing/AddExisting.tsx +++ b/src/app/features/add-existing/AddExisting.tsx @@ -54,7 +54,6 @@ import { StateEvent } from '../../../types/matrix/room'; import { getViaServers } from '../../plugins/via-servers'; import { rateLimitedActions } from '../../utils/matrix'; import { useAlive } from '../../hooks/useAlive'; -import { PhoneHit } from '../../styles/PhoneHit.css'; const SEARCH_OPTS: UseAsyncSearchOptions = { limit: 500, @@ -202,7 +201,7 @@ export function AddExistingModal({ parentId, space, requestClose }: AddExistingM Add Existing - + diff --git a/src/app/features/albums/AlbumView.css.ts b/src/app/features/albums/AlbumView.css.ts deleted file mode 100644 index d60dba43..00000000 --- a/src/app/features/albums/AlbumView.css.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { style } from '@vanilla-extract/css'; -import { color, config, toRem } from 'folds'; -import { MOBILE_BREAKPOINT } from '../../hooks/useScreenSize'; - -const WIDE = `screen and (min-width: ${MOBILE_BREAKPOINT + 1}px)`; - -/** One column, bare ink on the scene. */ -export const Column = style({ - maxWidth: toRem(720), - width: '100%', - margin: '0 auto', - padding: config.space.S400, - display: 'flex', - flexDirection: 'column', - gap: config.space.S200, -}); - -/** A tappable text row: no border, no fill, at least 44 px tall. */ -export const Row = style({ - all: 'unset', - boxSizing: 'border-box', - cursor: 'pointer', - minHeight: 44, - display: 'flex', - flexDirection: 'column', - justifyContent: 'center', - gap: toRem(2), - color: color.Background.OnContainer, - ':focus-visible': { textDecoration: 'underline' }, -}); - -export const Back = style([Row, { minHeight: 44 }]); - -export const Files = style({ - display: 'flex', - flexDirection: 'column', - gap: config.space.S400, -}); - -/** Images may tile into a grid on wide screens only. */ -export const FilesWide = style({ - '@media': { - [WIDE]: { - display: 'grid', - gridTemplateColumns: 'repeat(auto-fill, minmax(220px, 1fr))', - alignItems: 'start', - }, - }, -}); - -export const Dim = style({ opacity: config.opacity.P300 }); - -/** The share panel: idle it is one row; the title, names and Send mount only once files are picked. */ -export const SharePanel = style({ - display: 'flex', - flexDirection: 'column', - gap: config.space.S200, -}); - -export const ShareTitle = style({ - all: 'unset', - boxSizing: 'border-box', - minHeight: 44, - width: '100%', - borderBottom: `1px solid ${color.Background.ContainerLine}`, - color: color.Background.OnContainer, - ':focus-visible': { borderBottomColor: color.Background.OnContainer }, -}); - -/** Picked names and send notes wrap, even a long unbroken name. */ -export const ShareNames = style({ overflowWrap: 'anywhere' }); diff --git a/src/app/features/albums/AlbumView.tsx b/src/app/features/albums/AlbumView.tsx deleted file mode 100644 index f1a7f01a..00000000 --- a/src/app/features/albums/AlbumView.tsx +++ /dev/null @@ -1,267 +0,0 @@ -import React, { useEffect, useMemo, useState } from 'react'; -import { Box, Scroll, Text } from 'folds'; -import { Room, RoomEvent } from 'matrix-js-sdk'; -import { MediaControl } from '../../components/media'; -import { AudioContent } from '../../components/message'; -import { RenderMessageContent } from '../../components/RenderMessageContent'; -import { IAudioContent } from '../../../types/matrix/common'; -import { LINKIFY_OPTS, getReactCustomHtmlParser } from '../../plugins/react-custom-html-parser'; -import { useMatrixClient } from '../../hooks/useMatrixClient'; -import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; -import { useSetting } from '../../state/hooks/settings'; -import { settingsAtom } from '../../state/settings'; -import { markAsRead } from '../../utils/notifications'; -import { getBlobSafeMimeType } from '../../utils/mimeTypes'; -import { timeDayMonYear } from '../../utils/time'; -import { getMemberDisplayName } from '../../utils/room'; -import { - Album, - AlbumFile, - TimelineEvent, - lastEvent, - looseFiles, - looseNoteFor, -} from './buildAlbums'; -import { folderOf, listFolder, pathLabel } from './albumFolders'; -import { FileReadBy } from './FileReadBy'; -import { ShareSet, useShareEnabled } from './ShareSet'; -import { useAlbums } from './useAlbums'; -import * as css from './AlbumView.css'; - -/** - * Audio goes straight to AudioContent, skipping the chat Attachment frame and file-type badge: the - * title above it is the only label and the transport controls sit on the scene. Anything that is - * not playable audio falls through to the stock renderer (a file download). - */ -const playableAudio = (content: Record) => { - const c = content as IAudioContent; - const url = c.file?.url ?? c.url; - const mimeType = getBlobSafeMimeType(c.info?.mimetype ?? ''); - if (!c.info || typeof url !== 'string' || !mimeType.startsWith('audio')) return undefined; - return { info: c.info, url, mimeType, encInfo: c.file }; -}; - -type FileRowProps = { room: Room; file: AlbumFile; author: string }; -function FileRow({ room, file, author }: FileRowProps) { - const mx = useMatrixClient(); - const useAuthentication = useMediaAuthentication(); - const [mediaAutoLoad] = useSetting(settingsAtom, 'mediaAutoLoad'); - const htmlReactParserOptions = useMemo( - () => - getReactCustomHtmlParser(mx, room.roomId, { linkifyOpts: LINKIFY_OPTS, useAuthentication }), - [mx, room.roomId, useAuthentication] - ); - const audio = file.kind === 'audio' ? playableAudio(file.content) : undefined; - return ( - - - {file.name} - - - {audio ? ( - } /> - ) : ( - () => file.content as T} - mediaAutoLoad={mediaAutoLoad} - htmlReactParserOptions={htmlReactParserOptions} - linkifyOpts={LINKIFY_OPTS} - /> - )} - - ); -} - -/** A file, and under it a row that unfolds the versions it supersedes. */ -function VersionedFileRow({ room, file, author }: FileRowProps) { - const [shown, setShown] = useState(false); - const n = file.earlier.length; - return ( - <> - - {n > 0 && ( - - )} - {shown && - file.earlier.map((e) => )} - - ); -} - -const countLabel = (n: number) => `${n} ${n === 1 ? 'file' : 'files'}`; - -/** The zone never mounts RoomTimeline, so it sends the read receipt the timeline would. */ -function useMarkZoneRead(room: Room) { - const mx = useMatrixClient(); - const [hideActivity] = useSetting(settingsAtom, 'hideActivity'); - useEffect(() => { - const mark = () => { - markAsRead(mx, room.roomId, hideActivity).catch(() => undefined); - }; - mark(); - room.on(RoomEvent.Timeline, mark); - return () => { - room.off(RoomEvent.Timeline, mark); - }; - }, [mx, room, hideActivity]); -} - -/** The file events in the room's live timeline that no album thread holds, kept current as it syncs. */ -function useLooseFiles(room: Room): AlbumFile[] { - const [, bump] = useState(0); - useEffect(() => { - const on = () => bump((n) => n + 1); - room.on(RoomEvent.Timeline, on); - room.on(RoomEvent.Redaction, on); - return () => { - room.off(RoomEvent.Timeline, on); - room.off(RoomEvent.Redaction, on); - }; - }, [room]); - const events: TimelineEvent[] = room - .getLiveTimeline() - .getEvents() - .map((e) => ({ - event_id: e.getId(), - type: e.getType(), - sender: e.getSender(), - origin_server_ts: e.getTs(), - content: e.getContent(), - unsigned: e.getUnsigned() as Record, - threadRoot: e.threadRootId, - })); - return looseFiles(events); -} - -type AlbumViewProps = { room: Room; onTimeline: () => void }; -export function AlbumView({ room, onTimeline }: AlbumViewProps) { - useMarkZoneRead(room); - const { loading, error, albums, truncated } = useAlbums(room); - const [dateFormat] = useSetting(settingsAtom, 'dateFormatString'); - const [openId, setOpenId] = useState(); - const [path, setPath] = useState([]); - const open: Album | undefined = albums.find((a) => a.id === openId); - const authorOf = (a: Album) => getMemberDisplayName(room, a.author) ?? a.author; - const encrypted = room.hasEncryptionStateEvent(); - const canShare = useShareEnabled(room); - const loose = useLooseFiles(room); - const looseNote = looseNoteFor(loose, { - open: !!open, - encrypted, - loading, - error: !!error, - }); - - let body: React.ReactNode; - if (loading) body = Loading albums…; - else if (error) body = Could not load albums: {error.message}; - else if (open) { - const images = open.files.length > 0 && open.files.every((f) => f.kind === 'image'); - body = ( - <> - - {open.title} - - {authorOf(open)} · {countLabel(open.count)} · {timeDayMonYear(open.ts, dateFormat)} - - {open.count === 0 && This album has no files.} - {canShare && ( - - )} -
- {open.files.map((f) => ( - - ))} -
- - ); - } else if (encrypted) - body = This zone is encrypted, so its albums cannot be listed here.; - else if (albums.length === 0 && path.length === 0) body = No albums yet.; - else { - const here = listFolder(albums, path); - body = ( - <> - {path.length > 0 && ( - - )} - {path.length > 0 && {pathLabel(path)}} - {here.folders.map((f) => ( - - ))} - {here.albums.map(({ album: a, leaf }) => ( - - ))} - {here.folders.length === 0 && here.albums.length === 0 && Nothing here.} - {truncated && ( - - The list is cut short: some albums or files are not loaded. - - )} - - ); - } - - return ( - -
- {body} - {looseNote && ( - - {looseNote} - - )} - {/* Stays mounted while an album is open, so a running send keeps its progress. */} - {canShare && ( - - )} - -
-
- ); -} diff --git a/src/app/features/albums/FileReadBy.tsx b/src/app/features/albums/FileReadBy.tsx deleted file mode 100644 index 28f9205c..00000000 --- a/src/app/features/albums/FileReadBy.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react'; -import { MatrixEvent, Room } from 'matrix-js-sdk'; -import { Text } from 'folds'; -import { getMemberDisplayName } from '../../utils/room'; -import { FileReader, readLine } from './fileReceipt'; -import { useFileReaders } from './useFileReaders'; -import * as css from './AlbumView.css'; - -type FileReadByProps = { - room: Room; - fileId: string; - content: Record; - /** Receipts already read elsewhere (an album's thread replies): merged with the timeline's, a Mind once. */ - also?: FileReader[]; -}; -/** "fetched for " under a file: the Minds whose verified receipts are in the room's timeline. Nothing when none. */ -export function FileReadBy({ room, fileId, content, also = [] }: FileReadByProps) { - const seen = useFileReaders(room, fileId, content); - const readers = [...new Map([...also, ...seen].map((r) => [r.sender, r])).values()].sort( - (a, b) => a.ts - b.ts - ); - if (readers.length === 0) return null; - return ( - - {readLine(readers, (id) => getMemberDisplayName(room, id) ?? id)} - - ); -} - -/** A timeline message that is a file: audio, image, video or file. */ -export const isFileMessage = (mEvent: MatrixEvent): boolean => - ['m.audio', 'm.image', 'm.video', 'm.file'].includes(mEvent.getContent().msgtype); diff --git a/src/app/features/albums/ShareSet.folder.test.tsx b/src/app/features/albums/ShareSet.folder.test.tsx deleted file mode 100644 index abb8f2bb..00000000 --- a/src/app/features/albums/ShareSet.folder.test.tsx +++ /dev/null @@ -1,140 +0,0 @@ -import React from 'react'; -import { renderToStaticMarkup } from 'react-dom/server'; -import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; -import { MatrixClientProvider } from '../../hooks/useMatrixClient'; -import { MediaConfig, MediaConfigProvider } from '../../hooks/useMediaConfig'; - -// ShareSet hands its folder to the title the send lands under. The controller is held still and its -// `run` captured, and sendShareSet records the title it was given, so the path from the `folder` -// prop to the album root's title is read without a homeserver or a DOM. -const captured = vi.hoisted(() => ({ - run: undefined as undefined | ((files: unknown[], title: string, onFile: () => void) => unknown), - maxBytes: undefined as undefined | (() => number | undefined), - titles: [] as string[], -})); - -vi.mock('./shareController', () => ({ - createShareController: (deps: { - run: NonNullable; - maxBytes: NonNullable; - }) => { - captured.run = deps.run; - captured.maxBytes = deps.maxBytes; - return { - subscribe: () => () => undefined, - getState: () => ({ files: [], title: '', phase: { kind: 'idle' }, epoch: 0 }), - pick: () => undefined, - setTitle: () => undefined, - send: () => undefined, - cancel: () => undefined, - }; - }, -})); -vi.mock('./shareSet', async (importOriginal) => ({ - ...(await importOriginal()), - sendShareSet: async (_port: unknown, into: string | { albumId: string; lastId: string }) => { - captured.titles.push(typeof into === 'string' ? into : `into:${into.albumId}@${into.lastId}`); - return { albumId: '$a', sent: 0, failed: [], failedAt: [] }; - }, -})); -vi.mock('react', async (importOriginal) => { - const actual = await importOriginal(); - // The server renderer has no snapshot for an external store; read the client one. - const useSyncExternalStore = (_sub: unknown, get: () => unknown) => get(); - return { ...actual, default: { ...actual, useSyncExternalStore }, useSyncExternalStore }; -}); - -// eslint-disable-next-line import/first -import { ShareSet } from './ShareSet'; - -const timeline: unknown[] = []; -const ev = (id: string, ts: number, threadRootId?: string, status: string | null = null) => ({ - getId: () => id, - getTs: () => ts, - threadRootId, - status, -}); -const mount = ( - folder?: string[], - into?: { albumId: string; lastId: string; lastTs: number }, - mediaConfig: MediaConfig = {} -) => { - const room = { - roomId: '!r:x', - hasEncryptionStateEvent: () => false, - getLiveTimeline: () => ({ getEvents: () => timeline }), - } as never; - renderToStaticMarkup( - - ({ event_id: '$e' }) } as never}> - - - - - - ); -}; -const send = async (typed: string) => { - await captured.run?.([], typed, () => undefined); - return captured.titles.at(-1); -}; - -describe('ShareSet: the folder reaches the album title', () => { - beforeEach(() => { - captured.run = undefined; - captured.titles.length = 0; - timeline.length = 0; - }); - - it('at the top, the typed title goes as typed', async () => { - mount(); - expect(await send('Poses')).toBe('Poses'); - }); - - it('inside a folder, the path prefixes the typed title', async () => { - mount(['cast-art', 'poses']); - expect(await send('Set 2')).toBe('cast-art/poses/Set 2'); - }); - - it('an empty typed title falls back to the default, still under the folder', async () => { - mount(['handoff']); - expect(await send(' ')).toBe('handoff/Shared files'); - }); - - it('a typed title containing a slash goes deeper', async () => { - mount(['a']); - expect(await send('b/c')).toBe('a/b/c'); - }); - - it('an existing album takes the files instead of a title, whatever the folder', async () => { - mount(['a'], { albumId: '$alb', lastId: '$last', lastTs: 5 }); - expect(await send('ignored')).toBe('into:$alb@$last'); - }); - - it('the freshest sent event of that thread in the room timeline is where the files thread after', async () => { - timeline.push( - ev('$other', 99, '$else'), - ev('$local', 98, '$alb', 'sending'), - ev('$new', 50, '$alb'), - ev('$sentNotEchoed', 60, '$alb', 'sent'), - ev('$failed', 70, '$alb', 'not_sent') - ); - mount(['a'], { albumId: '$alb', lastId: '$last', lastTs: 5 }); - expect(await send('x')).toBe('into:$alb@$sentNotEchoed'); - }); -}); - -describe('ShareSet: the homeserver upload cap reaches the controller', () => { - it('is the server-stated m.upload.size, and none when the server states none', () => { - mount([], undefined, { 'm.upload.size': 52428800 }); - expect(captured.maxBytes?.()).toBe(52428800); - mount([], undefined, {}); - expect(captured.maxBytes?.()).toBeUndefined(); - // A cap that is not a positive number is no cap, never "refuse everything". - [0, -1, Number.NaN, '50' as unknown as number].forEach((bad) => { - mount([], undefined, { 'm.upload.size': bad }); - expect(captured.maxBytes?.()).toBeUndefined(); - }); - }); -}); diff --git a/src/app/features/albums/ShareSet.test.tsx b/src/app/features/albums/ShareSet.test.tsx deleted file mode 100644 index b3da7a3d..00000000 --- a/src/app/features/albums/ShareSet.test.tsx +++ /dev/null @@ -1,123 +0,0 @@ -import React from 'react'; -import { renderToStaticMarkup } from 'react-dom/server'; -import { describe, expect, it } from 'vitest'; -import { ClientConfigProvider } from '../../hooks/useClientConfig'; -import type { ClientConfig } from '../../hooks/useClientConfig'; -import { ShareState } from './shareController'; -import { ShareSetView, shareEnabled, useShareEnabled } from './ShareSet'; - -const text = (html: string) => - html - .replace(/<[^>]*>/g, ' ') - .replace(/\s+/g, ' ') - .trim(); -const noop = () => undefined; -const file = (name: string) => ({ name, type: 'audio/ogg' } as File); - -const view = (over: Partial> = {}, adding = false) => - renderToStaticMarkup( - - ); - -describe('the share panel, drawn', () => { - it('idle: one "Share files" row and no title, names, Send or Cancel', () => { - const html = view(); - expect(text(html)).toBe('Share files ›'); - expect(html).not.toContain('aria-label="Album title"'); - expect(html).toContain('type="file"'); - expect(html).toContain('multiple'); - expect(html).toContain('hidden'); - }); - - it('picked: the title field, the names on one line, Send N files and Cancel; no pick row', () => { - const html = view({ files: [file('a.ogg'), file('b.ogg')] }); - expect(html).toContain('aria-label="Album title"'); - expect(html).toContain('placeholder="Shared files"'); - expect(text(html)).toBe('a.ogg · b.ogg Send 2 files Cancel'); - expect(text(html)).not.toContain('Share files'); - }); - - it('one picked file reads "Send 1 file"', () => { - expect(text(view({ files: [file('a.ogg')] }))).toContain('Send 1 file Cancel'); - }); - - it('sending: progress replaces Send and Cancel, and the title is locked', () => { - const html = view({ - files: [file('a'), file('b'), file('c')], - phase: { kind: 'sending', done: 2 }, - }); - expect(text(html)).toContain('Sending 2 of 3…'); - expect(text(html)).toContain('Stop'); - expect(text(html)).not.toContain('Send 3 files'); - expect(text(html)).not.toContain('Cancel'); - expect(html).toMatch( - /aria-label="Album title"[^>]*disabled|disabled[^>]*aria-label="Album title"/ - ); - }); - - it('the encrypted note shows above the kept pick', () => { - const html = view({ - files: [file('a.ogg')], - phase: { kind: 'done', text: 'Not shared: this room is encrypted.' }, - }); - expect(text(html)).toBe('Not shared: this room is encrypted. a.ogg Send 1 file Cancel'); - }); - - it('after a full success the idle row and the note show together', () => { - expect(text(view({ phase: { kind: 'done', text: 'Shared 2 files.' } }))).toBe( - 'Share files › Shared 2 files.' - ); - }); -}); - -describe('adding to an existing album', () => { - it('the idle row says Add files', () => { - expect(text(view({}, true))).toBe('Add files ›'); - }); - - it('picked: no title field, the names, Send and Cancel', () => { - const html = view({ files: [file('a.ogg')] }, true); - expect(html).not.toContain('aria-label="Album title"'); - expect(text(html)).toBe('a.ogg Send 1 file Cancel'); - }); -}); - -describe('the flag', () => { - it('off, missing or empty offers no share', () => { - expect(shareEnabled({}, false)).toBe(false); - expect(shareEnabled({ fileZoneShare: {} }, false)).toBe(false); - expect(shareEnabled({ fileZoneShare: { enabled: false } }, false)).toBe(false); - }); - - it('on offers it, except in an encrypted room', () => { - expect(shareEnabled({ fileZoneShare: { enabled: true } }, false)).toBe(true); - expect(shareEnabled({ fileZoneShare: { enabled: true } }, true)).toBe(false); - }); - - it('the hook reads the client config and the room, as AlbumView mounts it', () => { - const room = (encrypted: boolean) => ({ hasEncryptionStateEvent: () => encrypted } as never); - function Probe({ encrypted }: { encrypted: boolean }) { - return {String(useShareEnabled(room(encrypted)))}; - } - const probe = (config: ClientConfig, encrypted: boolean) => - text( - renderToStaticMarkup( - - - - ) - ); - expect(probe({}, false)).toBe('false'); - expect(probe({ fileZoneShare: { enabled: true } }, false)).toBe('true'); - expect(probe({ fileZoneShare: { enabled: true } }, true)).toBe('false'); - }); -}); diff --git a/src/app/features/albums/ShareSet.tsx b/src/app/features/albums/ShareSet.tsx deleted file mode 100644 index b7f26e7e..00000000 --- a/src/app/features/albums/ShareSet.tsx +++ /dev/null @@ -1,210 +0,0 @@ -import React, { useRef, useState, useSyncExternalStore } from 'react'; -import { Text } from 'folds'; -import { useQueryClient } from '@tanstack/react-query'; -import { EventStatus, Room } from 'matrix-js-sdk'; -import { useMatrixClient } from '../../hooks/useMatrixClient'; -import { useClientConfig } from '../../hooks/useClientConfig'; -import { useMediaConfig } from '../../hooks/useMediaConfig'; -import { uploadContent } from '../../utils/matrix'; -import { safeFile } from '../../utils/mimeTypes'; -import { getMsgContent } from '../room/msgContent'; -import { FILE_HASH_KEY, hashForSend } from './fileReceipt'; -import { ShareController, ShareState, createShareController } from './shareController'; -import { titleIn } from './albumFolders'; -import { DEFAULT_TITLE, ExistingAlbum, freshest, sendShareSet, ThreadEvent } from './shareSet'; -import * as css from './AlbumView.css'; - -/** Off unless `fileZoneShare.enabled` is true. An encrypted zone is never offered the share. */ -export const shareEnabled = ( - config: { fileZoneShare?: { enabled?: boolean } }, - encrypted: boolean -) => !!config.fileZoneShare?.enabled && !encrypted; - -export const useShareEnabled = (room: Room): boolean => - shareEnabled(useClientConfig(), room.hasEncryptionStateEvent()); - -type ShareViewProps = { - state: ShareState; - onPickClick: () => void; - onPicked: (files: File[]) => void; - onTitle: (title: string) => void; - onSend: () => void; - onCancel: () => void; - onStop: () => void; - /** Adding to an existing album: the files join it, so there is no title to ask for. */ - adding?: boolean; - inputRef?: React.Ref; -}; - -/** - * One row when idle. Picking files (any number, one picker) opens the panel: a title, the picked - * names, Send. Nothing but the row is visible until files are picked. - */ -export function ShareSetView({ - state, - onPickClick, - onPicked, - onTitle, - onSend, - onCancel, - onStop, - adding, - inputRef, -}: ShareViewProps) { - const { files, title, phase, epoch } = state; - return ( -
- onPicked(Array.from(e.target.files ?? []))} - /> - {files.length === 0 && phase.kind !== 'sending' && ( - - )} - {phase.kind === 'done' && ( - - {phase.text} - - )} - {files.length > 0 && ( - <> - {!adding && ( - onTitle(e.target.value)} - /> - )} - - {files.map((f) => f.name).join(' · ')} - - {phase.kind === 'sending' ? ( - <> - - Sending {phase.done} of {files.length}… - - - - ) : ( - <> - - - - )} - - )} -
- ); -} - -/** The sent events in the room's live timeline, as the thread view of them `freshest` reads. */ -const threadEvents = (room: Room): ThreadEvent[] => - room - .getLiveTimeline() - .getEvents() - .filter((e) => (!e.status || e.status === EventStatus.SENT) && !!e.getId()) - .map((e) => ({ id: e.getId() as string, ts: e.getTs(), threadRoot: e.threadRootId })); - -type ShareSetProps = { - room: Room; - /** The path a new album lands in: its title is prefixed by it (docs/commons-files-desk.md). */ - folder?: string[]; - /** Add the files to this album instead of making one. */ - into?: ExistingAlbum; -}; -export function ShareSet({ room, folder = [], into }: ShareSetProps) { - const mx = useMatrixClient(); - const queryClient = useQueryClient(); - const mediaConfig = useMediaConfig(); - const input = useRef(null); - // Built once per mount (AlbumView keys the panel by room): the pick lives in the controller, so a - // rerender with a new client or Room object must not build another. Live values go through `live`. - const live = useRef({ mx, room, queryClient, folder, into, mediaConfig }); - live.current = { mx, room, queryClient, folder, into, mediaConfig }; - const [controller]: [ShareController, unknown] = useState(() => - createShareController({ - roomId: room.roomId, - isEncrypted: () => live.current.room.hasEncryptionStateEvent(), - maxBytes: () => { - const cap = live.current.mediaConfig['m.upload.size']; - return typeof cap === 'number' && Number.isFinite(cap) && cap > 0 ? cap : undefined; - }, - onSent: () => - live.current.queryClient.invalidateQueries({ queryKey: ['albums', room.roomId] }), - run: (files, title, onFile, signal) => - sendShareSet( - { - signal, - send: async (content) => - (await live.current.mx.sendMessage(room.roomId, content as any)).event_id, - contentOf: async (f) => { - const file = safeFile(f.file); - const mxc = await new Promise((resolve, reject) => { - const { mx: client } = live.current; - let upload: Promise | undefined; - const abort = () => upload && client.cancelUpload(upload as never); - signal.addEventListener('abort', abort, { once: true }); - uploadContent(client, file, { - onPromise: (p) => { - upload = p; - if (signal.aborted) abort(); - }, - onSuccess: resolve, - onError: reject, - }); - }); - const content = await getMsgContent( - live.current.mx, - { - file, - originalFile: f.file, - metadata: { markedAsSpoiler: false }, - encInfo: undefined, - }, - mxc - ); - const sha256 = await hashForSend(f.file); - if (sha256) content.info = { ...content.info, [FILE_HASH_KEY]: sha256 }; - return content; - }, - onFile, - }, - live.current.into - ? freshest(live.current.into, threadEvents(live.current.room)) - : titleIn(live.current.folder, title, DEFAULT_TITLE), - files.map((file) => ({ name: file.name, mimeType: file.type, file })) - ), - }) - ); - const state = useSyncExternalStore(controller.subscribe, controller.getState); - return ( - input.current?.click()} - onPicked={controller.pick} - onTitle={controller.setTitle} - onSend={controller.send} - onCancel={controller.cancel} - onStop={controller.stop} - adding={!!into} - /> - ); -} diff --git a/src/app/features/albums/albumFolders.test.ts b/src/app/features/albums/albumFolders.test.ts deleted file mode 100644 index 9a9be53e..00000000 --- a/src/app/features/albums/albumFolders.test.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { buildAlbums } from './buildAlbums'; -import type { Album, ZoneEvent } from './buildAlbums'; -import { folderOf, listFolder, splitPath, titleIn } from './albumFolders'; -import { DEFAULT_TITLE, sendShareSet } from './shareSet'; - -const album = (id: string, title: string, ts = 1): Album => ({ - id, - title, - author: '@a:x', - ts, - files: [], - count: 0, -}); -const names = (l: ReturnType) => ({ - folders: l.folders.map((f) => `${f.name}:${f.albums}`), - albums: l.albums.map((a) => `${a.album.id}=${a.leaf}`), -}); - -describe('splitPath', () => { - it('drops empty segments and padding; dots are names, not navigation', () => { - expect(splitPath(' a // b /')).toEqual(['a', 'b']); - expect(splitPath('../x')).toEqual(['..', 'x']); - expect(splitPath('///')).toEqual([]); - }); -}); - -describe('listFolder', () => { - const all = [ - album('$1', 'handoff/2026-11/notes', 10), - album('$2', 'handoff/2026-11/plan', 30), - album('$3', 'handoff/readme', 20), - album('$4', 'cast-art', 5), - album('$5', 'Plain album', 40), - ]; - - it('root: first segments become folders (counted below, newest first); single-segment titles are albums', () => { - expect(names(listFolder(all, []))).toEqual({ - folders: ['handoff:3'], - albums: ['$5=Plain album', '$4=cast-art'], - }); - }); - - it('nested: a folder shows its sub-folders and its own albums under their leaf names', () => { - expect(names(listFolder(all, ['handoff']))).toEqual({ - folders: ['2026-11:2'], - albums: ['$3=readme'], - }); - expect(names(listFolder(all, ['handoff', '2026-11']))).toEqual({ - folders: [], - albums: ['$2=plan', '$1=notes'], - }); - }); - - it('an album titled exactly like a folder is not hidden by it', () => { - const l = listFolder([album('$a', 'x'), album('$b', 'x/y')], []); - expect(names(l)).toEqual({ folders: ['x:1'], albums: ['$a=x'] }); - expect(names(listFolder([album('$a', 'x'), album('$b', 'x/y')], ['x']))).toEqual({ - folders: [], - albums: ['$b=y'], - }); - }); - - it('a path that exists nowhere lists nothing; the prefix match is by whole segment', () => { - expect(names(listFolder(all, ['hand']))).toEqual({ folders: [], albums: [] }); - }); - - it('an untitled or all-slash album stays at the root, nowhere else', () => { - const odd = [album('$u', '///')]; - expect(names(listFolder(odd, []))).toEqual({ folders: [], albums: ['$u=///'] }); - expect(names(listFolder(odd, ['x']))).toEqual({ folders: [], albums: [] }); - expect(names(listFolder([album('$w', ' ')], []))).toEqual({ - folders: [], - albums: ['$w=Untitled album'], - }); - }); - - it('server-supplied names like "constructor" are folders, not prototype hits', () => { - expect(names(listFolder([album('$c', 'constructor/a')], []))).toEqual({ - folders: ['constructor:1'], - albums: [], - }); - }); -}); - -describe('titleIn and folderOf', () => { - it('prefixes the folder, keeps a typed sub-path, falls back to the default title', () => { - expect(titleIn([], '', DEFAULT_TITLE)).toBe(DEFAULT_TITLE); - expect(titleIn([], ' Mine ', DEFAULT_TITLE)).toBe('Mine'); - expect(titleIn(['uploads', 'me'], '', DEFAULT_TITLE)).toBe(`uploads/me/${DEFAULT_TITLE}`); - expect(titleIn(['uploads'], 'a/b', DEFAULT_TITLE)).toBe('uploads/a/b'); - }); - - it('folderOf is the title path without its leaf', () => { - expect(folderOf(album('$', 'a/b/c'))).toEqual(['a', 'b']); - expect(folderOf(album('$', 'c'))).toEqual([]); - }); -}); - -describe('a share into a folder, read back as the viewer reads it', () => { - it('posts a root titled under the folder, and buildAlbums + listFolder put it in that folder', async () => { - const sent: Record[] = []; - const res = await sendShareSet( - { - send: async (c) => { - sent.push(c); - return `$e${sent.length}`; - }, - contentOf: async (f) => ({ msgtype: 'm.file', body: f.name, filename: f.name }), - }, - titleIn(['uploads', 'meta'], 'Photos', DEFAULT_TITLE), - [{ name: 'a.png', mimeType: 'image/png' }] - ); - expect(res.sent).toBe(1); - expect(sent[0]).toEqual({ msgtype: 'm.text', body: 'uploads/meta/Photos' }); - - const asEvent = (c: Record, id: string): ZoneEvent => ({ - event_id: id, - type: 'm.room.message', - sender: '@a:x', - origin_server_ts: 1, - content: c, - }); - const albums = buildAlbums([ - { root: asEvent(sent[0], '$e1'), replies: [asEvent(sent[1], '$e2')] }, - ]); - expect(names(listFolder(albums, []))).toEqual({ folders: ['uploads:1'], albums: [] }); - expect(names(listFolder(albums, ['uploads', 'meta']))).toEqual({ - folders: [], - albums: ['$e1=Photos'], - }); - }); -}); diff --git a/src/app/features/albums/albumFolders.ts b/src/app/features/albums/albumFolders.ts deleted file mode 100644 index a74d363f..00000000 --- a/src/app/features/albums/albumFolders.ts +++ /dev/null @@ -1,73 +0,0 @@ -// Pure: folders are albums whose title is a `/`-separated path (docs/commons-files-desk.md, "Folders"). -// No wire change: the album is still one thread root; the folder tree is only how the list is grouped. -import { Album, UNTITLED } from './buildAlbums'; - -/** A path as segments. Empty segments and surrounding space drop out; `.` and `..` are ordinary names, never navigation. */ -export const splitPath = (title: string): string[] => - title - .split('/') - .map((s) => s.trim()) - .filter(Boolean); - -export type FolderEntry = { - name: string; - /** Segments from the root to this folder. */ - path: string[]; - /** Albums at any depth below. */ - albums: number; - /** The newest album ts below, for ordering. */ - ts: number; -}; - -export type AlbumEntry = { album: Album; leaf: string }; - -export type FolderListing = { folders: FolderEntry[]; albums: AlbumEntry[] }; - -const startsWith = (path: string[], prefix: string[]) => prefix.every((seg, i) => path[i] === seg); - -/** - * What one folder shows: its direct sub-folders and the albums titled exactly at its path plus a leaf. - * An album titled `x` and a folder `x/` coexist at the same level; neither hides the other. Newest first, both lists. - */ -export const listFolder = (albums: readonly Album[], at: string[]): FolderListing => { - const folders = new Map(); - const direct: AlbumEntry[] = []; - albums.forEach((album) => { - const segs = splitPath(album.title); - if (segs.length === 0) { - // An untitled or all-slash title lives at the root under the title as written. - if (at.length === 0) direct.push({ album, leaf: album.title.trim() || UNTITLED }); - return; - } - if (!startsWith(segs, at)) return; - // An album titled exactly at this path sits in the parent, not inside the folder it shares a name with. - if (segs.length <= at.length) return; - if (segs.length === at.length + 1) { - direct.push({ album, leaf: segs[segs.length - 1] }); - return; - } - const name = segs[at.length]; - const f = folders.get(name) ?? { name, path: [...at, name], albums: 0, ts: 0 }; - f.albums += 1; - f.ts = Math.max(f.ts, album.ts); - folders.set(name, f); - }); - return { - folders: [...folders.values()].sort((a, b) => b.ts - a.ts), - albums: direct.sort((a, b) => b.album.ts - a.album.ts), - }; -}; - -/** The folder an album sits in: its title path without the leaf. */ -export const folderOf = (album: Album): string[] => splitPath(album.title).slice(0, -1); - -/** - * The title a share sends into `folder`: the folder path then what the sender typed. The typed title - * may itself contain `/`, which just goes deeper. An empty typed title falls back to `fallback`. - */ -export const titleIn = (folder: string[], typed: string, fallback: string): string => { - const leaf = splitPath(typed).join('/') || fallback; - return [...folder, leaf].join('/'); -}; - -export const pathLabel = (path: string[]): string => path.join(' / '); diff --git a/src/app/features/albums/buildAlbums.test.ts b/src/app/features/albums/buildAlbums.test.ts deleted file mode 100644 index e1e7964b..00000000 --- a/src/app/features/albums/buildAlbums.test.ts +++ /dev/null @@ -1,336 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { AlbumInput, ZoneEvent, buildAlbums, lastEvent } from './buildAlbums'; - -const root = (id: string, ts: number, over: Partial = {}): ZoneEvent => ({ - event_id: id, - type: 'm.room.message', - sender: '@void:x', - origin_server_ts: ts, - content: { msgtype: 'm.text', body: `album ${id}` }, - ...over, -}); -const reply = (id: string, ts: number, msgtype: string, body = id, extra = {}): ZoneEvent => ({ - event_id: id, - type: 'm.room.message', - sender: '@void:x', - origin_server_ts: ts, - content: { msgtype, body, ...extra }, -}); -const one = (r: ZoneEvent, replies: ZoneEvent[]) => buildAlbums([{ root: r, replies }])[0]; - -describe('buildAlbums', () => { - it('lists the newest album first', () => { - const inputs: AlbumInput[] = [ - { root: root('$old', 100), replies: [] }, - { root: root('$new', 300), replies: [] }, - { root: root('$mid', 200), replies: [] }, - ]; - expect(buildAlbums(inputs).map((a) => a.id)).toEqual(['$new', '$mid', '$old']); - }); - - it('takes title, author and date from the root', () => { - const a = one(root('$r', 555, { sender: '@eureka:x' }), []); - expect([a.title, a.author, a.ts]).toEqual(['album $r', '@eureka:x', 555]); - }); - - it('lists files oldest first whatever order the server returned them in', () => { - const a = one(root('$r', 1), [ - reply('$c', 30, 'm.audio'), - reply('$a', 10, 'm.audio'), - reply('$b', 20, 'm.audio'), - ]); - expect(a.files.map((f) => f.id)).toEqual(['$a', '$b', '$c']); - }); - - it('counts media replies only; a text reply is not a file', () => { - const a = one(root('$r', 1), [ - reply('$t', 5, 'm.text', 'nice'), - reply('$n', 6, 'm.notice', 'bot'), - reply('$a', 10, 'm.audio'), - reply('$f', 11, 'm.file'), - ]); - expect(a.count).toBe(2); - expect(a.files.map((f) => f.id)).toEqual(['$a', '$f']); - }); - - it('keeps a root with no media as an album of zero files', () => { - const a = one(root('$r', 1), [reply('$t', 5, 'm.text')]); - expect(a).toMatchObject({ id: '$r', count: 0, files: [], cover: undefined }); - }); - - it('uses the first image as the cover', () => { - const a = one(root('$r', 1), [ - reply('$a', 5, 'm.audio'), - reply('$i2', 20, 'm.image'), - reply('$i1', 10, 'm.image'), - ]); - expect(a.cover?.id).toBe('$i1'); - expect(one(root('$q', 1), [reply('$a', 5, 'm.audio')]).cover).toBeUndefined(); - }); - - it('derives the kind from the msgtype', () => { - const a = one(root('$r', 1), [ - reply('$1', 1, 'm.audio'), - reply('$2', 2, 'm.image'), - reply('$3', 3, 'm.video'), - reply('$4', 4, 'm.file'), - ]); - expect(a.files.map((f) => f.kind)).toEqual(['audio', 'image', 'video', 'file']); - }); - - it('names a file by filename, else body', () => { - const a = one(root('$r', 1), [ - reply('$1', 1, 'm.audio', 'caption', { filename: 'clip.wav' }), - reply('$2', 2, 'm.audio', 'plain.wav'), - ]); - expect(a.files.map((f) => f.name)).toEqual(['clip.wav', 'plain.wav']); - }); - - it('does not duplicate a file the relations endpoint returned twice', () => { - const a = one(root('$r', 1), [reply('$a', 5, 'm.audio'), reply('$a', 5, 'm.audio')]); - expect(a.count).toBe(1); - }); - - it('does not duplicate an album listed twice', () => { - expect( - buildAlbums([ - { root: root('$r', 1), replies: [] }, - { root: root('$r', 1), replies: [] }, - ]) - ).toHaveLength(1); - }); - - it('skips redacted and empty events', () => { - const redacted = { - ...reply('$x', 5, 'm.audio'), - content: {}, - unsigned: { redacted_because: {} }, - }; - const stillTyped = { ...reply('$y', 6, 'm.audio'), unsigned: { redacted_because: {} } }; - const empty: ZoneEvent = { event_id: '$z' }; - const a = one(root('$r', 1), [redacted, stillTyped, empty, reply('$ok', 7, 'm.audio')]); - expect(a.files.map((f) => f.id)).toEqual(['$ok']); - expect(buildAlbums([{ root: root('$g', 1, { content: {} }), replies: [] }])).toEqual([]); - expect( - buildAlbums([{ root: root('$h', 1, { unsigned: { redacted_because: {} } }), replies: [] }]) - ).toEqual([]); - }); - - it('tolerates events with missing fields', () => { - const a = one({ event_id: '$r', content: { msgtype: 'm.text' } }, [ - { event_id: '$a', content: { msgtype: 'm.audio' } }, - ]); - expect(a).toMatchObject({ title: 'Untitled album', author: '', ts: 0, count: 1 }); - }); - - it('does not read inherited object keys as file kinds', () => { - const a = one(root('$r', 1), [ - reply('$c', 1, 'constructor'), - reply('$p', 2, '__proto__'), - reply('$t', 3, 'toString'), - ]); - expect(a.count).toBe(0); - }); - - it('skips events that are not room messages even if their content looks like media', () => { - const reaction = { ...reply('$x', 5, 'm.audio'), type: 'm.reaction' }; - const a = one(root('$r', 1), [reaction, reply('$ok', 6, 'm.audio')]); - expect(a.files.map((f) => f.id)).toEqual(['$ok']); - expect(buildAlbums([{ root: root('$g', 1, { type: 'm.reaction' }), replies: [] }])).toEqual([]); - }); - - it('skips events without an event id', () => { - const anon: ZoneEvent = { type: 'm.room.message', content: { msgtype: 'm.audio', body: 'a' } }; - expect(one(root('$r', 1), [anon]).count).toBe(0); - expect( - buildAlbums([{ root: { content: { msgtype: 'm.text', body: 'x' } }, replies: [] }]) - ).toEqual([]); - }); - - it('titles an edited album by its latest edit', () => { - const edited = root('$r', 1, { - unsigned: { - 'm.relations': { - 'm.replace': { content: { 'm.new_content': { msgtype: 'm.text', body: 'renamed' } } }, - }, - }, - }); - expect(one(edited, []).title).toBe('renamed'); - const emptyEdit = root('$q', 1, { unsigned: { 'm.relations': { 'm.replace': {} } } }); - expect(one(emptyEdit, []).title).toBe('album $q'); - }); - - it('survives null or non-object entries in inputs and replies', () => { - const bad = [null, undefined, 'x', 7] as unknown as ZoneEvent[]; - const a = buildAlbums([ - null as unknown as AlbumInput, - { root: null as unknown as ZoneEvent, replies: [] }, - { root: root('$r', 1), replies: [...bad, reply('$ok', 2, 'm.audio')] }, - { root: root('$s', 2), replies: null as unknown as ZoneEvent[] }, - ]); - expect(a.map((x) => x.id)).toEqual(['$s', '$r']); - expect(a[1].files.map((f) => f.id)).toEqual(['$ok']); - }); - - it('treats a non-numeric timestamp as 0 so it sorts first, not by string order', () => { - const a = one(root('$r', 1), [ - reply('$b', 20, 'm.audio'), - { ...reply('$bad', 0, 'm.audio'), origin_server_ts: '5' as unknown as number }, - { ...reply('$nan', 0, 'm.audio'), origin_server_ts: NaN }, - reply('$a', 10, 'm.audio'), - ]); - expect(a.files.map((f) => f.id)).toEqual(['$bad', '$nan', '$a', '$b']); - const albums = buildAlbums([ - { root: root('$x', 100), replies: [] }, - { root: root('$y', 0, { origin_server_ts: '999' as unknown as number }), replies: [] }, - ]); - expect(albums.map((x) => [x.id, x.ts])).toEqual([ - ['$x', 100], - ['$y', 0], - ]); - }); - - it('gives an album with an empty body a fallback title', () => { - expect(one(root('$r', 1, { content: { msgtype: 'm.text', body: '' } }), []).title).toBe( - 'Untitled album' - ); - expect(one(root('$q', 1, { content: { msgtype: 'm.text' } }), []).title).toBe('Untitled album'); - }); - - it('never counts an edit event as a file or an album', () => { - const edit = reply('$e', 9, 'm.audio', '* x', { - 'm.relates_to': { rel_type: 'm.replace', event_id: '$a' }, - 'm.new_content': { msgtype: 'm.audio', body: 'x' }, - }); - const a = one(root('$r', 1), [reply('$a', 5, 'm.audio'), edit]); - expect(a.files.map((f) => f.id)).toEqual(['$a']); - const rootEdit = root('$re', 1, { - content: { msgtype: 'm.text', body: '* t', 'm.relates_to': { rel_type: 'm.replace' } }, - }); - expect(buildAlbums([{ root: rootEdit, replies: [] }])).toEqual([]); - const threaded = reply('$t', 6, 'm.audio', 't', { - 'm.relates_to': { rel_type: 'm.thread', event_id: '$r' }, - }); - expect(one(root('$q', 1), [threaded]).count).toBe(1); - }); -}); - -describe('versions', () => { - const v = (id: string, ts: number, replaces?: string) => - reply(id, ts, 'm.file', id, replaces ? { 'org.gamecult.publish': { replaces } } : {}); - - it('lists the latest of a chain and folds the earlier versions under it', () => { - const a = one(root('$r', 1), [v('$v1', 10), v('$v2', 20, '$v1'), reply('$x', 30, 'm.file')]); - expect(a.files.map((f) => [f.id, f.earlier.map((e) => e.id)])).toEqual([ - ['$v2', ['$v1']], - ['$x', []], - ]); - expect(a.count).toBe(2); - }); -}); - -describe('versions: cover and sender', () => { - it('the cover comes from the shown version, not a folded image', () => { - const img = (id: string, ts: number, type: string, replaces?: string) => - reply(id, ts, type, id, replaces ? { 'org.gamecult.publish': { replaces } } : {}); - const a = one(root('$r', 1), [img('$v1', 10, 'm.image'), img('$v2', 20, 'm.file', '$v1')]); - expect(a.files.map((f) => f.id)).toEqual(['$v2']); - expect(a.cover).toBeUndefined(); - }); -}); - -describe('lastEvent', () => { - it('is the newest event of the thread, a folded version included; the root when empty', () => { - const v = (id: string, ts: number, replaces?: string) => - reply(id, ts, 'm.file', id, replaces ? { 'org.gamecult.publish': { replaces } } : {}); - expect(lastEvent(one(root('$r', 1), [v('$a', 10), v('$b', 20, '$a'), v('$c', 15)]))).toEqual({ - id: '$b', - ts: 20, - }); - expect(lastEvent(one(root('$r', 1), []))).toEqual({ id: '$r', ts: 1 }); - }); -}); - -describe('Mind receipts', () => { - const HASH = 'a'.repeat(64); - const file = (id: string, sha?: string) => - reply(id, 10, 'm.audio', id, { info: sha ? { sha256: sha } : {} }); - const receipt = ( - id: string, - ts: number, - sender: string, - fileId: unknown, - sha?: unknown, - extra: Record = {} - ) => - ({ - event_id: id, - type: 'org.gamecult.file_received', - sender, - origin_server_ts: ts, - content: { 'org.gamecult.file_received': { event_id: fileId, sha256: sha, ...extra } }, - } as ZoneEvent); - - const oneX = (r: ZoneEvent, replies: ZoneEvent[]) => buildAlbums([{ root: r, replies }], 'x')[0]; - - it('shows who read a file when the receipt carries the file event hash', () => { - const a = oneX(root('$r', 1), [file('$f', HASH), receipt('$x', 20, '@void:x', '$f', HASH)]); - expect(a.files[0].readBy).toEqual([{ sender: '@void:x', ts: 20 }]); - expect(a.count).toBe(1); - }); - it('counts nothing for a hash that differs, a missing hash on either side, or a bad hash', () => { - const a = oneX(root('$r', 1), [ - file('$f', HASH), - file('$g'), - receipt('$x', 20, '@void:x', '$f', 'b'.repeat(64)), - receipt('$y', 21, '@void:x', '$g', HASH), - receipt('$z', 22, '@void:x', '$f', undefined), - receipt('$w', 23, '@void:x', '$f', 7), - ]); - expect(a.files.every((f) => f.readBy.length === 0)).toBe(true); - }); - it('trusts the event sender, never a Mind field inside the content', () => { - const a = oneX(root('$r', 1), [ - file('$f', HASH), - receipt('$x', 20, '@mallory:x', '$f', HASH, { mind: 'void', sender: '@void:x' }), - ]); - expect(a.files[0].readBy).toEqual([]); - }); - it('counts only a Mind of this homeserver: not another server, a lookalike, or a bare name', () => { - const a = oneX(root('$r', 1), [ - file('$f', HASH), - receipt('$x', 20, '@void-fan:x', '$f', HASH), - receipt('$y', 21, '@x:void', '$f', HASH), - receipt('$z', 22, '@aqua:x', '$f', HASH), - receipt('$e', 23, '@void:evil.example', '$f', HASH), - receipt('$b', 24, 'void:x', '$f', HASH), - ]); - expect(a.files[0].readBy.map((r) => r.sender)).toEqual(['@aqua:x']); - }); - it('keeps one receipt per Mind, the latest, and a second Mind beside it', () => { - const a = oneX(root('$r', 1), [ - file('$f', HASH), - receipt('$1', 20, '@void:x', '$f', HASH), - receipt('$2', 30, '@void:x', '$f', HASH), - receipt('$3', 25, '@eureka:x', '$f', HASH), - ]); - expect(a.files[0].readBy).toEqual([ - { sender: '@eureka:x', ts: 25 }, - { sender: '@void:x', ts: 30 }, - ]); - }); - it('ignores a receipt for a file not in the album, a malformed one, and a redacted one', () => { - const redacted = { - ...receipt('$d', 20, '@void:x', '$f', HASH), - unsigned: { redacted_because: {} }, - }; - const a = oneX(root('$r', 1), [ - file('$f', HASH), - receipt('$a', 20, '@void:x', '$elsewhere', HASH), - receipt('$b', 21, '@void:x', 42, HASH), - redacted, - ]); - expect(a.files[0].readBy).toEqual([]); - expect(a.count).toBe(1); - }); -}); diff --git a/src/app/features/albums/buildAlbums.ts b/src/app/features/albums/buildAlbums.ts deleted file mode 100644 index 5d3662e1..00000000 --- a/src/app/features/albums/buildAlbums.ts +++ /dev/null @@ -1,184 +0,0 @@ -// Pure: turns the thread roots of a file-zone room and each root's thread replies, in the JSON -// Synapse returns from GET /rooms/{roomId}/threads and GET /rooms/{roomId}/relations/{root}/m.thread, -// into albums. See docs/file-zone.md for the rulings this encodes. -import { readersOf } from './fileReceipt'; -import type { FileReader } from './fileReceipt'; -import { foldVersions } from './versions'; - -/** The slice of a Matrix event this module reads. Every field may be missing. */ -export type ZoneEvent = { - event_id?: string; - type?: string; - sender?: string; - origin_server_ts?: number; - content?: Record; - unsigned?: Record; -}; - -export type AlbumInput = { root: ZoneEvent; replies: ZoneEvent[] }; - -export type FileKind = 'audio' | 'image' | 'video' | 'file'; - -export type AlbumFile = { - id: string; - kind: FileKind; - name: string; - sender: string; - ts: number; - /** The event content, as RenderMessageContent reads it. */ - content: Record; - /** Receipts in this album that name this file, one per sender (the latest), oldest first. */ - readBy: FileReader[]; - /** The versions this file supersedes, nearest first (`org.gamecult.publish.replaces`). */ - earlier: AlbumFile[]; -}; - -export type Album = { - id: string; - title: string; - author: string; - ts: number; - cover?: AlbumFile; - files: AlbumFile[]; - count: number; -}; - -// A Map, not an object: msgtype is server-supplied and "constructor" must not name a kind. -const KIND_OF_MSGTYPE = new Map([ - ['m.audio', 'audio'], - ['m.image', 'image'], - ['m.video', 'video'], - ['m.file', 'file'], -]); - -// A redacted event keeps its id but loses its content and gains unsigned.redacted_because. -const live = ( - e: ZoneEvent -): e is ZoneEvent & { event_id: string; content: Record } => - !!e && - typeof e === 'object' && - !!e.event_id && - // An edit is an m.room.message too, but it revises an event; it is never a file or an album. - (e.content?.['m.relates_to'] as { rel_type?: unknown } | undefined)?.rel_type !== 'm.replace' && - !e.unsigned?.redacted_because && - (e.type === undefined || e.type === 'm.room.message') && - typeof e.content?.msgtype === 'string'; - -const tsOf = (v: unknown): number => (typeof v === 'number' && Number.isFinite(v) ? v : 0); - -const asString = (v: unknown): string => (typeof v === 'string' ? v : ''); - -export const toFile = (e: ZoneEvent): AlbumFile | undefined => { - if (!live(e)) return undefined; - const kind = KIND_OF_MSGTYPE.get(e.content.msgtype as string); - if (!kind) return undefined; - return { - id: e.event_id, - kind, - name: asString(e.content.filename) || asString(e.content.body), - sender: e.sender ?? '', - ts: tsOf(e.origin_server_ts), - content: e.content, - readBy: [], - earlier: [], - }; -}; - -export const UNTITLED = 'Untitled album'; - -// An edited root carries its latest edit under unsigned["m.relations"]["m.replace"]; the title is -// that edit's m.new_content.body, else the original body. -const titleOf = (root: ZoneEvent & { content: Record }): string => { - const relations = root.unsigned?.['m.relations'] as Record | undefined; - const edit = relations?.['m.replace'] as ZoneEvent | undefined; - const edited = (edit?.content?.['m.new_content'] as Record | undefined)?.body; - return asString(edited) || asString(root.content.body) || UNTITLED; -}; - -const toAlbum = (input: AlbumInput, server: string): Album | undefined => { - const { root, replies } = input ?? {}; - if (!live(root)) return undefined; - const seen = new Set(); - const list = Array.isArray(replies) ? replies : []; - const files = list - .map(toFile) - .filter((f): f is AlbumFile => { - if (!f || seen.has(f.id)) return false; - seen.add(f.id); - return true; - }) - .sort((a, b) => a.ts - b.ts) - .map((f) => ({ ...f, readBy: readersOf(list, f.id, f.content, server) })); - const heads = foldVersions(files); - return { - id: root.event_id, - title: titleOf(root), - author: root.sender ?? '', - ts: tsOf(root.origin_server_ts), - cover: heads.find((f) => f.kind === 'image'), - files: heads, - count: heads.length, - }; -}; - -/** Newest album first; files oldest first. Loose room messages never reach this function. */ -/** `server` is the homeserver's own domain: only its Minds' receipts count. */ -export const buildAlbums = (inputs: AlbumInput[], server = ''): Album[] => { - const seen = new Set(); - return inputs - .map((i) => toAlbum(i, server)) - .filter((a): a is Album => { - if (!a || seen.has(a.id)) return false; - seen.add(a.id); - return true; - }) - .sort((a, b) => b.ts - a.ts); -}; - -/** The newest event in an album's thread (shown or folded), else its root: where a new file threads after. */ -export const lastEvent = (album: Album): { id: string; ts: number } => - album.files - .flatMap((f) => [f, ...f.earlier]) - .reduce<{ id: string; ts: number }>((a, f) => (f.ts >= a.ts ? { id: f.id, ts: f.ts } : a), { - id: album.id, - ts: album.ts, - }); - -/** A room event with the thread root the SDK resolved for it, when it has one. */ -export type TimelineEvent = ZoneEvent & { threadRoot?: string }; - -/** - * File events that sit in the room outside any album thread: what a poster that does not thread - * its files leaves behind. The album list never reads them (it lists threads), so they are named - * to the sender instead of left out silently. - */ -export const looseFiles = (events: TimelineEvent[]): AlbumFile[] => - events - .filter((e) => { - const rel = e?.content?.['m.relates_to'] as { rel_type?: unknown } | undefined; - return !e?.threadRoot && rel?.rel_type !== 'm.thread'; - }) - .map(toFile) - .filter((f): f is AlbumFile => !!f); - -const NAMED = 3; - -/** The line that says loose files exist and are not listed; empty when there are none. */ -export const looseNote = (files: AlbumFile[]): string => { - if (files.length === 0) return ''; - const names = files.slice(0, NAMED).map((f) => f.name || 'unnamed'); - const more = files.length > NAMED ? ` and ${files.length - NAMED} more` : ''; - const what = files.length === 1 ? '1 file was' : `${files.length} files were`; - return `${what} posted outside an album and ${ - files.length === 1 ? 'is' : 'are' - } not listed here: ${names.join(', ')}${more}. ${ - files.length === 1 ? 'It is' : 'They are' - } in the Timeline.`; -}; - -/** Where the album view stands when it decides whether to show the loose-files note. */ -export type ViewState = { open: boolean; encrypted: boolean; loading: boolean; error: boolean }; - -/** The note for the list view only: never inside an open album, an encrypted zone, or a load that is not finished. */ -export const looseNoteFor = (files: AlbumFile[], view: ViewState): string => - view.open || view.encrypted || view.loading || view.error ? '' : looseNote(files); diff --git a/src/app/features/albums/fileReceipt.test.ts b/src/app/features/albums/fileReceipt.test.ts deleted file mode 100644 index c3c85f5e..00000000 --- a/src/app/features/albums/fileReceipt.test.ts +++ /dev/null @@ -1,165 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { ReceiptEvent, hashForSend, readLine, readersOf, sha256Hex } from './fileReceipt'; - -describe('sha256Hex', () => { - it('hashes the bytes: the FIPS 180 vector for "abc"', async () => { - expect(await sha256Hex(new Blob(['abc']))).toBe( - 'ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad' - ); - }); - it('hashes empty input', async () => { - expect(await sha256Hex(new Blob([]))).toBe( - 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - ); - }); -}); - -describe('hashForSend', () => { - it('gives no hash, and does not throw, when the blob cannot be read', async () => { - const broken = { arrayBuffer: () => Promise.reject(new Error('gone')) } as unknown as Blob; - expect(await hashForSend(broken)).toBeUndefined(); - }); -}); - -describe('readLine', () => { - it('names each reader', () => { - const name = (s: string) => s.slice(1, s.indexOf(':')); - expect( - readLine( - [ - { sender: '@void:x', ts: 1 }, - { sender: '@eureka:x', ts: 2 }, - ], - name - ) - ).toBe('fetched for void, eureka'); - }); -}); - -describe('readersOf: receipts anywhere in the room, thread reply or plain event', () => { - const HASH = 'a'.repeat(64); - const file = { info: { sha256: HASH } }; - const receipt = ( - id: string, - ts: number, - sender: string, - sha: unknown | undefined, - fileId: string | undefined, - relates?: object - ): ReceiptEvent => ({ - event_id: id, - type: 'org.gamecult.file_received', - sender, - origin_server_ts: ts, - content: { - ...(relates ? { 'm.relates_to': relates } : {}), - 'org.gamecult.file_received': { - event_id: fileId ?? '$f', - sha256: sha === undefined ? HASH : sha, - }, - }, - }); - const readers = (events: ReceiptEvent[], content: Record | undefined) => - readersOf(events, '$f', content, 'gamecult.org').map((r) => r.sender); - - it('counts a threadless receipt, as a composer file with no album root gets', () => { - expect(readers([receipt('$1', 5, '@void:gamecult.org', undefined, undefined)], file)).toEqual([ - '@void:gamecult.org', - ]); - }); - it('counts a thread reply the same way', () => { - const t = { rel_type: 'm.thread', event_id: '$root' }; - expect(readers([receipt('$1', 5, '@eureka:gamecult.org', HASH, '$f', t)], file)).toEqual([ - '@eureka:gamecult.org', - ]); - }); - it('refuses lookalike localparts and foreign servers', () => { - expect( - readers( - [ - receipt('$1', 1, '@void2:gamecult.org', undefined, undefined), - receipt('$2', 2, '@voidd:gamecult.org', undefined, undefined), - receipt('$3', 3, '@Void:gamecult.org', undefined, undefined), - receipt('$4', 4, '@void:evil.example', undefined, undefined), - receipt('$5', 5, '@void:gamecult.org.evil.example', undefined, undefined), - receipt('$6', 6, '@mallory:gamecult.org', undefined, undefined), - ], - file - ) - ).toEqual([]); - }); - it('shows nothing for a mismatched hash, a file with no hash, or another file', () => { - expect( - readers([receipt('$1', 1, '@void:gamecult.org', 'b'.repeat(64), undefined)], file) - ).toEqual([]); - expect( - readers([receipt('$1', 1, '@void:gamecult.org', undefined, undefined)], { info: {} }) - ).toEqual([]); - expect( - readers([receipt('$1', 1, '@void:gamecult.org', undefined, undefined)], undefined) - ).toEqual([]); - expect(readers([receipt('$1', 1, '@void:gamecult.org', HASH, '$other')], file)).toEqual([]); - }); - it('keeps one entry per Mind, the latest, oldest first', () => { - expect( - readersOf( - [ - receipt('$1', 30, '@void:gamecult.org', undefined, undefined), - receipt('$2', 10, '@void:gamecult.org', undefined, undefined), - receipt('$3', 20, '@aqua:gamecult.org', undefined, undefined), - ], - '$f', - file, - 'gamecult.org' - ) - ).toEqual([ - { sender: '@aqua:gamecult.org', ts: 20 }, - { sender: '@void:gamecult.org', ts: 30 }, - ]); - }); - it('ignores a redacted receipt and a malformed one', () => { - const redacted = { - ...receipt('$1', 1, '@void:gamecult.org', undefined, undefined), - unsigned: { redacted_because: {} }, - }; - expect( - readers( - [ - redacted, - receipt('$2', 2, '@void:gamecult.org', 7, undefined), - { - ...receipt('$3', 3, '@void:gamecult.org', undefined, undefined), - type: 'm.room.message', - }, - ], - file - ) - ).toEqual([]); - }); - - describe('an m.reference to the file', () => { - const ref = (id: string) => ({ rel_type: 'm.reference', event_id: id }); - it('counts when it names the same event as the content', () => { - expect( - readers([receipt('$1', 1, '@void:gamecult.org', HASH, '$f', ref('$f'))], file) - ).toEqual(['@void:gamecult.org']); - }); - it('counts for nothing when it names another event', () => { - expect( - readers([receipt('$1', 1, '@void:gamecult.org', HASH, '$f', ref('$other'))], file) - ).toEqual([]); - }); - it('draws one entry per Mind however many receipts exist', () => { - expect( - readers( - [ - receipt('$1', 1, '@void:gamecult.org', HASH, '$f', ref('$f')), - receipt('$2', 2, '@void:gamecult.org', HASH, '$f'), - receipt('$3', 3, '@void:gamecult.org', HASH, '$f', ref('$f')), - ], - file - ) - ).toEqual(['@void:gamecult.org']); - }); - }); -}); diff --git a/src/app/features/albums/fileReceipt.ts b/src/app/features/albums/fileReceipt.ts deleted file mode 100644 index 93fa73f0..00000000 --- a/src/app/features/albums/fileReceipt.ts +++ /dev/null @@ -1,89 +0,0 @@ -// The file-zone Mind contract (docs/file-zone-mind-contract.md): the plaintext hash a sender writes -// into a file event, and the receipt a Mind answers with. - -import { MINDS } from '../../components/message/pose/poses'; - -/** A Mind's verified receipt for one file: its sender, who the Matrix server says posted it. */ -export type FileReader = { sender: string; ts: number }; - -/** The slice of a Matrix event a receipt is read from. Every field may be missing. */ -export type ReceiptEvent = { - event_id?: string; - type?: string; - sender?: string; - origin_server_ts?: number; - content?: Record; - unsigned?: Record; -}; - -/** Hex sha256 of the plaintext bytes, written at `content.info[FILE_HASH_KEY]` in unencrypted rooms. */ -export const FILE_HASH_KEY = 'sha256'; - -/** A Mind's receipt: event type, and the content key holding { event_id, sha256, size }. Inert: nothing in it is fetched or trusted but the sender and the hash. */ -export const FILE_RECEIVED = 'org.gamecult.file_received'; - -export const sha256Hex = async (data: Blob): Promise => { - const digest = await crypto.subtle.digest('SHA-256', await data.arrayBuffer()); - return Array.from(new Uint8Array(digest), (b) => b.toString(16).padStart(2, '0')).join(''); -}; - -/** The hash to write for a file about to be sent in an unencrypted room; none when it cannot be computed. */ -export const hashForSend = async (data: Blob): Promise => { - try { - return await sha256Hex(data); - } catch { - return undefined; - } -}; - -export const readLine = (readBy: FileReader[], name: (sender: string) => string): string => - `fetched for ${readBy.map((r) => name(r.sender)).join(', ')}`; - -const receiptOf = (e: ReceiptEvent) => { - if (!e || typeof e !== 'object' || e.type !== FILE_RECEIVED || !e.event_id) return undefined; - if (e.unsigned?.redacted_because) return undefined; - const body = e.content?.[FILE_RECEIVED] as { event_id?: unknown; sha256?: unknown } | undefined; - if (typeof body?.event_id !== 'string' || typeof body.sha256 !== 'string') return undefined; - if (typeof e.sender !== 'string') return undefined; - // A reference to the file (Eureka's dedup, via /relations) must name the same event as the content, or the - // receipt counts for nothing. Matching is by content.event_id; other relations (a thread) are not read. - const rel = e.content?.['m.relates_to'] as { rel_type?: unknown; event_id?: unknown } | undefined; - if (rel?.rel_type === 'm.reference' && rel.event_id !== body.event_id) return undefined; - const ts = e.origin_server_ts; - return { - file: body.event_id, - sender: e.sender, - ts: typeof ts === 'number' && Number.isFinite(ts) ? ts : 0, - sha256: body.sha256, - }; -}; - -// Only the event's sender counts, never a name inside the content, and only a Mind's own Matrix -// identity on this homeserver (`@:`, a mind named in the Persona catalogue). -const isMind = (sender: string, server: string) => MINDS.some((m) => sender === `@${m}:${server}`); - -/** - * Who has read the file `fileId`, from receipts found anywhere in `events` (an album's thread replies, or the room's - * timeline: a receipt is a thread reply when the file has an album root, otherwise a plain room event; both count). - * "Read" means verified: the receipt's sha256 must equal the file event's `info.sha256`, so a file with no hash, or a - * mismatch, shows nothing. One entry per Mind (its latest), oldest first. - */ -export const readersOf = ( - events: ReceiptEvent[], - fileId: string, - fileContent: Record | undefined, - server: string -): FileReader[] => { - const sent = (fileContent?.info as Record | undefined)?.[FILE_HASH_KEY]; - if (typeof sent !== 'string') return []; - const latest = new Map(); - events - .map(receiptOf) - .filter( - (r): r is NonNullable => - !!r && r.file === fileId && r.sha256 === sent && isMind(r.sender, server) - ) - .sort((a, b) => a.ts - b.ts) - .forEach((r) => latest.set(r.sender, { sender: r.sender, ts: r.ts })); - return [...latest.values()].sort((a, b) => a.ts - b.ts); -}; diff --git a/src/app/features/albums/isFileZone.test.ts b/src/app/features/albums/isFileZone.test.ts deleted file mode 100644 index 0e55269f..00000000 --- a/src/app/features/albums/isFileZone.test.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { isFileZone } from './isFileZone'; - -const room = { roomId: '!f:x', aliases: ['#files:x'] }; - -describe('isFileZone', () => { - it('is true for the file-zone create type', () => { - expect(isFileZone({ ...room, createType: 'org.gamecult.file_zone' }, {})).toBe(true); - }); - it('is false for other create types and for plain rooms', () => { - expect(isFileZone({ ...room, createType: 'm.space' }, {})).toBe(false); - expect(isFileZone({ ...room, createType: 'org.gamecult.other' }, {})).toBe(false); - expect(isFileZone({ ...room, createType: 'org.gamecult.file_zone.x' }, {})).toBe(false); - expect(isFileZone(room, {})).toBe(false); - expect(isFileZone(room, { fileZoneRooms: [] })).toBe(false); - }); - it('is true when the room id or an alias is configured', () => { - expect(isFileZone(room, { fileZoneRooms: ['!f:x'] })).toBe(true); - expect(isFileZone(room, { fileZoneRooms: ['#other:x', '#files:x'] })).toBe(true); - }); - it('is false when only another room is configured', () => { - expect(isFileZone(room, { fileZoneRooms: ['!g:x', '#g:x'] })).toBe(false); - }); -}); diff --git a/src/app/features/albums/isFileZone.ts b/src/app/features/albums/isFileZone.ts deleted file mode 100644 index 071ef17b..00000000 --- a/src/app/features/albums/isFileZone.ts +++ /dev/null @@ -1,14 +0,0 @@ -export const FILE_ZONE_TYPE = 'org.gamecult.file_zone'; - -export type FileZoneRoom = { - roomId: string; - /** Canonical and alternative aliases. */ - aliases?: string[]; - /** The `type` of the room's m.room.create content. */ - createType?: string; -}; - -/** A room is the file zone when its create type says so or the client config lists it. */ -export const isFileZone = (room: FileZoneRoom, config: { fileZoneRooms?: string[] }): boolean => - room.createType === FILE_ZONE_TYPE || - !!config.fileZoneRooms?.some((r) => r === room.roomId || room.aliases?.includes(r)); diff --git a/src/app/features/albums/mapLimit.test.ts b/src/app/features/albums/mapLimit.test.ts deleted file mode 100644 index 24898cb0..00000000 --- a/src/app/features/albums/mapLimit.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { mapLimit } from './mapLimit'; - -describe('mapLimit', () => { - it('keeps result order and never exceeds the limit', async () => { - let inFlight = 0; - let peak = 0; - const out = await mapLimit([5, 1, 4, 2, 3, 0], 2, async (n) => { - inFlight += 1; - peak = Math.max(peak, inFlight); - await new Promise((r) => { - setTimeout(r, n); - }); - inFlight -= 1; - return n * 10; - }); - expect(out).toEqual([50, 10, 40, 20, 30, 0]); - expect(peak).toBe(2); - }); - it('handles an empty list and rejects when a call rejects', async () => { - expect(await mapLimit([], 3, async (n) => n)).toEqual([]); - await expect( - mapLimit([1, 2], 2, async (n) => { - if (n === 2) throw new Error('boom'); - return n; - }) - ).rejects.toThrow('boom'); - }); -}); diff --git a/src/app/features/albums/mapLimit.ts b/src/app/features/albums/mapLimit.ts deleted file mode 100644 index e850add0..00000000 --- a/src/app/features/albums/mapLimit.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** Like Promise.all(items.map(fn)) but with at most `limit` calls in flight; result order kept. */ -export const mapLimit = async ( - items: T[], - limit: number, - fn: (item: T) => Promise -): Promise => { - const out = new Array(items.length); - let next = 0; - const worker = async () => { - while (next < items.length) { - const i = next; - next += 1; - // eslint-disable-next-line no-await-in-loop - out[i] = await fn(items[i]); - } - }; - await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker)); - return out; -}; diff --git a/src/app/features/albums/publisherWire.test.ts b/src/app/features/albums/publisherWire.test.ts deleted file mode 100644 index 83bddf3a..00000000 --- a/src/app/features/albums/publisherWire.test.ts +++ /dev/null @@ -1,126 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { buildAlbums, looseFiles, looseNote, looseNoteFor, TimelineEvent } from './buildAlbums'; - -// The Commons publisher as it posted before gamecult-ops #121: loose files (no album thread), a -// flat `org.gamecult.publish.replaces` key, no info.sha256. The sender must see that, not a -// silently empty or silently unfolded zone. -const MIND = '@eureka:gamecult.org'; -const file = ( - id: string, - name: string, - extra: Record = {}, - ts = 1 -): TimelineEvent => ({ - event_id: id, - type: 'm.room.message', - sender: MIND, - origin_server_ts: ts, - content: { msgtype: 'm.file', body: name, filename: name, url: `mxc://x/${id}`, ...extra }, -}); -const text = (id: string, body: string): TimelineEvent => ({ - event_id: id, - type: 'm.room.message', - sender: MIND, - origin_server_ts: 1, - content: { msgtype: 'm.text', body }, -}); - -describe('loose files from a poster that does not thread', () => { - it('are found, with the names the sender sees', () => { - const loose = looseFiles([file('$a', 'notes.md'), file('$b', 'plan.pdf')]); - expect(loose.map((f) => f.name)).toEqual(['notes.md', 'plan.pdf']); - }); - - it('are not the album roots, thread replies (by SDK root or by relation), edits or redactions', () => { - const events: TimelineEvent[] = [ - text('$root', 'handoff/eureka'), - { ...file('$r1', 'a.md'), threadRoot: '$root' }, - file('$r2', 'b.md', { - 'm.relates_to': { rel_type: 'm.thread', event_id: '$root' }, - }), - file('$edit', 'c.md', { 'm.relates_to': { rel_type: 'm.replace', event_id: '$r1' } }), - { ...file('$gone', 'd.md'), unsigned: { redacted_because: {} } }, - file('$loose', 'e.md'), - ]; - expect(looseFiles(events).map((f) => f.id)).toEqual(['$loose']); - }); - - it('a zone holding only loose files still has no albums, and the note says why', () => { - const events = [file('$a', 'notes.md')]; - expect(buildAlbums([])).toEqual([]); - expect(looseNote(looseFiles(events))).toBe( - '1 file was posted outside an album and is not listed here: notes.md. It is in the Timeline.' - ); - }); - - it('the note names three and counts the rest', () => { - const many = looseFiles(['a', 'b', 'c', 'd', 'e'].map((n) => file(`$${n}`, `${n}.md`))); - expect(looseNote(many)).toBe( - '5 files were posted outside an album and are not listed here: a.md, b.md, c.md and 2 more. They are in the Timeline.' - ); - expect(looseNote([])).toBe(''); - }); -}); - -describe('where the loose-files note shows', () => { - const loose = looseFiles([file('$a', 'notes.md')]); - const list = { open: false, encrypted: false, loading: false, error: false }; - - it('on the album list, and only there', () => { - expect(looseNoteFor(loose, list)).toContain('notes.md'); - expect(looseNoteFor(loose, { ...list, open: true })).toBe(''); - expect(looseNoteFor(loose, { ...list, encrypted: true })).toBe(''); - expect(looseNoteFor(loose, { ...list, loading: true })).toBe(''); - expect(looseNoteFor(loose, { ...list, error: true })).toBe(''); - }); - - it('says nothing when there are no loose files', () => { - expect(looseNoteFor([], list)).toBe(''); - }); - - it('names m.notice and m.sticker posts as not files', () => { - const notice = { ...text('$n', 'hi'), content: { msgtype: 'm.notice', body: 'hi' } }; - expect(looseFiles([notice])).toEqual([]); - }); - - it('a file with no name reads as unnamed', () => { - const bare: TimelineEvent = { ...file('$b', ''), content: { msgtype: 'm.file', body: '' } }; - expect(looseNote(looseFiles([bare]))).toContain('unnamed'); - }); -}); - -describe('the old wire shape inside an album', () => { - const root = text('$root', 'handoff/eureka'); - const albumOf = (replies: TimelineEvent[]) => buildAlbums([{ root, replies }], 'gamecult.org')[0]; - - it('a flat replaces key folds nothing: both versions show, none is hidden', () => { - const album = albumOf([ - file('$v1', 'plan.md', { 'org.gamecult.publish.sha256': 'aa' }, 1), - file('$v2', 'plan.md', { 'org.gamecult.publish.replaces': '$v1' }, 2), - ]); - expect(album.files.map((f) => f.id)).toEqual(['$v1', '$v2']); - expect(album.files.every((f) => f.earlier.length === 0)).toBe(true); - }); - - it('the nested shape from the fixed publisher folds as before', () => { - const album = albumOf([ - file('$v1', 'plan.md', {}, 1), - file('$v2', 'plan.md', { 'org.gamecult.publish': { replaces: '$v1' } }, 2), - ]); - expect(album.files.map((f) => f.id)).toEqual(['$v2']); - expect(album.files[0].earlier.map((f) => f.id)).toEqual(['$v1']); - }); - - it('a file with no info.sha256 lists fine, with no readers even when a receipt names it', () => { - const receipt: TimelineEvent = { - event_id: '$rc', - type: 'org.gamecult.file_received', - sender: '@void:gamecult.org', - origin_server_ts: 5, - content: { 'org.gamecult.file_received': { event_id: '$v1', sha256: 'aa', size: 1 } }, - }; - const album = albumOf([file('$v1', 'plan.md'), receipt]); - expect(album.count).toBe(1); - expect(album.files[0].readBy).toEqual([]); - }); -}); diff --git a/src/app/features/albums/readPages.test.ts b/src/app/features/albums/readPages.test.ts deleted file mode 100644 index 124a32a6..00000000 --- a/src/app/features/albums/readPages.test.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { Page, readPages } from './readPages'; - -const pager = (pages: Page[]) => { - const froms: (string | undefined)[] = []; - return { - froms, - fetchPage: async (from: string | undefined) => { - froms.push(from); - return pages[froms.length - 1] ?? {}; - }, - }; -}; - -describe('readPages', () => { - it('one page without a token is the whole read', async () => { - const p = pager([{ chunk: [1, 2] }]); - expect(await readPages(p.fetchPage)).toEqual({ items: [1, 2], truncated: false }); - expect(p.froms).toEqual([undefined]); - }); - - it('follows next_batch in order, passing each token back', async () => { - const p = pager([ - { chunk: [1], next_batch: 'a' }, - { chunk: [2], next_batch: 'b' }, - { chunk: [3] }, - ]); - expect(await readPages(p.fetchPage)).toEqual({ items: [1, 2, 3], truncated: false }); - expect(p.froms).toEqual([undefined, 'a', 'b']); - }); - - it('a missing chunk reads as empty', async () => { - expect(await readPages(async () => ({}))).toEqual({ items: [], truncated: false }); - }); - - it('an empty page ends the read even when it carries a token', async () => { - const p = pager([ - { chunk: [1], next_batch: 'a' }, - { chunk: [], next_batch: 'b' }, - ]); - expect(await readPages(p.fetchPage)).toEqual({ items: [1], truncated: false }); - expect(p.froms).toHaveLength(2); - }); - - it('the cap stops the read and says it was cut short', async () => { - const p = pager(Array.from({ length: 10 }, (_, i) => ({ chunk: [i], next_batch: `t${i}` }))); - expect(await readPages(p.fetchPage, 3)).toEqual({ items: [0, 1, 2], truncated: true }); - expect(p.froms).toHaveLength(3); - }); - - it('a last page exactly at the cap is not truncated', async () => { - const p = pager([{ chunk: [1], next_batch: 'a' }, { chunk: [2] }]); - expect((await readPages(p.fetchPage, 2)).truncated).toBe(false); - }); -}); diff --git a/src/app/features/albums/readPages.ts b/src/app/features/albums/readPages.ts deleted file mode 100644 index a2b888e5..00000000 --- a/src/app/features/albums/readPages.ts +++ /dev/null @@ -1,27 +0,0 @@ -/** One page of a Matrix paginated endpoint: its events and the token for the next page, if any. */ -export type Page = { chunk?: T[]; next_batch?: string }; - -/** Pages read per endpoint at most, so a runaway zone cannot hold the phone in a loop. */ -export const MAX_PAGES = 20; - -/** - * Reads every page of an endpoint by following `next_batch`, up to `maxPages`. `truncated` is true - * when the cap stopped the read with more still to come, so a caller can say the list is partial. - */ -export const readPages = async ( - fetchPage: (from: string | undefined) => Promise>, - maxPages = MAX_PAGES -): Promise<{ items: T[]; truncated: boolean }> => { - const items: T[] = []; - let from: string | undefined; - for (let n = 0; n < maxPages; n += 1) { - // eslint-disable-next-line no-await-in-loop - const page = await fetchPage(from); - items.push(...(page.chunk ?? [])); - // An empty page ends the read even if a token is returned: a server that keeps handing out - // tokens with nothing behind them would otherwise spend every page of the cap. - if (!page.next_batch || !page.chunk?.length) return { items, truncated: false }; - from = page.next_batch; - } - return { items, truncated: true }; -}; diff --git a/src/app/features/albums/receiptStore.test.ts b/src/app/features/albums/receiptStore.test.ts deleted file mode 100644 index c97202e5..00000000 --- a/src/app/features/albums/receiptStore.test.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { EventEmitter } from 'events'; -import { describe, expect, it, vi } from 'vitest'; -import { MatrixEvent, Room, RoomEvent } from 'matrix-js-sdk'; -import { receiptStoreOf } from './receiptStore'; -import { readersOf } from './fileReceipt'; - -const HASH = 'a'.repeat(64); - -type Fake = { - id: string; - type: string; - sender: string; - ts: number; - content: object; - redacted?: boolean; -}; -const event = (f: Fake) => - ({ - getId: () => f.id, - getType: () => f.type, - getSender: () => f.sender, - getTs: () => f.ts, - getContent: () => f.content, - isRedacted: () => !!f.redacted, - } as unknown as MatrixEvent); -const receipt = (id: string, sender: string, fileId = '$f', over: Partial = {}): Fake => ({ - id, - type: 'org.gamecult.file_received', - sender, - ts: 1, - content: { 'org.gamecult.file_received': { event_id: fileId, sha256: HASH } }, - ...over, -}); - -const fakeRoom = (initial: Fake[] = []) => { - const emitter = new EventEmitter(); - emitter.setMaxListeners(0); - let events = initial; - const room = Object.assign(emitter, { - getUnfilteredTimelineSet: () => ({ - getLiveTimeline: () => ({ getEvents: () => events.map(event) }), - }), - }) as unknown as Room; - return { - room, - emitter, - set: (next: Fake[]) => { - events = next; - }, - }; -}; -const listeners = (e: EventEmitter) => - [RoomEvent.Timeline, RoomEvent.Redaction, RoomEvent.TimelineReset].map((n) => e.listenerCount(n)); - -describe('receiptStoreOf: one subscription per room', () => { - it('registers one listener per event for 200 file rows, and none once they are gone', () => { - const { room, emitter } = fakeRoom(); - const store = receiptStoreOf(room); - const off = Array.from({ length: 200 }, () => store.subscribe(() => undefined)); - expect(listeners(emitter)).toEqual([1, 1, 1]); - off.forEach((o) => o()); - expect(listeners(emitter)).toEqual([0, 0, 0]); - }); - - it('is one store per room', () => { - const a = fakeRoom(); - const b = fakeRoom(); - expect(receiptStoreOf(a.room)).toBe(receiptStoreOf(a.room)); - expect(receiptStoreOf(a.room)).not.toBe(receiptStoreOf(b.room)); - }); - - it('notifies rows when a receipt arrives, not for unrelated timeline events, and gives readersOf what it needs', () => { - const { room, emitter, set } = fakeRoom(); - const store = receiptStoreOf(room); - const cb = vi.fn(); - store.subscribe(cb); - expect(store.getSnapshot()).toEqual([]); - set([{ id: '$m', type: 'm.room.message', sender: '@x:gamecult.org', ts: 1, content: {} }]); - emitter.emit(RoomEvent.Timeline); - expect(cb).not.toHaveBeenCalled(); - set([receipt('$r', '@void:gamecult.org')]); - emitter.emit(RoomEvent.Timeline); - expect(cb).toHaveBeenCalledTimes(1); - const snap = store.getSnapshot(); - expect( - readersOf(snap, '$f', { info: { sha256: HASH } }, 'gamecult.org').map((r) => r.sender) - ).toEqual(['@void:gamecult.org']); - emitter.emit(RoomEvent.Timeline); - expect(store.getSnapshot()).toBe(snap); - }); - - it('rescans on a redaction and on a timeline reset', () => { - const { room, emitter, set } = fakeRoom([receipt('$r', '@void:gamecult.org')]); - const store = receiptStoreOf(room); - const cb = vi.fn(); - store.subscribe(cb); - expect(store.getSnapshot()).toHaveLength(1); - set([receipt('$r', '@void:gamecult.org', '$f', { redacted: true })]); - emitter.emit(RoomEvent.Redaction); - expect(cb).toHaveBeenCalledTimes(1); - expect( - readersOf(store.getSnapshot(), '$f', { info: { sha256: HASH } }, 'gamecult.org') - ).toEqual([]); - set([]); - emitter.emit(RoomEvent.TimelineReset); - expect(cb).toHaveBeenCalledTimes(2); - expect(store.getSnapshot()).toEqual([]); - }); - - it('picks up what is already loaded when the first row subscribes', () => { - const { room } = fakeRoom([receipt('$r', '@aqua:gamecult.org')]); - const store = receiptStoreOf(room); - store.subscribe(() => undefined); - expect(store.getSnapshot()).toHaveLength(1); - }); -}); diff --git a/src/app/features/albums/receiptStore.ts b/src/app/features/albums/receiptStore.ts deleted file mode 100644 index 1f69aba9..00000000 --- a/src/app/features/albums/receiptStore.ts +++ /dev/null @@ -1,79 +0,0 @@ -import type { MatrixEvent, Room } from 'matrix-js-sdk'; -import { RoomEvent } from 'matrix-js-sdk'; -import { FILE_RECEIVED, ReceiptEvent } from './fileReceipt'; - -/** - * One subscription per room to the file receipts in its loaded timeline, shared by every file row: a row costs a - * callback in a Set, not a Room listener (matrix-js-sdk warns past 100 listeners). The snapshot is the receipt events - * themselves; each row derives its own readers from it with `readersOf`, so the rules (sender, hash, reference, one per - * Mind) live in one place and the store holds no verdicts. The snapshot changes identity only when the set of receipts - * or one's redaction state does, so rows re-render for a receipt, not for every timeline event. - */ -export type ReceiptStore = { - subscribe: (onChange: () => void) => () => void; - getSnapshot: () => ReceiptEvent[]; -}; - -const asReceiptEvent = (e: MatrixEvent): ReceiptEvent => ({ - event_id: e.getId(), - type: e.getType(), - sender: e.getSender(), - origin_server_ts: e.getTs(), - content: e.getContent(), - unsigned: e.isRedacted() ? { redacted_because: true } : undefined, -}); - -const same = (a: ReceiptEvent[], b: ReceiptEvent[]): boolean => - a.length === b.length && - a.every( - (r, i) => - r.event_id === b[i].event_id && - !r.unsigned?.redacted_because === !b[i].unsigned?.redacted_because - ); - -// A redaction removes a tick and a reset drops the window: both rescan, not only a new event. -const EVENTS = [RoomEvent.Timeline, RoomEvent.Redaction, RoomEvent.TimelineReset] as const; - -const make = (room: Room): ReceiptStore => { - const subscribers = new Set<() => void>(); - let snapshot: ReceiptEvent[] = []; - const read = (): boolean => { - const next = room - .getUnfilteredTimelineSet() - .getLiveTimeline() - .getEvents() - .filter((e) => e.getType() === FILE_RECEIVED) - .map(asReceiptEvent); - if (same(snapshot, next)) return false; - snapshot = next; - return true; - }; - const scan = () => { - if (read()) subscribers.forEach((cb) => cb()); - }; - return { - subscribe: (onChange) => { - subscribers.add(onChange); - if (subscribers.size === 1) { - EVENTS.forEach((ev) => room.on(ev, scan)); - read(); // the first row sees what is already loaded; it reads the snapshot after subscribing - } - return () => { - subscribers.delete(onChange); - if (subscribers.size === 0) EVENTS.forEach((ev) => room.off(ev, scan)); - }; - }, - getSnapshot: () => snapshot, - }; -}; - -const stores = new WeakMap(); - -export const receiptStoreOf = (room: Room): ReceiptStore => { - let store = stores.get(room); - if (!store) { - store = make(room); - stores.set(room, store); - } - return store; -}; diff --git a/src/app/features/albums/shareController.test.ts b/src/app/features/albums/shareController.test.ts deleted file mode 100644 index b163b736..00000000 --- a/src/app/features/albums/shareController.test.ts +++ /dev/null @@ -1,380 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { Picked, ShareDeps, createShareController } from './shareController'; -import { ShareResult } from './shareSet'; - -const file = (name: string, size?: number): Picked => ({ name, type: 'audio/ogg', size }); -const MB = 1024 * 1024; -const ok = (n: number): ShareResult => ({ albumId: '$r', sent: n, failed: [], failedAt: [] }); - -/** A run the test settles by hand, so "in flight" is a state the test can stand in. */ -const hand = () => { - const calls: { files: Picked[]; title: string; onFile: () => void; signal: AbortSignal }[] = []; - let release: (r: ShareResult) => void = () => undefined; - let fail: (e: Error) => void = () => undefined; - const run: ShareDeps['run'] = (files, title, onFile, signal) => { - calls.push({ files, title, onFile, signal }); - return new Promise((resolve, reject) => { - release = resolve; - fail = reject; - }); - }; - return { calls, run, release: (r: ShareResult) => release(r), fail: (e: Error) => fail(e) }; -}; - -const make = (over: Partial> = {}, roomId = '!zone:x') => { - const h = hand(); - const sentTo: string[] = []; - const c = createShareController({ - roomId, - isEncrypted: () => false, - run: h.run, - onSent: () => sentTo.push(roomId), - ...over, - }); - return { c, h, sentTo }; -}; - -describe('picking', () => { - it('starts idle with nothing picked, and a pick holds the files in order', () => { - const { c } = make(); - expect(c.getState().files).toEqual([]); - expect(c.getState().phase).toEqual({ kind: 'idle' }); - c.pick([file('a'), file('b')]); - expect(c.getState().files.map((f) => f.name)).toEqual(['a', 'b']); - }); - - it('Cancel empties the pick and the title and bumps the input epoch', () => { - const { c } = make(); - c.pick([file('a')]); - c.setTitle('Take 4'); - const before = c.getState().epoch; - c.cancel(); - expect(c.getState()).toMatchObject({ files: [], title: '', epoch: before + 1 }); - }); - - it('subscribers hear every change and stop hearing after unsubscribe', () => { - const { c } = make(); - let heard = 0; - const off = c.subscribe(() => { - heard += 1; - }); - c.pick([file('a')]); - off(); - c.pick([]); - expect(heard).toBe(1); - }); -}); - -describe('the Send guard', () => { - it('a double tap starts one send', async () => { - const { c, h } = make(); - c.pick([file('a'), file('b')]); - const first = c.send(); - const second = c.send(); - expect(h.calls).toHaveLength(1); - h.release(ok(2)); - await Promise.all([first, second]); - expect(h.calls).toHaveLength(1); - }); - - it('a re-mounted panel for the same room cannot start a second send while one is in flight', async () => { - const { c, h } = make(); - c.pick([file('a')]); - const first = c.send(); - // The page was left and returned to: a new controller, nothing picked in it but a new pick. - const again = make({}, '!zone:x'); - again.c.pick([file('b')]); - await again.c.send(); - expect(again.h.calls).toHaveLength(0); - h.release(ok(1)); - await first; - // Once the first has settled the room is free again. - const next = again.c.send(); - expect(again.h.calls).toHaveLength(1); - again.h.release(ok(1)); - await next; - }); - - it('another room is not blocked by a send in flight', async () => { - const a = make({}, '!a:x'); - const b = make({}, '!b:x'); - a.c.pick([file('a')]); - b.c.pick([file('b')]); - const sendA = a.c.send(); - const sendB = b.c.send(); - expect(b.h.calls).toHaveLength(1); - a.h.release(ok(1)); - b.h.release(ok(1)); - await Promise.all([sendA, sendB]); - }); - - it('sends nothing when nothing is picked', async () => { - const { c, h } = make(); - await c.send(); - expect(h.calls).toHaveLength(0); - }); - - it('a send that throws frees the room and says so', async () => { - const { c, h } = make(); - c.pick([file('a')]); - const p = c.send(); - h.fail(new Error('M_FORBIDDEN')); - await p; - expect(c.getState().phase).toEqual({ kind: 'done', text: 'Could not share: M_FORBIDDEN' }); - expect(c.getState().files).toHaveLength(1); - const retry = c.send(); - expect(h.calls).toHaveLength(2); - h.release(ok(1)); - await retry; - }); -}); - -describe('progress and results', () => { - it('counts files as they settle, passing the title through', async () => { - const { c, h } = make(); - c.pick([file('a'), file('b')]); - c.setTitle('Take 4'); - const p = c.send(); - expect(c.getState().phase).toEqual({ kind: 'sending', done: 0 }); - expect(h.calls[0].title).toBe('Take 4'); - h.calls[0].onFile(); - expect(c.getState().phase).toEqual({ kind: 'sending', done: 1 }); - h.release(ok(2)); - await p; - expect(c.getState().phase).toEqual({ kind: 'done', text: 'Shared 2 files.' }); - }); - - it('full success clears the pick, tells the room list, and remounts the input', async () => { - const { c, h, sentTo } = make(); - c.pick([file('a')]); - const { epoch } = c.getState(); - const p = c.send(); - h.release(ok(1)); - await p; - expect(c.getState()).toMatchObject({ files: [], title: '', epoch: epoch + 1 }); - expect(sentTo).toEqual(['!zone:x']); - }); - - it('failed files stay picked by position, so a same-named twin that went is not re-sent', async () => { - const { c, h } = make(); - const twins = [file('a.ogg'), file('a.ogg'), file('b.ogg')]; - c.pick(twins); - const p = c.send(); - h.release({ albumId: '$r', sent: 2, failed: ['a.ogg'], failedAt: [1] }); - await p; - expect(c.getState().files).toEqual([twins[1]]); - expect(c.getState().phase).toEqual({ kind: 'done', text: 'Shared 2. Not sent: a.ogg' }); - }); - - it('when every upload failed everything stays picked and the note says nothing was shared', async () => { - const { c, h } = make(); - const picked = [file('a'), file('b')]; - c.pick(picked); - const p = c.send(); - h.release({ albumId: '$r', sent: 0, failed: ['a', 'b'], failedAt: [0, 1] }); - await p; - expect(c.getState().files).toEqual(picked); - expect(c.getState().phase).toEqual({ - kind: 'done', - text: 'Nothing was shared. Not sent: a, b', - }); - }); - - it('a new pick after a result drops the result note', async () => { - const { c, h } = make(); - c.pick([file('a')]); - const p = c.send(); - h.release(ok(1)); - await p; - c.pick([file('b')]); - expect(c.getState().phase).toEqual({ kind: 'idle' }); - }); -}); - -describe('what a send leaves behind', () => { - it('keeps the title when some files failed, so the retry has the same name', async () => { - const { c, h } = make(); - c.pick([file('a'), file('b')]); - c.setTitle('Take 4'); - const p = c.send(); - h.release({ albumId: '$r', sent: 1, failed: ['b'], failedAt: [1] }); - await p; - expect(c.getState().title).toBe('Take 4'); - }); - - it('tells the room list only after the send settled, and not when it threw', async () => { - const { c, h, sentTo } = make(); - c.pick([file('a')]); - const p = c.send(); - expect(sentTo).toEqual([]); - h.release(ok(1)); - await p; - expect(sentTo).toEqual(['!zone:x']); - - const bad = make(); - bad.c.pick([file('a')]); - const q = bad.c.send(); - bad.h.fail(new Error('boom')); - await q; - expect(bad.sentTo).toEqual([]); - }); - - it('a success lands in one notification: the pick is never empty while still sending', async () => { - const { c, h } = make(); - c.pick([file('a')]); - const p = c.send(); - const seen: string[] = []; - c.subscribe(() => { - const st = c.getState(); - seen.push(`${st.files.length}:${st.phase.kind}`); - }); - h.release(ok(1)); - await p; - expect(seen).toEqual(['0:done']); - }); -}); - -describe('an encrypted room', () => { - it('says so, sends nothing and keeps the pick', async () => { - const { c, h } = make({ isEncrypted: () => true }); - c.pick([file('a')]); - await c.send(); - expect(c.getState().phase).toEqual({ - kind: 'done', - text: 'Not shared: this room is encrypted.', - }); - expect(c.getState().files).toHaveLength(1); - expect(h.calls).toHaveLength(0); - }); - - it('is checked at Send, not at mount: a room that turns encrypted after the pick is refused', async () => { - let encrypted = false; - const { c, h } = make({ isEncrypted: () => encrypted }); - c.pick([file('a')]); - encrypted = true; - await c.send(); - expect(h.calls).toHaveLength(0); - expect(c.getState().phase).toMatchObject({ - kind: 'done', - text: 'Not shared: this room is encrypted.', - }); - }); -}); - -describe('Stop', () => { - it('aborts the signal of the send in flight, and only that send', async () => { - const { c, h } = make(); - c.pick([file('a'), file('b')]); - c.stop(); // nothing running: nothing to abort - const sending = c.send(); - expect(h.calls[0].signal.aborted).toBe(false); - c.stop(); - expect(h.calls[0].signal.aborted).toBe(true); - h.release({ albumId: '$r', sent: 0, failed: ['a', 'b'], failedAt: [0, 1] }); - await sending; - expect(c.getState().files.map((f) => f.name)).toEqual(['a', 'b']); - // the next send gets a fresh signal - const again = c.send(); - expect(h.calls[1].signal.aborted).toBe(false); - h.release(ok(2)); - await again; - }); -}); - -describe('files over the homeserver cap', () => { - const cap = 50 * MB; - const capped = () => make({ maxBytes: () => cap }); - - it('are named in the note and never sent; the rest go', async () => { - const { c, h } = capped(); - c.pick([file('small.ogg', 3 * MB), file('film.mp4', 80 * MB), file('also.ogg', 1)]); - const sent = c.send(); - expect(h.calls[0].files.map((f) => f.name)).toEqual(['small.ogg', 'also.ogg']); - expect(c.getState().files.map((f) => f.name)).toEqual(['small.ogg', 'also.ogg']); - h.release(ok(2)); - await sent; - expect(c.getState().phase).toEqual({ - kind: 'done', - text: 'Shared 2 files. Too large for this server (limit 50 MB): film.mp4', - }); - expect(c.getState().files).toEqual([]); - }); - - it('are not kept for a retry that cannot help them, while a failed small file is', async () => { - const { c, h } = capped(); - c.pick([file('a.ogg', 1), file('big.wav', 60 * MB)]); - const sent = c.send(); - h.release({ albumId: '$r', sent: 0, failed: ['a.ogg'], failedAt: [0] }); - await sent; - expect(c.getState().files.map((f) => f.name)).toEqual(['a.ogg']); - }); - - it('a pick that is all over the cap sends nothing: no run, so no album root, and the pick clears', async () => { - const { c, h, sentTo } = capped(); - c.pick([file('a.mp4', 51 * MB), file('b.mp4', 99 * MB)]); - const { epoch } = c.getState(); - await c.send(); - expect(h.calls).toHaveLength(0); - expect(sentTo).toEqual([]); - expect(c.getState()).toMatchObject({ files: [], epoch: epoch + 1 }); - expect(c.getState().phase).toEqual({ - kind: 'done', - text: 'Nothing was shared. Too large for this server (limit 50 MB): a.mp4, b.mp4', - }); - }); - - it('a file of exactly the cap goes: the server refuses only what is larger', async () => { - const { c, h } = capped(); - c.pick([file('edge.bin', cap)]); - const sent = c.send(); - expect(h.calls[0].files).toHaveLength(1); - h.release(ok(1)); - await sent; - }); - - it('the room is not held busy by an all-refused pick, so the next pick sends', async () => { - const { c, h } = capped(); - c.pick([file('a.mp4', 99 * MB)]); - await c.send(); - c.pick([file('b.ogg', 1)]); - const sent = c.send(); - expect(h.calls).toHaveLength(1); - h.release(ok(1)); - await sent; - }); - - it('a server that states no cap, or a file with no size, refuses nothing', async () => { - const none = make(); - none.c.pick([file('a', 10 ** 12)]); - const s1 = none.c.send(); - expect(none.h.calls[0].files).toHaveLength(1); - none.h.release(ok(1)); - await s1; - const unsized = make({ maxBytes: () => cap }, '!other:x'); - unsized.c.pick([file('b')]); - const s2 = unsized.c.send(); - expect(unsized.h.calls[0].files).toHaveLength(1); - unsized.h.release(ok(1)); - await s2; - }); - - it('a fractional cap reads with one decimal', async () => { - const { c } = make({ maxBytes: () => 1.5 * MB }); - c.pick([file('a', 2 * MB)]); - await c.send(); - expect(c.getState().phase).toMatchObject({ text: expect.stringContaining('limit 1.5 MB') }); - }); - - it('a run that throws still names the refused files, which are not kept', async () => { - const { c, h } = capped(); - c.pick([file('a.ogg', 1), file('big.wav', 60 * MB)]); - const sent = c.send(); - h.fail(new Error('network down')); - await sent; - expect(c.getState().phase).toEqual({ - kind: 'done', - text: 'Could not share: network down. Too large for this server (limit 50 MB): big.wav', - }); - expect(c.getState().files.map((f) => f.name)).toEqual(['a.ogg']); - }); -}); diff --git a/src/app/features/albums/shareController.ts b/src/app/features/albums/shareController.ts deleted file mode 100644 index 72f786c9..00000000 --- a/src/app/features/albums/shareController.ts +++ /dev/null @@ -1,135 +0,0 @@ -// The share panel's state machine, apart from React and Matrix: what is picked, what phase the -// send is in, and the rules that keep a room to one send at a time. ShareSet.tsx draws it. -import { ShareResult, remainingAfter, resultNote } from './shareSet'; - -export type Picked = { name: string; type: string; size?: number }; - -export type SharePhase = - | { kind: 'idle' } - | { kind: 'sending'; done: number } - | { kind: 'done'; text: string }; - -export type ShareState = { - files: F[]; - title: string; - phase: SharePhase; - /** Bumps whenever the pick is emptied, so the file input can be remounted and re-pick the same files. */ - epoch: number; -}; - -export const ENCRYPTED_NOTE = 'Not shared: this room is encrypted.'; - -const MIB = 1024 * 1024; - -/** - * Files the homeserver would refuse for size (its `m.upload.size`, which Synapse enforces as a - * limit, so a file of exactly that size goes), split from the rest before anything is sent. A - * missing cap or size refuses nothing. - */ -export const splitBySize = (files: F[], cap: number | undefined) => { - const over = (f: F) => cap !== undefined && f.size !== undefined && f.size > cap; - return { sendable: files.filter((f) => !over(f)), tooLarge: files.filter(over) }; -}; - -const tooLargeNote = (names: string[], cap: number): string => - `Too large for this server (limit ${Math.round((cap / MIB) * 10) / 10} MB): ${names.join(', ')}`; - -export type ShareDeps = { - roomId: string; - isEncrypted: () => boolean; - /** Sends the files as one album; reports each settled file through onFile. */ - run: (files: F[], title: string, onFile: () => void, signal: AbortSignal) => Promise; - /** The homeserver's upload cap in bytes (`m.upload.size`), when it states one. */ - maxBytes?: () => number | undefined; - /** Called after a send that reached the room, whatever it left unsent. */ - onSent?: () => void; -}; - -/** Rooms with a share in flight. Module-level: leaving the page unmounts the panel, not the send. */ -const sending = new Set(); - -export const createShareController = (deps: ShareDeps) => { - let state: ShareState = { files: [], title: '', phase: { kind: 'idle' }, epoch: 0 }; - const listeners = new Set<() => void>(); - let running: AbortController | undefined; - const set = (patch: Partial>) => { - state = { ...state, ...patch }; - listeners.forEach((l) => l()); - }; - - const clear = () => set({ files: [], title: '', epoch: state.epoch + 1 }); - - const send = async () => { - if (sending.has(deps.roomId) || state.files.length === 0) return; - if (deps.isEncrypted()) { - set({ phase: { kind: 'done', text: ENCRYPTED_NOTE } }); - return; - } - // Files over the cap are named and dropped from the pick before any upload or album root: a - // retry cannot help them, and a root with nothing under it is a lone message nobody lists. - const cap = deps.maxBytes?.(); - const { sendable, tooLarge } = splitBySize(state.files, cap); - const sizeNote = tooLarge.length - ? tooLargeNote( - tooLarge.map((f) => f.name), - cap as number - ) - : ''; - if (sendable.length === 0) { - const phase: SharePhase = { kind: 'done', text: `Nothing was shared. ${sizeNote}` }; - set({ files: [], title: '', epoch: state.epoch + 1, phase }); - return; - } - sending.add(deps.roomId); - const abort = new AbortController(); - running = abort; - const { title } = state; - const files = sendable; - set({ files, phase: { kind: 'sending', done: 0 } }); - let settled = 0; - try { - const res = await deps.run( - files, - title, - () => { - settled += 1; - set({ phase: { kind: 'sending', done: settled } }); - }, - abort.signal - ); - deps.onSent?.(); - const left = remainingAfter(files, res); - const phase: SharePhase = { - kind: 'done', - text: sizeNote ? `${resultNote(res)} ${sizeNote}` : resultNote(res), - }; - // One notification: no state is ever drawn with the pick emptied and the send still running. - if (left.length === 0) set({ files: [], title: '', epoch: state.epoch + 1, phase }); - else set({ files: left, phase }); - } catch (e: any) { - const failure = `Could not share: ${e?.message ?? 'send failed'}`; - set({ phase: { kind: 'done', text: sizeNote ? `${failure}. ${sizeNote}` : failure } }); - } finally { - running = undefined; - sending.delete(deps.roomId); - } - }; - - return { - getState: () => state, - subscribe: (l: () => void) => { - listeners.add(l); - return () => { - listeners.delete(l); - }; - }, - pick: (files: F[]) => set({ files, phase: { kind: 'idle' } }), - setTitle: (title: string) => set({ title }), - cancel: clear, - /** Stops a send in flight: the running upload is aborted and the rest are left picked. */ - stop: () => running?.abort(), - send, - }; -}; - -export type ShareController = ReturnType>; diff --git a/src/app/features/albums/shareSet.test.ts b/src/app/features/albums/shareSet.test.ts deleted file mode 100644 index 8fc4a8b8..00000000 --- a/src/app/features/albums/shareSet.test.ts +++ /dev/null @@ -1,328 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import config from '../../../../config.json'; -import { ZoneEvent, buildAlbums } from './buildAlbums'; -import { - DEFAULT_TITLE, - ShareFile, - SharePort, - CANCELLED, - freshest, - refusalOf, - remainingAfter, - resultNote, - sendShareSet, - threadRelation, -} from './shareSet'; - -const kindOf = (f: ShareFile) => (f.mimeType.startsWith('audio') ? 'm.audio' : 'm.file'); - -/** A fake room: records what is sent, as the events Synapse would return from /relations. */ -const room = (failOn: string[] = []) => { - const events: ZoneEvent[] = []; - const port: SharePort = { - send: async (content) => { - const id = `$e${events.length + 1}`; - events.push({ - event_id: id, - type: 'm.room.message', - sender: '@aqua:chat.gamecult.org', - origin_server_ts: 1000 + events.length, - content, - }); - return id; - }, - contentOf: async (f) => { - if (failOn.includes(f.name)) throw new Error('upload failed'); - return { - msgtype: kindOf(f), - body: f.name, - filename: f.name, - url: `mxc://x/${f.name}`, - info: { mimetype: f.mimeType }, - }; - }, - }; - const album = () => { - const [root, ...replies] = events; - return buildAlbums([{ root, replies }], 'chat.gamecult.org')[0]; - }; - return { events, port, album }; -}; - -const clips: ShareFile[] = [ - { name: 'a.ogg', mimeType: 'audio/ogg' }, - { name: 'b.ogg', mimeType: 'audio/ogg' }, - { name: 'c.txt', mimeType: 'text/plain' }, -]; - -describe('sendShareSet', () => { - it('reads back as one album of the files in pick order', async () => { - const r = room(); - const res = await sendShareSet(r.port, 'Take 4', clips); - expect(res).toEqual({ albumId: '$e1', sent: 3, failed: [], failedAt: [], reasons: [] }); - const album = r.album(); - expect(album.title).toBe('Take 4'); - expect(album.files.map((f) => [f.name, f.kind])).toEqual([ - ['a.ogg', 'audio'], - ['b.ogg', 'audio'], - ['c.txt', 'file'], - ]); - }); - - it('threads every file under the root, each falling back to the previous event', async () => { - const r = room(); - await sendShareSet(r.port, 't', clips); - const rels = r.events.slice(1).map((e) => e.content?.['m.relates_to']); - expect(rels).toEqual([ - threadRelation('$e1', '$e1'), - threadRelation('$e1', '$e2'), - threadRelation('$e1', '$e3'), - ]); - expect(r.events[0].content?.['m.relates_to']).toBeUndefined(); - }); - - it('titles an untitled share', async () => { - const r = room(); - await sendShareSet(r.port, ' ', clips.slice(0, 1)); - expect(r.album().title).toBe(DEFAULT_TITLE); - }); - - it('names a failed file and still sends the rest', async () => { - const r = room(['b.ogg']); - const res = await sendShareSet(r.port, 't', clips); - expect(res.failed).toEqual(['b.ogg']); - expect(res.sent).toBe(2); - expect(r.album().files.map((f) => f.name)).toEqual(['a.ogg', 'c.txt']); - // the next file falls back to the last event that exists, not to the failed one - expect(r.events[2].content?.['m.relates_to']).toEqual(threadRelation('$e1', '$e2')); - }); - - it('throws when the root cannot be sent, uploading nothing', async () => { - let uploads = 0; - const port: SharePort = { - send: async () => { - throw new Error('M_FORBIDDEN'); - }, - contentOf: async () => { - uploads += 1; - return {}; - }, - }; - await expect(sendShareSet(port, 't', clips)).rejects.toThrow('M_FORBIDDEN'); - expect(uploads).toBe(0); - }); -}); - -describe('the share flag', () => { - it('ships off', () => { - expect(config.fileZoneShare).toEqual({ enabled: false }); - }); -}); - -describe('after a send', () => { - it('keeps the failed one of two same-named files, not both', async () => { - const twins: ShareFile[] = [ - { name: 'a.ogg', mimeType: 'audio/ogg' }, - { name: 'a.ogg', mimeType: 'audio/ogg' }, - ]; - let n = 0; - const r = room(); - const port: SharePort = { - ...r.port, - contentOf: async (f) => { - n += 1; - if (n === 2) throw new Error('second upload failed'); - return r.port.contentOf(f); - }, - }; - const res = await sendShareSet(port, 't', twins); - expect(res.failedAt).toEqual([1]); - expect(remainingAfter(twins, res)).toEqual([twins[1]]); - }); - - it('keeps only the failed files picked, so a retry is one tap', async () => { - const r = room(['b.ogg']); - const res = await sendShareSet(r.port, 't', clips); - expect(remainingAfter(clips, res).map((f) => f.name)).toEqual(['b.ogg']); - expect(resultNote(res)).toBe('Shared 2. Not sent: b.ogg'); - }); - - it('keeps everything and says nothing was shared when every upload failed', async () => { - const r = room(clips.map((c) => c.name)); - const res = await sendShareSet(r.port, 't', clips); - expect(remainingAfter(clips, res)).toEqual(clips); - expect(resultNote(res)).toBe('Nothing was shared. Not sent: a.ogg, b.ogg, c.txt'); - }); - - it('clears the pick on full success', async () => { - const r = room(); - const res = await sendShareSet(r.port, 't', clips); - expect(remainingAfter(clips, res)).toEqual([]); - expect(resultNote(res)).toBe('Shared 3 files.'); - }); -}); - -describe('adding to an existing album', () => { - it('sends no root; each file threads under the album, the first after `lastId`', async () => { - const r = room(); - const sent: Record[] = []; - const port = { - ...r.port, - send: async (c: Record) => { - sent.push(c); - return `$n${sent.length}`; - }, - }; - const res = await sendShareSet( - port, - { albumId: '$root', lastId: '$last', lastTs: 1 }, - clips.slice(0, 2) - ); - expect(res.albumId).toBe('$root'); - expect(res.sent).toBe(2); - expect(sent.map((c) => c.msgtype)).toEqual(['m.audio', 'm.audio']); - expect(sent.map((c) => c['m.relates_to'])).toEqual([ - threadRelation('$root', '$last'), - threadRelation('$root', '$n1'), - ]); - }); -}); - -describe('refusals', () => { - const refuse = (errcode: string): SharePort => ({ - send: async () => '$e', - contentOf: async () => { - throw Object.assign(new Error('raw server text'), { errcode }); - }, - }); - - it('names the three upload refusals and nothing else', () => { - expect(refusalOf({ errcode: 'M_TOO_LARGE' })).toBe('too large for this server'); - expect(refusalOf({ errcode: 'M_FORBIDDEN' })).toBe('not allowed to upload here'); - expect(refusalOf({ errcode: 'M_LIMIT_EXCEEDED' })).toBe( - 'uploading too fast, try again shortly' - ); - expect(refusalOf({ errcode: 'M_UNKNOWN' })).toBeUndefined(); - expect(refusalOf({ errcode: 'constructor' })).toBeUndefined(); - expect(refusalOf(new Error('x'))).toBeUndefined(); - expect(refusalOf(null)).toBeUndefined(); - }); - - it('the note carries the reason beside each refused file', async () => { - const res = await sendShareSet(refuse('M_TOO_LARGE'), 't', clips.slice(0, 2)); - expect(resultNote(res)).toBe( - 'Nothing was shared. Not sent: a.ogg (too large for this server), b.ogg (too large for this server)' - ); - }); - - it('a failure the client saw, not the server, is named too', async () => { - const dropped: SharePort = { - send: async () => '$e', - contentOf: async () => { - throw Object.assign(new Error('x'), { - errcode: 'AbortError', - info: { aborted: true, progressed: true }, - }); - }, - }; - const res = await sendShareSet(dropped, 't', clips.slice(0, 1)); - expect(resultNote(res)).toBe( - 'Nothing was shared. Not sent: a.ogg (the connection dropped partway through)' - ); - }); - - it('an unnamed failure lists the bare name', async () => { - const res = await sendShareSet(refuse('M_UNKNOWN'), 't', clips.slice(0, 1)); - expect(resultNote(res)).toBe('Nothing was shared. Not sent: a.ogg'); - }); -}); - -describe('stopping a send', () => { - /** A port whose upload of `stopAt` aborts the signal as it runs, as the Stop button does mid-upload. */ - const stopping = (stopAt: string, abortAfterUpload = false) => { - const ac = new AbortController(); - const r = room(); - const port: SharePort = { - ...r.port, - signal: ac.signal, - contentOf: async (f) => { - if (f.name !== stopAt) return r.port.contentOf(f); - ac.abort(); - if (abortAfterUpload) return r.port.contentOf(f); - throw Object.assign(new Error('aborted'), { name: 'AbortError' }); - }, - }; - return { port, r }; - }; - - it('an upload aborted mid-file leaves that file and the rest unsent, named as stopped', async () => { - const { port, r } = stopping('b.ogg'); - const res = await sendShareSet(port, 't', clips); - expect(res.sent).toBe(1); - expect(res.failed).toEqual(['b.ogg', 'c.txt']); - expect(res.failedAt).toEqual([1, 2]); - expect(res.reasons).toEqual([CANCELLED, CANCELLED]); - expect(r.album().files.map((f) => f.name)).toEqual(['a.ogg']); - expect(remainingAfter(clips, res).map((f) => f.name)).toEqual(['b.ogg', 'c.txt']); - expect(resultNote(res)).toBe('Shared 1. Not sent: b.ogg (stopped), c.txt (stopped)'); - }); - - it('a file whose upload finished after the stop is not sent', async () => { - const { port, r } = stopping('b.ogg', true); - const res = await sendShareSet(port, 't', clips); - expect(res.sent).toBe(1); - expect(res.failedAt).toEqual([1, 2]); - expect(r.album().files.map((f) => f.name)).toEqual(['a.ogg']); - }); - - it('a signal already aborted starts nothing and sends everything back as unsent', async () => { - const r = room(); - const ac = new AbortController(); - ac.abort(); - let uploads = 0; - const res = await sendShareSet( - { - ...r.port, - signal: ac.signal, - contentOf: async (f) => { - uploads += 1; - return r.port.contentOf(f); - }, - }, - { albumId: '$a', lastId: '$l', lastTs: 1 }, - clips - ); - expect(uploads).toBe(0); - expect(res.sent).toBe(0); - expect(res.failedAt).toEqual([0, 1, 2]); - expect(r.events).toEqual([]); - }); - - it('an abort that is not a stop is an ordinary failure', async () => { - const r = room(['b.ogg']); - const res = await sendShareSet({ ...r.port, signal: new AbortController().signal }, 't', clips); - expect(res.failedAt).toEqual([1]); - expect(res.reasons).toEqual([undefined]); - }); -}); - -describe('freshest', () => { - const album = { albumId: '$alb', lastId: '$old', lastTs: 100 }; - it('moves lastId to a newer event of the same thread', () => { - expect( - freshest(album, [ - { id: '$mid', ts: 150, threadRoot: '$alb' }, - { id: '$new', ts: 200, threadRoot: '$alb' }, - ]) - ).toEqual({ albumId: '$alb', lastId: '$new', lastTs: 200 }); - }); - it('ignores older events and events of other threads or none', () => { - expect( - freshest(album, [ - { id: '$older', ts: 50, threadRoot: '$alb' }, - { id: '$other', ts: 900, threadRoot: '$else' }, - { id: '$loose', ts: 900 }, - ]) - ).toEqual(album); - }); -}); diff --git a/src/app/features/albums/shareSet.ts b/src/app/features/albums/shareSet.ts deleted file mode 100644 index 007d7e91..00000000 --- a/src/app/features/albums/shareSet.ts +++ /dev/null @@ -1,138 +0,0 @@ -// Share a set of files at once: one album root (a text message) and one thread reply per file. -// That is exactly the shape buildAlbums reads, so a set shared here and a set a Mind's mouth posts -// are the same thing to every viewer. Ports are injected so the order and the failure rules are -// testable without a homeserver. See docs/file-zone.md, "Share a set". - -import { uploadReason } from '../../utils/uploadReason'; - -export type ShareFile = { name: string; mimeType: string }; - -/** What sendShareSet needs from the outside world. */ -export type SharePort = { - /** Send an event and return its id. */ - send: (content: Record) => Promise; - /** Upload one file and build its message content (msgtype, url, info incl. sha256). */ - contentOf: (file: F) => Promise>; - /** Called after each file settles, for progress. */ - onFile?: (index: number, result: 'sent' | 'failed') => void; - /** Aborted to stop the send: the running upload is the port's to cancel, the rest are not started. */ - signal?: AbortSignal; -}; - -export type ShareResult = { - /** The album root's event id; present as soon as the root is sent. */ - albumId: string; - sent: number; - failed: string[]; - /** Positions in the files array of those that failed; names can repeat, positions cannot. */ - failedAt: number[]; - /** Why each failed file failed, parallel to `failed`, when the homeserver's refusal is one we name. */ - reasons?: (string | undefined)[]; -}; - -/** An album that already exists: new files join its thread after `lastId` (sent at `lastTs`), with no new root. */ -export type ExistingAlbum = { albumId: string; lastId: string; lastTs: number }; - -/** An event as the room's live timeline holds it: its id, time, and the thread root it belongs to. */ -export type ThreadEvent = { id: string; ts: number; threadRoot?: string }; - -/** - * `album` with `lastId` moved to the newest event the room's timeline holds in that thread, when it - * is newer than the one the album list knew. The list refreshes every 30 s; the timeline does not. - */ -export const freshest = (album: ExistingAlbum, events: ThreadEvent[]): ExistingAlbum => - events - .filter((e) => e.threadRoot === album.albumId) - .reduce((a, e) => (e.ts > a.lastTs ? { ...a, lastId: e.id, lastTs: e.ts } : a), album); - -export const CANCELLED = 'stopped'; - -/** The short reason for a failure we can name (the homeserver's refusal or what the client saw), else undefined. */ -export const refusalOf = (e: unknown): string | undefined => uploadReason(e)?.cause; - -/** The reply relation Matrix clients expect for a thread message: root, with the last event as fallback reply. */ -export const threadRelation = (rootId: string, lastId: string) => ({ - rel_type: 'm.thread', - event_id: rootId, - is_falling_back: true, - 'm.in_reply_to': { event_id: lastId }, -}); - -export const DEFAULT_TITLE = 'Shared files'; - -export const titleOrDefault = (title: string): string => title.trim() || DEFAULT_TITLE; - -/** - * Files go one at a time, in the order given, so thread order is pick order. A file that fails - * to upload is reported by name and the rest still go; the root is already out, so stopping would - * leave an empty album and the sender nothing to retry from. A root that fails to send throws: - * nothing exists yet. - */ -export const sendShareSet = async ( - port: SharePort, - into: string | ExistingAlbum, - files: F[] -): Promise => { - const albumId = - typeof into === 'string' - ? await port.send({ msgtype: 'm.text', body: titleOrDefault(into) }) - : into.albumId; - const result: ShareResult = { albumId, sent: 0, failed: [], failedAt: [], reasons: [] }; - let lastId = typeof into === 'string' ? albumId : into.lastId; - // A stopped send leaves its file, and every file after it, unsent and picked, so one tap resumes. - const stopFrom = (from: number) => { - for (let j = from; j < files.length; j += 1) { - result.failed.push(files[j].name); - result.reasons?.push(CANCELLED); - result.failedAt.push(j); - } - }; - for (let i = 0; i < files.length; i += 1) { - if (port.signal?.aborted) { - stopFrom(i); - break; - } - try { - // eslint-disable-next-line no-await-in-loop - const content = await port.contentOf(files[i]); - if (port.signal?.aborted) { - stopFrom(i); - break; - } - // eslint-disable-next-line no-await-in-loop - lastId = await port.send({ ...content, 'm.relates_to': threadRelation(albumId, lastId) }); - result.sent += 1; - port.onFile?.(i, 'sent'); - } catch (e) { - if (port.signal?.aborted) { - stopFrom(i); - break; - } - result.failed.push(files[i].name); - result.reasons?.push(refusalOf(e)); - result.failedAt.push(i); - port.onFile?.(i, 'failed'); - } - } - return result; -}; - -/** - * What stays picked after a send: only the files that did not go, so a retry is one tap. A retry - * of a new album makes a second album, and a share where nothing went - * leaves its root as a lone message the album list does not show (it lists threads with replies). - */ -export const remainingAfter = (files: T[], result: ShareResult): T[] => - files.filter((_, i) => result.failedAt.includes(i)); - -const failedList = (result: ShareResult): string => - result.failed - .map((name, i) => (result.reasons?.[i] ? `${name} (${result.reasons[i]})` : name)) - .join(', '); - -export const resultNote = (result: ShareResult): string => { - if (result.failed.length === 0) - return `Shared ${result.sent} ${result.sent === 1 ? 'file' : 'files'}.`; - if (result.sent === 0) return `Nothing was shared. Not sent: ${failedList(result)}`; - return `Shared ${result.sent}. Not sent: ${failedList(result)}`; -}; diff --git a/src/app/features/albums/useAlbums.ts b/src/app/features/albums/useAlbums.ts deleted file mode 100644 index 13c199ec..00000000 --- a/src/app/features/albums/useAlbums.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { useQuery } from '@tanstack/react-query'; -import { ClientPrefix, Method, Room } from 'matrix-js-sdk'; -import { StateEvent } from '../../../types/matrix/room'; -import { useStateEvent } from '../../hooks/useStateEvent'; -import { useMatrixClient } from '../../hooks/useMatrixClient'; -import { useClientConfig } from '../../hooks/useClientConfig'; -import { Album, ZoneEvent, buildAlbums } from './buildAlbums'; -import { isFileZone } from './isFileZone'; -import { mapLimit } from './mapLimit'; -import { Page, readPages } from './readPages'; - -const REPLY_FETCHES_IN_FLIGHT = 6; -const REFRESH_MS = 30_000; - -/** True when the room is the file zone: by its create type, or listed in the client config. */ -export const useIsFileZone = (room: Room): boolean => { - const config = useClientConfig(); - // Subscribes to alias changes (alt aliases live in the same event). - useStateEvent(room, StateEvent.RoomCanonicalAlias); - const createType = room.currentState.getStateEvents('m.room.create', '')?.getContent().type; - return isFileZone( - { - roomId: room.roomId, - aliases: [room.getCanonicalAlias(), ...room.getAltAliases()].filter((a): a is string => !!a), - createType, - }, - config - ); -}; - -export type AlbumsState = { - loading: boolean; - error: Error | null; - albums: Album[]; - /** A read hit the page cap (readPages), so older albums or files are not in the list. */ - truncated: boolean; -}; - -const PAGE_LIMIT = '100'; - -/** - * Reads every page of the zone's threads, then every page of each thread's replies, each capped at - * MAX_PAGES (readPages). Reads are made with the logged-in client, so the room must be - * unencrypted: encrypted events carry no msgtype and are skipped. - */ -export const useAlbums = (room: Room): AlbumsState => { - const mx = useMatrixClient(); - const { roomId } = room; - const query = useQuery({ - queryKey: ['albums', roomId], - queryFn: async (): Promise<{ albums: Album[]; truncated: boolean }> => { - const get = (path: string, params: Record) => - mx.http.authedRequest>(Method.Get, path, params, undefined, { - prefix: ClientPrefix.V1, - }); - const paged = (path: string, params: Record) => - readPages((from) => get(path, from ? { ...params, from } : params)); - const room_ = encodeURIComponent(roomId); - const roots = await paged(`/rooms/${room_}/threads`, { limit: PAGE_LIMIT }); - let { truncated } = roots; - const inputs = await mapLimit( - roots.items, - REPLY_FETCHES_IN_FLIGHT, - async (root: ZoneEvent) => { - const replies = await paged( - `/rooms/${room_}/relations/${encodeURIComponent(root.event_id ?? '')}/m.thread`, - { limit: PAGE_LIMIT, dir: 'f' } - ); - truncated = truncated || replies.truncated; - return { root, replies: replies.items }; - } - ); - return { albums: buildAlbums(inputs, mx.getDomain() ?? ''), truncated }; - }, - retry: 1, - refetchInterval: REFRESH_MS, - }); - return { - loading: query.isLoading, - // A failed refetch keeps the albums already loaded; the error shows only when there are none. - error: query.data ? null : (query.error as Error | null), - albums: query.data?.albums ?? [], - truncated: query.data?.truncated ?? false, - }; -}; diff --git a/src/app/features/albums/useFileReaders.ts b/src/app/features/albums/useFileReaders.ts deleted file mode 100644 index 5ade3827..00000000 --- a/src/app/features/albums/useFileReaders.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { useMemo, useSyncExternalStore } from 'react'; -import { Room } from 'matrix-js-sdk'; -import { useMatrixClient } from '../../hooks/useMatrixClient'; -import { FileReader, readersOf } from './fileReceipt'; -import { receiptStoreOf } from './receiptStore'; - -/** - * Who has read a file, from the receipts in the room's loaded timeline: a plain room event or a thread reply, both - * count (docs/file-zone-mind-contract.md). `content` is the file event's content, which carries its `info.sha256`. - * The room's one shared subscription (receiptStore.ts) feeds every file row. - */ -export const useFileReaders = ( - room: Room, - fileId: string, - content: Record -): FileReader[] => { - const mx = useMatrixClient(); - const server = mx.getDomain() ?? ''; - const store = receiptStoreOf(room); - const receipts = useSyncExternalStore(store.subscribe, store.getSnapshot); - return useMemo( - () => readersOf(receipts, fileId, content, server), - [receipts, fileId, content, server] - ); -}; diff --git a/src/app/features/albums/versions.test.ts b/src/app/features/albums/versions.test.ts deleted file mode 100644 index 5179e945..00000000 --- a/src/app/features/albums/versions.test.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { PUBLISH_KEY, foldVersions, replacesOf } from './versions'; - -type F = { id: string; sender: string; content: Record; earlier: F[] }; -const f = (id: string, replaces?: string, sender = '@m:x'): F => ({ - id, - sender, - content: replaces ? { [PUBLISH_KEY]: { replaces } } : {}, - earlier: [], -}); -const shape = (files: F[]): unknown => files.map((x) => [x.id, x.earlier.map((e) => e.id)]); - -describe('replacesOf', () => { - it('reads the id the publisher key names', () => { - expect(replacesOf({ [PUBLISH_KEY]: { replaces: '$a' } })).toBe('$a'); - }); - it('anything else says nothing', () => { - expect(replacesOf({})).toBeUndefined(); - expect(replacesOf({ [PUBLISH_KEY]: {} })).toBeUndefined(); - expect(replacesOf({ [PUBLISH_KEY]: { replaces: 3 } })).toBeUndefined(); - expect(replacesOf({ [PUBLISH_KEY]: { replaces: '' } })).toBeUndefined(); - expect(replacesOf({ [PUBLISH_KEY]: 'x' })).toBeUndefined(); - }); -}); - -describe('foldVersions', () => { - it('files that replace nothing pass through in order, with nothing folded', () => { - expect(shape(foldVersions([f('$a'), f('$b')]))).toEqual([ - ['$a', []], - ['$b', []], - ]); - }); - - it('shows the latest of a chain with earlier versions nearest first', () => { - expect(shape(foldVersions([f('$a'), f('$b', '$a'), f('$c', '$b')]))).toEqual([ - ['$c', ['$b', '$a']], - ]); - }); - - it('keeps unrelated files beside a chain, in order', () => { - expect(shape(foldVersions([f('$a'), f('$x'), f('$b', '$a')]))).toEqual([ - ['$x', []], - ['$b', ['$a']], - ]); - }); - - it('a replacement whose target is not in the list stands alone', () => { - expect(shape(foldVersions([f('$b', '$gone')]))).toEqual([['$b', []]]); - }); - - it('a file two others replace sits under both', () => { - expect(shape(foldVersions([f('$a'), f('$b', '$a'), f('$c', '$a')]))).toEqual([ - ['$b', ['$a']], - ['$c', ['$a']], - ]); - }); - - it('files in a loop with no head outside it are all shown, none hidden', () => { - const out = foldVersions([f('$a', '$b'), f('$b', '$a'), f('$s', '$s')]); - expect(shape(out)).toEqual([ - ['$a', []], - ['$b', []], - ['$s', []], - ]); - }); - - it('a loop reached from a head is walked once and ends', () => { - const out = foldVersions([f('$a', '$b'), f('$b', '$a'), f('$h', '$a')]); - expect(shape(out)).toEqual([['$h', ['$a', '$b']]]); - }); - - it('a replacement by another sender folds nothing', () => { - const out = foldVersions([f('$victim', undefined, '@m:x'), f('$evil', '$victim', '@e:x')]); - expect(shape(out)).toEqual([ - ['$victim', []], - ['$evil', []], - ]); - }); - - it('an empty list is empty', () => { - expect(foldVersions([])).toEqual([]); - }); -}); diff --git a/src/app/features/albums/versions.ts b/src/app/features/albums/versions.ts deleted file mode 100644 index e27ff6d0..00000000 --- a/src/app/features/albums/versions.ts +++ /dev/null @@ -1,56 +0,0 @@ -// Pure: a file event may name the event it supersedes in `org.gamecult.publish.replaces` (the -// publisher writes it on a later final version; docs/commons-files-desk.md, "replaces, not -// m.replace"). Both events stay ordinary files for every other client; this view shows the latest -// of a chain with the earlier ones folded under it. A chain is read from the events alone. - -/** Key the publisher writes its provenance under. */ -export const PUBLISH_KEY = 'org.gamecult.publish'; - -/** The event id a file says it replaces, if it says one. */ -export const replacesOf = (content: Record): string | undefined => { - const id = (content[PUBLISH_KEY] as { replaces?: unknown } | undefined)?.replaces; - return typeof id === 'string' && id ? id : undefined; -}; - -type Versioned = F & { earlier: F[] }; - -/** - * Files not replaced by another file in the list, oldest first as given, each carrying the files it - * supersedes (nearest first) in `earlier`. A replacement whose target is missing from the list (a - * redacted event, another thread) replaces nothing and stands as a head. A replacement by another sender is ignored. A file two others claim to - * replace sits under both. The walk refuses to revisit a file, so a malformed chain cannot loop (a real event id hashes its content and cannot cycle); files caught in a loop with no head outside it are all shown, none folded. - */ -export const foldVersions = < - F extends { id: string; sender: string; content: Record } ->( - files: Versioned[] -): Versioned[] => { - const byId = new Map(files.map((f) => [f.id, f])); - const target = (f: F): F | undefined => { - const id = replacesOf(f.content); - const t = id && id !== f.id ? byId.get(id) : undefined; - // Only the sender of a file can supersede it, so no one else in the thread can fold it away. - return t && t.sender === f.sender ? t : undefined; - }; - const replaced = new Set(); - files.forEach((f) => { - const t = target(f); - if (t) replaced.add(t.id); - }); - const chainOf = (head: Versioned): Versioned[] => { - const out: Versioned[] = []; - const seen = new Set([head.id]); - for (let t = target(head); t && !seen.has(t.id); t = target(t)) { - seen.add(t.id); - out.push({ ...t, earlier: [] }); - } - return out; - }; - const heads = files.filter((f) => !replaced.has(f.id)); - const covered = new Set(heads.flatMap((h) => [h.id, ...chainOf(h).map((e) => e.id)])); - // Files that replace one another with no head outside the loop are never reached from a head; show - // each of them as it is rather than let the loop hide itself. - return files - .filter((f) => !replaced.has(f.id) || !covered.has(f.id)) - .map((f) => ({ ...f, earlier: replaced.has(f.id) ? [] : chainOf(f) })); -}; diff --git a/src/app/features/albums/zoneView.test.ts b/src/app/features/albums/zoneView.test.ts deleted file mode 100644 index 65beb9cb..00000000 --- a/src/app/features/albums/zoneView.test.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { zoneView } from './zoneView'; - -describe('zoneView', () => { - it('opens albums by default and the timeline for an event deep link', () => { - expect(zoneView(undefined, undefined)).toBe('albums'); - expect(zoneView(undefined, '$e')).toBe('timeline'); - }); - it('lets an event link win over an earlier choice of albums', () => { - expect(zoneView('albums', '$e')).toBe('timeline'); - }); - it('honours the choice when there is no event link', () => { - expect(zoneView('albums', undefined)).toBe('albums'); - expect(zoneView('timeline', undefined)).toBe('timeline'); - }); -}); diff --git a/src/app/features/albums/zoneView.ts b/src/app/features/albums/zoneView.ts deleted file mode 100644 index 1af7f705..00000000 --- a/src/app/features/albums/zoneView.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type ZoneView = 'albums' | 'timeline'; - -/** The view a file-zone room shows. A link to an event always wins; else the user's choice; else albums. */ -export const zoneView = (choice: ZoneView | undefined, eventId: string | undefined): ZoneView => - eventId ? 'timeline' : choice ?? 'albums'; diff --git a/src/app/features/call-status/CallControl.tsx b/src/app/features/call-status/CallControl.tsx index d63f8709..1808be92 100644 --- a/src/app/features/call-status/CallControl.tsx +++ b/src/app/features/call-status/CallControl.tsx @@ -5,7 +5,6 @@ import { StatusDivider } from './components'; import { CallEmbed, useCallControlState } from '../../plugins/call'; import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; import { callEmbedAtom } from '../../state/callEmbed'; -import { PhoneHitSpread26 } from '../../styles/PhoneHit.css'; type MicrophoneButtonProps = { enabled: boolean; @@ -15,7 +14,7 @@ type MicrophoneButtonProps = { function MicrophoneButton({ enabled, onToggle, disabled }: MicrophoneButtonProps) { const [micState, toggleMic] = useAsyncCallback(onToggle); const loading = micState.status === AsyncStatus.Loading; - + return ( {(anchorRef) => ( {(anchorRef) => ( {(anchorRef) => ( {(anchorRef) => ( callEmbed.control.toggleMicrophone(), - [callEmbed] - ); + const handleMicrophoneToggle = useCallback(() => callEmbed.control.toggleMicrophone(), [callEmbed]); const handleVideoToggle = useCallback(() => callEmbed.control.toggleVideo(), [callEmbed]); const [hangupState, hangup] = useAsyncCallback( @@ -203,7 +195,11 @@ export function CallControl({ disabled={!callJoined} /> {!compact && } - + {!compact && ( callEmbed.control.toggleMicrophone(), - [callEmbed] - ); + const handleMicrophoneToggle = useCallback(() => callEmbed.control.toggleMicrophone(), [callEmbed]); const handleVideoToggle = useCallback(() => callEmbed.control.toggleVideo(), [callEmbed]); const [hangupState, hangup] = useAsyncCallback( @@ -101,7 +97,10 @@ export function CallControls({ callEmbed }: CallControlsProps) { > - + callEmbed.control.toggleSound()} /> {!compact && } @@ -170,7 +169,6 @@ export function CallControls({ callEmbed }: CallControlsProps) { } > diff --git a/src/app/features/call/Controls.tsx b/src/app/features/call/Controls.tsx index 560ed8e5..6aa94ff5 100644 --- a/src/app/features/call/Controls.tsx +++ b/src/app/features/call/Controls.tsx @@ -4,7 +4,6 @@ import { useAtom } from 'jotai'; import * as css from './styles.css'; import { callChatAtom } from '../../state/callEmbed'; import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; -import { PhoneHitSpread40 } from '../../styles/PhoneHit.css'; export function ControlDivider() { return ( @@ -19,7 +18,7 @@ type MicrophoneButtonProps = { export function MicrophoneButton({ enabled, onToggle }: MicrophoneButtonProps) { const [micState, toggleMic] = useAsyncCallback(onToggle); const loading = micState.status === AsyncStatus.Loading; - + return ( {(anchorRef) => ( {(anchorRef) => ( {(anchorRef) => ( {(anchorRef) => ( {(anchorRef) => ( toggleMicrophone(), [toggleMicrophone]); const handleVideoToggle = useCallback(async () => toggleVideo(), [toggleVideo]); diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx index 61e05a62..29b6aa51 100644 --- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx +++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx @@ -30,7 +30,6 @@ import { AccountDataSubmitCallback, } from '../../../components/AccountDataEditor'; import { useMatrixClient } from '../../../hooks/useMatrixClient'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; type DeveloperToolsProps = { requestClose: () => void; @@ -93,7 +92,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) { - + diff --git a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx index a6e60a7b..f25ba7c3 100644 --- a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx +++ b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx @@ -22,7 +22,6 @@ import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor'; import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; import { syntaxErrorPosition } from '../../../utils/dom'; import { Cursor } from '../../../plugins/text-area'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; const EDITOR_INTENT_SPACE_COUNT = 2; @@ -119,7 +118,7 @@ export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventPro - + diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx index 0f9f4034..0ea96901 100644 --- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx +++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx @@ -31,7 +31,6 @@ import { usePowerLevels } from '../../../hooks/usePowerLevels'; import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor'; import { useRoomCreators } from '../../../hooks/useRoomCreators'; import { useRoomPermissions } from '../../../hooks/useRoomPermissions'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; const EDITOR_INTENT_SPACE_COUNT = 2; @@ -276,7 +275,7 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi - + diff --git a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx index f7e901d5..ad8ffae6 100644 --- a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx +++ b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx @@ -4,7 +4,6 @@ import { Page, PageContent, PageHeader } from '../../../components/page'; import { ImagePack } from '../../../plugins/custom-emoji'; import { ImagePackView } from '../../../components/image-pack-view'; import { RoomPacks } from './RoomPacks'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; type EmojisStickersProps = { requestClose: () => void; @@ -30,7 +29,7 @@ export function EmojisStickers({ requestClose }: EmojisStickersProps) { - + diff --git a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx index 7be8de35..fdbe546e 100644 --- a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx +++ b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx @@ -40,7 +40,6 @@ import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; import { useAlive } from '../../../hooks/useAlive'; import { useRoomCreators } from '../../../hooks/useRoomCreators'; import { useRoomPermissions } from '../../../hooks/useRoomPermissions'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; type CreatePackTileProps = { packs: ImagePack[]; @@ -216,7 +215,6 @@ export function RoomPacks({ onViewPack }: RoomPacksProps) { {canEdit && (removed ? ( ) : ( Enable Encryption - setPrompt(false)} - radii="300" - > + setPrompt(false)} radii="300"> diff --git a/src/app/features/common-settings/general/RoomUpgrade.tsx b/src/app/features/common-settings/general/RoomUpgrade.tsx index 2971d565..45a480aa 100644 --- a/src/app/features/common-settings/general/RoomUpgrade.tsx +++ b/src/app/features/common-settings/general/RoomUpgrade.tsx @@ -39,7 +39,6 @@ import { useAlive } from '../../../hooks/useAlive'; import { creatorsSupported } from '../../../utils/matrix'; import { useRoomCreators } from '../../../hooks/useRoomCreators'; import { BreakWord } from '../../../styles/Text.css'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; function RoomUpgradeDialog({ requestClose }: { requestClose: () => void }) { const mx = useMatrixClient(); @@ -106,7 +105,7 @@ function RoomUpgradeDialog({ requestClose }: { requestClose: () => void }) { {room.isSpaceRoom() ? 'Space Upgrade' : 'Room Upgrade'} - + diff --git a/src/app/features/common-settings/members/Members.tsx b/src/app/features/common-settings/members/Members.tsx index a1dddb54..15cd1d08 100644 --- a/src/app/features/common-settings/members/Members.tsx +++ b/src/app/features/common-settings/members/Members.tsx @@ -56,7 +56,6 @@ import { useSpaceOptionally } from '../../../hooks/useSpace'; import { useFlattenPowerTagMembers, useGetMemberPowerTag } from '../../../hooks/useMemberPowerTag'; import { useRoomCreators } from '../../../hooks/useRoomCreators'; import { getMouseEventCords } from '../../../utils/dom'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; const SEARCH_OPTIONS: UseAsyncSearchOptions = { limit: 1000, @@ -162,7 +161,7 @@ export function Members({ requestClose }: MembersProps) { - + @@ -278,7 +277,6 @@ export function Members({ requestClose }: MembersProps) { anchorRef={scrollTopAnchorRef} > virtualizer.scrollToOffset(0)} variant="Surface" radii="Pill" diff --git a/src/app/features/common-settings/permissions/PowersEditor.tsx b/src/app/features/common-settings/permissions/PowersEditor.tsx index 0684a48a..97305946 100644 --- a/src/app/features/common-settings/permissions/PowersEditor.tsx +++ b/src/app/features/common-settings/permissions/PowersEditor.tsx @@ -49,7 +49,6 @@ import { useAlive } from '../../../hooks/useAlive'; import { BetaNoticeBadge } from '../../../components/BetaNoticeBadge'; import { getPowerTagIconSrc } from '../../../hooks/useMemberPowerTag'; import { creatorsSupported } from '../../../utils/matrix'; -import { PhoneHit } from '../../../styles/PhoneHit.css'; type EditPowerProps = { maxPower: number; @@ -370,7 +369,7 @@ export function PowersEditor({ powerLevels, requestClose }: PowersEditorProps) { - + diff --git a/src/app/features/create-room/CreateRoomModal.tsx b/src/app/features/create-room/CreateRoomModal.tsx index 9332f35c..d5d8c92d 100644 --- a/src/app/features/create-room/CreateRoomModal.tsx +++ b/src/app/features/create-room/CreateRoomModal.tsx @@ -24,7 +24,6 @@ import { import { CreateRoomModalState } from '../../state/createRoomModal'; import { stopPropagation } from '../../utils/keyboard'; import { CreateRoomType } from '../../components/create-room/types'; -import { PhoneHit } from '../../styles/PhoneHit.css'; type CreateRoomModalProps = { state: CreateRoomModalState; @@ -64,7 +63,7 @@ function CreateRoomModal({ state }: CreateRoomModalProps) { - + diff --git a/src/app/features/create-space/CreateSpaceModal.tsx b/src/app/features/create-space/CreateSpaceModal.tsx index faa53b25..c1bc6898 100644 --- a/src/app/features/create-space/CreateSpaceModal.tsx +++ b/src/app/features/create-space/CreateSpaceModal.tsx @@ -23,7 +23,6 @@ import { } from '../../state/hooks/createSpaceModal'; import { CreateSpaceModalState } from '../../state/createSpaceModal'; import { stopPropagation } from '../../utils/keyboard'; -import { PhoneHit } from '../../styles/PhoneHit.css'; type CreateSpaceModalProps = { state: CreateSpaceModalState; @@ -62,7 +61,7 @@ function CreateSpaceModal({ state }: CreateSpaceModalProps) { New Space - + diff --git a/src/app/features/desk/Desk.tsx b/src/app/features/desk/Desk.tsx deleted file mode 100644 index d6795ac4..00000000 --- a/src/app/features/desk/Desk.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import React, { useMemo } from 'react'; -import { useNavigate, useParams } from 'react-router-dom'; -import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds'; -import { PhoneHit } from '../../styles/PhoneHit.css'; -import { Page, PageContent, PageContentCenter, PageHeader } from '../../components/page'; -import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize'; -import { getHomePath } from '../../pages/pathUtils'; -import { DeskView } from './DeskView'; -import { useUnverified } from './useUnverified'; -import { deskFor } from './source'; - -const labelOf = (mind: string) => mind.charAt(0).toUpperCase() + mind.slice(1); - -/** The route's page: one Mind's desk under the navigator. */ -export function Desk() { - const { mind = '' } = useParams(); - const navigate = useNavigate(); - const phone = useScreenSizeContext() === ScreenSize.Mobile; - const label = labelOf(mind); - const list = useMemo(() => deskFor(mind), [mind]); - // Until the recompute finishes nothing is flagged; a card that fails is withdrawn when it lands. - const unverified = useUnverified(list); - - return ( - - - - - {phone && ( - navigate(getHomePath())} - > - - - )} - - {`${label}'s desk`} - - - - - - - - - - - - - - ); -} diff --git a/src/app/features/desk/DeskEntry.tsx b/src/app/features/desk/DeskEntry.tsx deleted file mode 100644 index 511b0783..00000000 --- a/src/app/features/desk/DeskEntry.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import React, { useMemo } from 'react'; -import { Box, Icon, Icons, Text } from 'folds'; -import { NavGutter, NavItem, NavItemContent, NavLink } from '../../components/nav'; -import { NAV_ROOM_ICON_REST_OPACITY, NavLabel } from '../../components/nav/styles.css'; -import { getDeskPath } from '../../pages/pathUtils'; -import { buildDesk } from './buildDesk'; -import { ForkList } from './forkContract'; -import { deskFor } from './source'; -import { useUnverified } from './useUnverified'; - -export function DeskLink({ mind, open }: { mind: string; open: number }) { - return ( - - - - - - - - - {open > 0 ? `Desk · ${open} open` : 'Desk'} - - - - - - ); -} - -/** The navigator's count: the desk page's own, and none until the hash check has landed. */ -export const openCount = ( - list: ForkList | undefined, - unverified: ReadonlySet | undefined -): number => (unverified ? buildDesk(list, unverified).counts.open : 0); - -/** A Mind's desk, pinned at the top of its navigator group: always there, with the open count when there is one. */ -export function DeskEntry({ mind }: { mind: string }) { - const list = useMemo(() => deskFor(mind), [mind]); - const unverified = useUnverified(list); - // The same count the desk page shows; until the hash check lands there is no count to show. - return ; -} diff --git a/src/app/features/desk/DeskView.css.ts b/src/app/features/desk/DeskView.css.ts deleted file mode 100644 index 042f0644..00000000 --- a/src/app/features/desk/DeskView.css.ts +++ /dev/null @@ -1,122 +0,0 @@ -import { globalStyle, style } from '@vanilla-extract/css'; -import { color, config, toRem } from 'folds'; -import { MOBILE_BREAKPOINT } from '../../hooks/useScreenSize'; - -const PHONE = `screen and (max-width: ${MOBILE_BREAKPOINT}px)`; - -/** Rows and booth side by side on wide screens. */ -export const Layout = style({ - display: 'flex', - gap: config.space.S500, - alignItems: 'flex-start', - '@media': { [PHONE]: { display: 'block', paddingBottom: toRem(120) } }, -}); - -export const Rows = style({ flex: 1, minWidth: 0, margin: 0, padding: 0, listStyle: 'none' }); - -/** A hairline splits rows; it is the only chrome. */ -export const Row = style({ - padding: `${config.space.S300} 0`, - borderTop: `1px solid ${color.Background.ContainerLine}`, -}); - -export const Title = style({ - margin: 0, - font: 'inherit', - fontWeight: 600, -}); - -/** The fold button reads as the title itself, not as a control. */ -export const Fold = style({ - all: 'unset', - cursor: 'pointer', - width: '100%', - minHeight: 44, - boxSizing: 'border-box', - display: 'flex', - alignItems: 'center', - justifyContent: 'space-between', - gap: config.space.S200, - // A folded row says it can be opened: a chevron at the end, turned down while the row is open. - selectors: { - '&::after': { - content: '"›"', - flexShrink: 0, - fontSize: '1.5em', - lineHeight: 1, - transition: 'transform 120ms', - }, - '&[aria-expanded=true]::after': { transform: 'rotate(90deg)' }, - }, -}); - -// Quiet lines (age, who it waits on, helper text) were measured at 4.5 over the day sky and 3.9-4.0 at dusk and night -// with the theme's 0.75 (taps2/desk-REPORT.md); 0.9 clears 4.5 in all three. -export const Quiet = style({ opacity: 0.9, margin: `${config.space.S100} 0` }); -export const Body = style({ whiteSpace: 'pre-wrap', margin: `${config.space.S200} 0` }); -export const Options = style({ margin: 0, padding: 0, listStyle: 'none' }); -export const Option = style({ padding: `${config.space.S100} 0` }); - -export const Note = style({ - display: 'block', - width: '100%', - boxSizing: 'border-box', - minHeight: 44, - margin: `${config.space.S200} 0`, - font: 'inherit', - color: 'inherit', - background: 'none', - // The note is disabled (slice 1). Its border is a UI boundary (3:1 wanted; the faint line under the 0.38 disabled - // opacity measured 2.0), so it is drawn dashed in the full ink and not faded. - border: '1px dashed currentColor', -}); - -/** Sticky beside the rows on wide screens; a small fixed corner image on phones. */ -export const Booth = style({ - position: 'sticky', - top: config.space.S400, - width: toRem(168), - flexShrink: 0, - '@media': { - [PHONE]: { - position: 'fixed', - top: 'auto', - right: config.space.S200, - bottom: config.space.S200, - width: toRem(88), - }, - }, -}); - -// PoseAvatar's button is laid out for message gutters; the booth takes it back into flow. -globalStyle(`${Booth} > [data-pose]`, { - position: 'static', - float: 'none', - display: 'block', - width: '100%', - height: 'auto', - margin: 0, - maskImage: 'none', - WebkitMaskImage: 'none', - cursor: 'default', -}); - -export const BoothLine = style({ - '@media': { - // Still read out by the live region; only the picture shows in the corner. - [PHONE]: { - position: 'absolute', - width: 1, - height: 1, - overflow: 'hidden', - clip: 'rect(0 0 0 0)', - whiteSpace: 'nowrap', - }, - }, -}); - -/** The recorded rulings sit on the dark ridge in every sky; they carry their own ground (scrimStyle). */ -export const Recorded = style({ - marginTop: config.space.S400, - padding: `${config.space.S200} ${config.space.S300}`, -}); diff --git a/src/app/features/desk/DeskView.test.tsx b/src/app/features/desk/DeskView.test.tsx deleted file mode 100644 index 9fde039b..00000000 --- a/src/app/features/desk/DeskView.test.tsx +++ /dev/null @@ -1,318 +0,0 @@ -import React from 'react'; -import { renderToStaticMarkup } from 'react-dom/server'; -import { MemoryRouter } from 'react-router-dom'; -import { afterEach, describe, expect, it, vi } from 'vitest'; -import { ScreenSize, ScreenSizeProvider } from '../../hooks/useScreenSize'; -import { SkyInkContextProvider } from '../../hooks/useTheme'; -import { SCRIM_GROUND, SCRIM_INK } from '../scene/skyInk'; -import { DeskEntry, DeskLink, openCount } from './DeskEntry'; -import { DeskView, SIGN_IN_NOTE, rowOpen } from './DeskView'; -import { ForkList } from './forkContract'; -import { STATES, entry as forkEntry, list as forkList } from './fixtures'; -import { setDeskSource } from './source'; - -// useTheme reads the stored settings when it loads. -vi.hoisted(() => vi.stubGlobal('localStorage', { getItem: () => null, setItem: () => undefined })); - -const view = ( - state: keyof typeof STATES | 'unpublished', - size: ScreenSize, - mind = 'void', - unverified = new Set() -) => - renderToStaticMarkup( - - - - ); - -describe('DeskView', () => { - it('folds a row behind its title on a phone, with the fold button saying so', () => { - const html = view('noAnswers', ScreenSize.Mobile); - expect(html).toContain('aria-expanded="false"'); - expect(html).toContain('Question plain'); - expect(html).not.toContain('Context for plain'); - expect(html).not.toContain('First way'); - }); - it('shows the row open, with no fold button, on a wide screen', () => { - const html = view('noAnswers', ScreenSize.Desktop); - expect(html).not.toContain('aria-expanded'); - expect(html).toContain('Context for plain'); - expect(html).toContain('First way'); - }); - it('states the recommendation in words, on that option only', () => { - const html = view('noAnswers', ScreenSize.Desktop); - expect(html.match(/\(recommended\)/g)).toHaveLength(1); - expect(html).toContain('B Second way (recommended)'); - }); - it('keeps the note disabled and says why in a sentence the field points at', () => { - const html = view('noAnswers', ScreenSize.Desktop); - expect(html).toMatch(/]* disabled=""/); - expect(html).toContain(SIGN_IN_NOTE); - expect(SIGN_IN_NOTE).toMatch(/sign-in/); - expect(html).toMatch(/aria-describedby="note-[^"]+-why"/); - }); - it('shows the depends line as the text it is', () => { - expect(view('blocked', ScreenSize.Desktop)).toContain( - 'Waits on: "Needs the first one settled"' - ); - }); - it('says No answers yet on a row without answers', () => { - expect(view('noAnswers', ScreenSize.Desktop)).toContain('No answers yet.'); - }); - it('lists settled questions as recorded rulings with the ruling id', () => { - const html = view('settled', ScreenSize.Desktop); - expect(html).toContain('Recorded as rulings'); - expect(html).toContain('Question done (ruling:done-1)'); - expect(html).not.toContain('Question shut'); - }); - it('gives the recorded rulings their own ground and ink while a scene runs, none without one', () => { - const withScene = renderToStaticMarkup( - - - - - - ); - // renderToStaticMarkup writes the inline style as the browser would read it back - expect(withScene).toContain(SCRIM_GROUND.replace(/, /g, ', ')); - expect(withScene).toContain(`color:${SCRIM_INK}`); - expect(view('settled', ScreenSize.Desktop)).not.toContain('background-color'); - }); - it('shows each outcome quietly, marks the counted answer, and renders a note only when sent', () => { - const html = view('answered', ScreenSize.Desktop); - expect(html).toContain( - 'Answer First way "Because it is first." (2026-11-09) (counted)' - ); - expect(html).toContain('Revision of n1 Third way (2026-11-09)'); - expect(html).toContain('Retraction of n2 (2026-11-09)'); - expect(html).toContain('Refused (not_a_decider) Second way "Let me in."'); - expect(html).toContain('Answer "Either, if measured first."'); - expect(html.match(/\(counted\)/g)).toHaveLength(1); - expect(html).not.toContain('"null"'); - }); - it('says nothing is waiting when empty, and that nothing is published when it never arrived', () => { - expect(view('empty', ScreenSize.Desktop)).toContain('Nothing is waiting on you from Void.'); - expect(view('unpublished', ScreenSize.Desktop)).toContain( - 'Void's questions have not been published yet.' - ); - }); - it('seats the Mind in the booth with the pose for the desk mood', () => { - const html = view('noAnswers', ScreenSize.Desktop); - expect(html).toContain('data-pose="thinking"'); - expect(html).toContain('Just one fork on the desk.'); - }); - it('makes the booth portrait a plain image: no button, no tab stop', () => { - const html = view('noAnswers', ScreenSize.Desktop); - const booth = html.slice(html.indexOf('data-pose')); - expect(booth).toContain(']*data-pose/); - expect(html).not.toMatch(/<[a-z]+[^>]*data-pose[^>]*tabindex/); - expect(html).toMatch(/]*data-pose/); - }); - it('withdraws a card whose hash does not match and does not count it open', () => { - const html = view('noAnswers', ScreenSize.Desktop, 'void', new Set(['c:question:plain'])); - expect(html).toContain('does not match the hash it was published with'); - expect(html).not.toContain('First way'); - expect(html).toContain('Nothing is waiting on you from Void.'); - expect(html).not.toContain('1 open.'); - }); - it('never claims an empty desk while the list says forks are open, whatever rows it could show', () => { - setDeskSource(() => undefined); - const html = renderToStaticMarkup( - - - - ); - expect(html).toContain('3 open.'); - expect(html).not.toContain('Nothing is waiting'); - }); - it('says every row is read-only for a signed-out viewer, in every state the fixtures hold', () => { - (['noAnswers', 'blocked', 'answered', 'settled'] as const).forEach((state) => { - const html = view(state, ScreenSize.Desktop); - const rows = html.match(/