Compare commits
57
Commits
@@ -1,14 +1,16 @@
|
|||||||
name: Publish release
|
name: Publish release
|
||||||
|
|
||||||
# Portal no longer deploys itself. Each content repo (uhhm/questions,
|
# Portal does not deploy itself. Cutting a version is deliberate:
|
||||||
# redoal/questions) owns its instance - domain, port, env, Caddy route -
|
# `cargo release <level>` bumps Cargo.toml, commits, tags v<semver>,
|
||||||
# and its deploy workflow downloads a pinned release published here.
|
# and pushes; this workflow reacts to the tag and publishes the
|
||||||
# Rolling a new portal version out to a site = bumping PORTAL_RELEASE
|
# artifact as a Gitea release. Each content repo (uhhm/questions,
|
||||||
# in that site's .gitea/workflows/deploy.yml (an auditable commit).
|
# redoal/questions) pins PORTAL_RELEASE to one of these tags in its
|
||||||
|
# own deploy workflow - bumping the pin there is what rolls a version
|
||||||
|
# out to a site. Plain main pushes only run test.yml.
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
tags: ["v*"]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
publish:
|
publish:
|
||||||
@@ -62,37 +64,41 @@ jobs:
|
|||||||
- name: Package
|
- name: Package
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
tag="build-$(echo ${{ github.sha }} | cut -c1-7)"
|
tag="${{ github.ref_name }}"
|
||||||
echo "TAG=$tag" >> "$GITHUB_ENV"
|
|
||||||
stage=$(mktemp -d)
|
stage=$(mktemp -d)
|
||||||
cp "$CARGO_TARGET_DIR/release/portal" "$stage/portal"
|
cp "$CARGO_TARGET_DIR/release/portal" "$stage/portal"
|
||||||
cp "$CARGO_TARGET_DIR/release/question_lint" "$stage/question_lint"
|
cp "$CARGO_TARGET_DIR/release/question_lint" "$stage/question_lint"
|
||||||
|
# hash-files = true: leptos resolves hash.txt next to the running
|
||||||
|
# binary, so it ships beside portal in the release dir.
|
||||||
|
cp "$CARGO_TARGET_DIR/release/hash.txt" "$stage/hash.txt"
|
||||||
# site-root ("target/site" in Cargo.toml) is project-relative,
|
# site-root ("target/site" in Cargo.toml) is project-relative,
|
||||||
# not affected by CARGO_TARGET_DIR - only the plain `cargo build`
|
# not affected by CARGO_TARGET_DIR - only the plain `cargo build`
|
||||||
# outputs (release/, front/) move with that override.
|
# outputs (release/, front/) move with that override.
|
||||||
cp -r target/site "$stage/site"
|
cp -r target/site "$stage/site"
|
||||||
tar -C "$stage" -czf "portal-$tag.tar.gz" portal question_lint site
|
tar -C "$stage" -czf "portal-$tag.tar.gz" portal question_lint hash.txt site
|
||||||
rm -rf "$stage"
|
rm -rf "$stage"
|
||||||
|
|
||||||
# The run's own ephemeral token has write access to this repo -
|
# The run's own ephemeral token has write access to this repo -
|
||||||
# no long-lived PAT to manage. Re-running a build for the same sha
|
# no long-lived PAT to manage. The tag already exists (cargo
|
||||||
# finds the existing release instead of failing on the tag.
|
# release pushed it), so the release attaches to it; a re-run
|
||||||
|
# finds the existing release instead of failing.
|
||||||
- name: Publish release
|
- name: Publish release
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
tag="${{ github.ref_name }}"
|
||||||
api="${{ github.server_url }}/api/v1/repos/${{ github.repository }}"
|
api="${{ github.server_url }}/api/v1/repos/${{ github.repository }}"
|
||||||
auth="Authorization: token ${{ secrets.GITHUB_TOKEN }}"
|
auth="Authorization: token ${{ secrets.GITHUB_TOKEN }}"
|
||||||
subject=$(git log -1 --format=%s)
|
subject=$(git log -1 --format=%s)
|
||||||
body=$(printf '{"tag_name":"%s","target_commitish":"%s","name":"%s"}' \
|
body=$(printf '{"tag_name":"%s","name":"%s"}' \
|
||||||
"$TAG" "${{ github.sha }}" "$TAG: $(echo "$subject" | sed 's/"/\\"/g')")
|
"$tag" "$tag: $(echo "$subject" | sed 's/"/\\"/g')")
|
||||||
id=$(curl -sf -X POST -H "$auth" -H 'Content-Type: application/json' \
|
id=$(curl -sf -X POST -H "$auth" -H 'Content-Type: application/json' \
|
||||||
-d "$body" "$api/releases" | jq .id) \
|
-d "$body" "$api/releases" | jq .id) \
|
||||||
|| id=$(curl -sf -H "$auth" "$api/releases/tags/$TAG" | jq .id)
|
|| id=$(curl -sf -H "$auth" "$api/releases/tags/$tag" | jq .id)
|
||||||
# Replace the asset if a re-run already uploaded one.
|
# Replace the asset if a re-run already uploaded one.
|
||||||
for aid in $(curl -sf -H "$auth" "$api/releases/$id/assets" | jq '.[].id'); do
|
for aid in $(curl -sf -H "$auth" "$api/releases/$id/assets" | jq '.[].id'); do
|
||||||
curl -sf -X DELETE -H "$auth" "$api/releases/$id/assets/$aid"
|
curl -sf -X DELETE -H "$auth" "$api/releases/$id/assets/$aid"
|
||||||
done
|
done
|
||||||
curl -sf -X POST -H "$auth" \
|
curl -sf -X POST -H "$auth" \
|
||||||
-F "attachment=@portal-$TAG.tar.gz" \
|
-F "attachment=@portal-$tag.tar.gz" \
|
||||||
"$api/releases/$id/assets?name=portal-$TAG.tar.gz" > /dev/null
|
"$api/releases/$id/assets?name=portal-$tag.tar.gz" > /dev/null
|
||||||
echo "published $TAG"
|
echo "published $tag"
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
name: Test
|
||||||
|
|
||||||
|
# Publishing only happens on v* tags (publish.yml), so this is what
|
||||||
|
# keeps plain main pushes honest between releases.
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: bare
|
||||||
|
env:
|
||||||
|
# Same shared-toolchain/cache story as publish.yml.
|
||||||
|
CARGO_HOME: /var/local/cargo
|
||||||
|
RUSTUP_HOME: /var/local/rustup
|
||||||
|
PATH: /var/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/bin
|
||||||
|
SCCACHE_DIR: /var/local/sccache
|
||||||
|
SCCACHE_SERVER_PORT: "4228"
|
||||||
|
CARGO_TARGET_DIR: /var/local/cargo-target
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Test
|
||||||
|
run: cargo test --features ssr
|
||||||
Generated
+20
-1
@@ -2948,7 +2948,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.1.0"
|
version = "0.3.18"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@@ -2970,6 +2970,7 @@ dependencies = [
|
|||||||
"leptos_router",
|
"leptos_router",
|
||||||
"openidconnect",
|
"openidconnect",
|
||||||
"proptest",
|
"proptest",
|
||||||
|
"pulldown-cmark",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_yaml",
|
"serde_yaml",
|
||||||
@@ -3104,6 +3105,24 @@ dependencies = [
|
|||||||
"unarray",
|
"unarray",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pulldown-cmark"
|
||||||
|
version = "0.13.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.1",
|
||||||
|
"memchr",
|
||||||
|
"pulldown-cmark-escape",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pulldown-cmark-escape"
|
||||||
|
version = "0.11.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-error"
|
name = "quick-error"
|
||||||
version = "1.2.3"
|
version = "1.2.3"
|
||||||
|
|||||||
+20
-2
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.1.0"
|
version = "0.3.18"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
@@ -12,6 +12,9 @@ leptos_meta = { version = "0.8" }
|
|||||||
leptos_router = { version = "0.8" }
|
leptos_router = { version = "0.8" }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
|
# Inline markdown for content descriptions (links, emphasis, code) -
|
||||||
|
# runs on both server and client renders, so not feature-gated.
|
||||||
|
pulldown-cmark = { version = "0.13", default-features = false, features = ["html"] }
|
||||||
|
|
||||||
# --- server only ---
|
# --- server only ---
|
||||||
leptos_axum = { version = "0.8", optional = true }
|
leptos_axum = { version = "0.8", optional = true }
|
||||||
@@ -19,7 +22,7 @@ axum = { version = "0.8", features = ["multipart"], optional = true }
|
|||||||
aws-sdk-s3 = { version = "1", optional = true }
|
aws-sdk-s3 = { version = "1", optional = true }
|
||||||
tokio = { version = "1", features = ["rt-multi-thread", "macros", "signal"], optional = true }
|
tokio = { version = "1", features = ["rt-multi-thread", "macros", "signal"], optional = true }
|
||||||
tower = { version = "0.5", optional = true }
|
tower = { version = "0.5", optional = true }
|
||||||
tower-http = { version = "0.6", features = ["fs"], optional = true }
|
tower-http = { version = "0.6", features = ["fs", "set-header"], optional = true }
|
||||||
tower-sessions = { version = "0.14", optional = true }
|
tower-sessions = { version = "0.14", optional = true }
|
||||||
async-nats = { version = "0.38", optional = true }
|
async-nats = { version = "0.38", optional = true }
|
||||||
arc-swap = { version = "1", optional = true }
|
arc-swap = { version = "1", optional = true }
|
||||||
@@ -131,3 +134,18 @@ bin-default-features = false
|
|||||||
lib-features = ["hydrate"]
|
lib-features = ["hydrate"]
|
||||||
lib-default-features = false
|
lib-default-features = false
|
||||||
lib-profile-release = "wasm-release"
|
lib-profile-release = "wasm-release"
|
||||||
|
# Content-hashed pkg names (portal.<hash>.js/wasm/css) + hash.txt: a
|
||||||
|
# freshly served page can never reference a stale cached bundle - an
|
||||||
|
# iPhone kept a heuristically-cached portal.js across three releases
|
||||||
|
# and paired it with new wasm, silently killing hydration. Runtime
|
||||||
|
# needs LEPTOS_HASH_FILES=true (set in each content repo's deploy env).
|
||||||
|
hash-files = true
|
||||||
|
|
||||||
|
# cargo release <level> is how a portal version is cut: bump, commit,
|
||||||
|
# tag v{{version}}, push. CI (publish.yml) reacts to the tag and
|
||||||
|
# publishes the release artifact; nothing on crates.io.
|
||||||
|
[package.metadata.release]
|
||||||
|
publish = false
|
||||||
|
push = true
|
||||||
|
tag-name = "v{{version}}"
|
||||||
|
pre-release-commit-message = "Release {{version}}"
|
||||||
|
|||||||
@@ -1,17 +1,61 @@
|
|||||||
# portal
|
# portal
|
||||||
|
|
||||||
The question runtime behind [uhhm.no](https://uhhm.no). Every page,
|
A content-driven question engine: one Rust binary that turns a Git
|
||||||
form, review desk, and state machine it serves is declared in the
|
repo of YAML into a live site — pages, forms, review desks, and state
|
||||||
[`questions`](https://project.uhhm.no/uhhm/questions) content repo —
|
machines, with a durable event-sourced record of every answer
|
||||||
this codebase is the engine that renders, enforces, and records, and
|
underneath. The engine special-cases nothing: everything a site
|
||||||
it special-cases none of it.
|
serves is declared in its content repo, and the same build serves any
|
||||||
|
number of sites.
|
||||||
|
|
||||||
|
Point an instance at a content repo and that repo *is* the site:
|
||||||
|
pages, copy, state graphs, branding, and even the landing hero
|
||||||
|
(`site.yaml`: title, wordmark, and `hero: {kind: module, module:
|
||||||
|
hero.js}` — a JavaScript module the content repo ships, served
|
||||||
|
same-origin at `/site/<path>`, that portal mounts at parse time and
|
||||||
|
stops on navigation; the YES canvas and redoal's sine swings are both
|
||||||
|
content, not engine). Content
|
||||||
|
pushes hot-reload every running instance; instances differ only by
|
||||||
|
env vars. [uhhm.no](https://uhhm.no)
|
||||||
|
([uhhm/questions](https://project.uhhm.no/uhhm/questions)) and
|
||||||
|
[redoal.com](https://redoal.com)
|
||||||
|
([redoal/questions](https://project.uhhm.no/redoal/questions)) are
|
||||||
|
two faces of the same binary, deployed from the same release
|
||||||
|
artifact.
|
||||||
|
|
||||||
|
It composes with the surrounding stack rather than bundling it: Gitea
|
||||||
|
hosts and serves the content, NATS JetStream stores events and
|
||||||
|
projections, Kanidm provides identity, and anything downstream
|
||||||
|
(automations, newsletters, onboarding) subscribes to the answer
|
||||||
|
stream.
|
||||||
|
|
||||||
## What the engine provides
|
## What the engine provides
|
||||||
|
|
||||||
- **Content-driven pages** (`src/content.rs`, `src/app.rs`): YAML
|
- **Content-driven pages** (`src/content.rs`, `src/app.rs`): YAML
|
||||||
loaded from Gitea at boot and hot-swapped on a NATS reload signal;
|
loaded from Gitea at boot and hot-swapped on a NATS reload signal;
|
||||||
a bad push keeps the last-good content serving. A page's `id` is
|
a bad push keeps the last-good content serving. The `questions/`
|
||||||
its URL; `qualifies` gates it to a Kanidm group.
|
tree IS the router — file paths become URLs, `_section.yaml`
|
||||||
|
applies criteria to a whole directory, `[name].yaml` pages serve
|
||||||
|
any `/dir/<value>` with the segment fed into resource keys, and
|
||||||
|
`requires_chain` gates a page on verifiable answer provenance next
|
||||||
|
to `qualifies`' Kanidm-group identity gate (see
|
||||||
|
`docs/design/filesystem-routes.md`).
|
||||||
|
- **Gesture and voice fields** (`gesture.js`, `voice.js`): a stroke
|
||||||
|
becomes a redoal gesture key through a relay (ADR-0013/0015 in the
|
||||||
|
redoal repo) - the input shows the key's own decode under the
|
||||||
|
stroke, who is at a similar shape now, and *places* with recordings
|
||||||
|
the visitor can pick to make that key theirs; a voice field records
|
||||||
|
in the browser and leaves the audio at a key. Actions may be
|
||||||
|
templated from the answer (`/shape/{curve.key}`) onto dynamic
|
||||||
|
pages, whose URL segment also fills `value: "{key}"` presets and
|
||||||
|
`url` resource sources; resource items with an https `audio` field
|
||||||
|
render a player.
|
||||||
|
- **Announced pages** (`src/announce.rs`): a question with an
|
||||||
|
`event: {starts, duration, place}` window is announced in the
|
||||||
|
header (not the footer nav) while the window is open, becomes a
|
||||||
|
followup when it closes, and its record in the runtime-owned
|
||||||
|
`portal_events` bucket moves to `awaiting_summary` - a "post what
|
||||||
|
happened" task any review desk can read, published on NATS like a
|
||||||
|
decision. A one-minute sweeper keeps it all idempotent.
|
||||||
- **State machines as content** (`src/aggregates/`): `aggregates.yaml`
|
- **State machines as content** (`src/aggregates/`): `aggregates.yaml`
|
||||||
declares each bucket's states and legal transitions; the engine
|
declares each bucket's states and legal transitions; the engine
|
||||||
replays a record's event history and refuses undeclared moves, with
|
replays a record's event history and refuses undeclared moves, with
|
||||||
@@ -28,8 +72,13 @@ it special-cases none of it.
|
|||||||
lineage; `?chain=` links carry it, and self-service transitions
|
lineage; `?chain=` links carry it, and self-service transitions
|
||||||
(unsubscribe) authorize by holding one.
|
(unsubscribe) authorize by holding one.
|
||||||
- **Live resources** (`src/resource.rs`): content can pull a KV
|
- **Live resources** (`src/resource.rs`): content can pull a KV
|
||||||
bucket, Gitea starred/org repos, or any public JSON URL (SSRF
|
bucket, Gitea starred/org repos/releases, or any public JSON URL
|
||||||
fail-closed), reshaped by a content-declared `jq` filter.
|
(SSRF fail-closed), reshaped by a content-declared `jq` filter.
|
||||||
|
- **Input kinds as content**: a requirement's `type:` picks the
|
||||||
|
widget — plain fields, a rich-text editor, or a `gesture` drawing
|
||||||
|
canvas that can connect to a redoal relay so similar strokes echo
|
||||||
|
between visitors live. Submitted values are arbitrary JSON; the
|
||||||
|
engine records what the widget produced.
|
||||||
- **Review desks**: any Kv resource with `transitions` renders rows
|
- **Review desks**: any Kv resource with `transitions` renders rows
|
||||||
with per-state action buttons and one shared confirm per
|
with per-state action buttons and one shared confirm per
|
||||||
alternative — owners walk records through their graphs without
|
alternative — owners walk records through their graphs without
|
||||||
@@ -38,9 +87,10 @@ it special-cases none of it.
|
|||||||
## Binaries
|
## Binaries
|
||||||
|
|
||||||
- `portal` — the server (Leptos SSR + hydrate, Axum underneath).
|
- `portal` — the server (Leptos SSR + hydrate, Axum underneath).
|
||||||
- `question_lint` — headless content validation, run by the
|
- `question_lint` — headless content validation, shipped inside every
|
||||||
`questions` repo's CI against a prebuilt copy this repo's deploy
|
release artifact so each content repo's CI lints with the exact
|
||||||
publishes; also works offline: `question_lint --path <dir>`.
|
portal version its instance runs; also works offline:
|
||||||
|
`question_lint --path <dir>`.
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
@@ -50,17 +100,58 @@ cargo test --features ssr # engine tests
|
|||||||
cargo build --features ssr --bin question_lint
|
cargo build --features ssr --bin question_lint
|
||||||
```
|
```
|
||||||
|
|
||||||
Runtime configuration is env vars (see `src/main.rs` and
|
Runtime configuration is env vars (see `src/main.rs`, and each
|
||||||
`.gitea/workflows/deploy.yml`): `NATS_URL`, `CONTENT_REPO`/
|
content repo's `.gitea/workflows/deploy.yml` for the values in
|
||||||
`CONTENT_BRANCH`, Kanidm OIDC (`KANIDM_URL`, `OAUTH2_CLIENT_*`),
|
production): `NATS_URL`, `CONTENT_REPO`/`CONTENT_BRANCH`, Kanidm OIDC
|
||||||
optional `GARAGE_*` for uploads, `GITEA_API_TOKEN` for authenticated
|
(`KANIDM_URL`, `OAUTH2_CLIENT_*`), optional `GARAGE_*` for uploads,
|
||||||
resource pulls, `AUTOMATION_READ_TOKEN` for the automation KV read
|
`GITEA_API_TOKEN` for authenticated resource pulls,
|
||||||
endpoint.
|
`AUTOMATION_READ_TOKEN` for the automation KV read endpoint.
|
||||||
|
|
||||||
## Deploy
|
## Release and deploy
|
||||||
|
|
||||||
Pushing `main` triggers `.gitea/workflows/deploy.yml` on the
|
Portal doesn't deploy itself — it publishes versions, and each site
|
||||||
bare-metal runner: release build, ship to
|
decides when to take one. The whole day-to-day surface is two
|
||||||
`/srv/app/uhhm-portal/releases/<sha>`, flip the `current` symlink,
|
commands:
|
||||||
restart `app@uhhm-portal`, reload Caddy. Content changes never come
|
|
||||||
through here — they hot-reload live from the `questions` repo.
|
**Cut a release** (here):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cargo release patch # or minor / major
|
||||||
|
```
|
||||||
|
|
||||||
|
That bumps `Cargo.toml`, tags `v<version>`, and pushes; CI
|
||||||
|
(`.gitea/workflows/publish.yml`) reacts to the tag, builds once, and
|
||||||
|
attaches `portal-v<version>.tar.gz` (`portal` + `question_lint` +
|
||||||
|
`hash.txt` + `site/`) to the Gitea release. Pkg files are
|
||||||
|
content-hashed (`hash-files = true`; instances run with
|
||||||
|
`LEPTOS_HASH_FILES=true`), so a freshly served page can never pair a
|
||||||
|
stale cached bundle with new wasm. Plain pushes to `main` only run the
|
||||||
|
tests (`test.yml`) — nothing reaches production from this repo.
|
||||||
|
|
||||||
|
**Roll it out** (in a content repo): edit one line in that repo's
|
||||||
|
`.gitea/workflows/deploy.yml` —
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
env:
|
||||||
|
PORTAL_RELEASE: v0.1.1 # <- bump, commit, push
|
||||||
|
```
|
||||||
|
|
||||||
|
Its CI downloads the pinned artifact, ships
|
||||||
|
`/srv/app/<instance>/releases/<tag>`, flips `current`, rewrites the
|
||||||
|
instance env from that repo's own Actions variables/secrets, restarts
|
||||||
|
`app@<instance>`, and refreshes the Caddy route. Every rollout is a
|
||||||
|
commit, so reverting a bad version is `git revert` + push. Sites
|
||||||
|
upgrade independently: uhhm.no (uhhm/questions → `app@uhhm-portal`,
|
||||||
|
:3010) and redoal.com (redoal/questions → `app@redoal-portal`,
|
||||||
|
:3020) can pin different versions.
|
||||||
|
|
||||||
|
Content changes never come through any of this — they hot-reload
|
||||||
|
live from the content repos over NATS.
|
||||||
|
|
||||||
|
**Add a site**: new content repo with a copy of an existing
|
||||||
|
`deploy.yml` (change `INSTANCE`, port, domains), Actions variables
|
||||||
|
(`KANIDM_URL`, `OAUTH2_CLIENT_ID`, `PUBLIC_URL`, `SITE_NAME`) and
|
||||||
|
secrets (`NATS_URL`, `OAUTH2_CLIENT_SECRET`,
|
||||||
|
`PORTAL_GITEA_API_TOKEN` — Gitea reserves the `GITEA_` prefix for
|
||||||
|
secret names), a Kanidm OAuth2 client, and DNS. `site.yaml` in the
|
||||||
|
content repo handles all branding; no portal changes needed.
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
# Filesystem routes, sections, and where chains fit
|
||||||
|
|
||||||
|
Status: implemented in v0.2.0 (2026-08-24) — all three phases, with
|
||||||
|
one deviation: dynamic-page params substitute into resource keys via
|
||||||
|
server-side `resolve_question` at lookup time (get_question,
|
||||||
|
find_feature, submit_answer all resolve concrete paths), so no param
|
||||||
|
threading exists client-side. The user-facing routing contract is
|
||||||
|
documented in uhhm/questions' README ("Routing: the tree is the
|
||||||
|
router"); this file stays as the design rationale.
|
||||||
|
|
||||||
|
## What exists today, precisely
|
||||||
|
|
||||||
|
- A question's `id` doubles as its URL. Filenames are meaningless:
|
||||||
|
`questions/` is loaded as a **flat** directory (both the Gitea
|
||||||
|
loader and `question_lint --path`), every `*.yaml` becomes a
|
||||||
|
`Question` keyed by its own declared `id`.
|
||||||
|
- Hierarchy exists only as strings: `action: /proposed` edges, plus a
|
||||||
|
manual `followup: true` flag that hides post-submission pages from
|
||||||
|
the nav. The graph is invisible in a repo listing — you open every
|
||||||
|
file to learn the flow. (uhhm's actual graph: `/` fans out to three
|
||||||
|
followups; `/develop` → `/develop-proposal` → `/proposed` is a
|
||||||
|
two-step flow flattened into three top-level files.)
|
||||||
|
- Criteria are per-file: `qualifies: <kanidm-group>` on a question,
|
||||||
|
`requires_group` on a resource. Gating a whole area means
|
||||||
|
repeating the flag in every file of that area.
|
||||||
|
- Chains are query-string lineage: submitting hashes
|
||||||
|
`(question, parents, responses, ts)` into `chain_hash`, the next
|
||||||
|
page is `action + ?chain=<hash>`, and holding a chain is itself a
|
||||||
|
capability (`self_transition` + email second factor). `chain.rs`
|
||||||
|
reserves DAG shape (multiple parents) but nothing produces it yet.
|
||||||
|
- `Question.route` is a declared-but-never-read field — a fossil of
|
||||||
|
this exact idea.
|
||||||
|
|
||||||
|
## The proposal, in three phases
|
||||||
|
|
||||||
|
### Phase 1 — the tree is the router
|
||||||
|
|
||||||
|
Directory structure becomes the URL structure, next-js style:
|
||||||
|
|
||||||
|
```
|
||||||
|
questions/
|
||||||
|
index.yaml → /
|
||||||
|
applied.yaml → /applied
|
||||||
|
develop/
|
||||||
|
index.yaml → /develop
|
||||||
|
proposal.yaml → /develop/proposal
|
||||||
|
proposed.yaml → /develop/proposed
|
||||||
|
review/
|
||||||
|
index.yaml → /review
|
||||||
|
```
|
||||||
|
|
||||||
|
- `id:` becomes optional and **derived from the path** (`index.yaml`
|
||||||
|
names its directory). An explicit `id:` still wins so both content
|
||||||
|
repos keep working unchanged; lint warns when it disagrees with the
|
||||||
|
path, and the field can retire later along with `route`.
|
||||||
|
- `action:` accepts **relative references**: `action: proposed`
|
||||||
|
resolves against the file's directory, `action: /subscribed` stays
|
||||||
|
absolute. Resolution happens at load time, so validation and the
|
||||||
|
runtime see absolute ids exactly as today. A flow directory becomes
|
||||||
|
self-contained: rename `develop/` and every internal edge moves
|
||||||
|
with it.
|
||||||
|
- **`followup:` is inferred**: `index.yaml` files are nav pages,
|
||||||
|
non-index files are followups unless they say `nav: true`. This
|
||||||
|
matches the real content exactly (uhhm's four `followup: true`
|
||||||
|
files are precisely its non-index leaf pages) and deletes a flag
|
||||||
|
people must remember.
|
||||||
|
- Loader: switch from the per-directory contents API to Gitea's git
|
||||||
|
trees API (`/git/trees/{branch}?recursive=true`) — one request for
|
||||||
|
the whole tree instead of one per directory, which the flat loader
|
||||||
|
should be using anyway.
|
||||||
|
|
||||||
|
### Phase 2 — sections: criteria scoped by URL prefix
|
||||||
|
|
||||||
|
A `_section.yaml` in any directory applies to everything beneath it
|
||||||
|
(underscore = not a page, like next's private folders):
|
||||||
|
|
||||||
|
```
|
||||||
|
questions/review/_section.yaml:
|
||||||
|
qualifies: portal_owners
|
||||||
|
responsible: { name: Bendik, contact: … }
|
||||||
|
```
|
||||||
|
|
||||||
|
This is the URL/criteria interplay actually worth having: **a URL
|
||||||
|
prefix becomes a trust boundary**. "Everything under /review is
|
||||||
|
owner-only" is one line in one place, instead of a flag per file that
|
||||||
|
drifts. Per-question `qualifies` still overrides (tighter or looser —
|
||||||
|
lint should warn on looser). Sections are also the natural home for
|
||||||
|
shared `responsible` contacts and, later, per-section branding
|
||||||
|
accents.
|
||||||
|
|
||||||
|
### Phase 3 — dynamic segments, and chains stay out of the path
|
||||||
|
|
||||||
|
Two criteria axes exist: **who you are** (Kanidm group) and **what
|
||||||
|
you've done** (holding a chain). Phase 2 scopes the first by prefix;
|
||||||
|
phase 3 does the same for the second, plus gives records addresses:
|
||||||
|
|
||||||
|
- `[record].yaml` — a dynamic segment, one YAML file rendered per
|
||||||
|
record: `questions/review/[record].yaml` serves `/review/<key>`,
|
||||||
|
with the param available to the page's `ResourceSpec.key`. Today a
|
||||||
|
single record is only reachable through a desk row or a
|
||||||
|
`?chain=` link; this gives every record a real, gated URL —
|
||||||
|
linkable from review desks, automations, and n8n notifications.
|
||||||
|
- `requires_chain: <question-ref>` (page- or section-level): the page
|
||||||
|
only renders for a visitor whose chain tip answers the referenced
|
||||||
|
question. Today's followup pages are soft-hidden (out of nav) but
|
||||||
|
fully reachable; this makes "you must have come from X" an actual
|
||||||
|
criterion, declared with a relative ref like actions are.
|
||||||
|
|
||||||
|
**Deliberately not proposed: encoding the chain in the path.** The
|
||||||
|
page tree is static structure; the chain is runtime lineage and a
|
||||||
|
bearer capability. Putting it in the path makes it look canonical and
|
||||||
|
shareable — exactly what a capability URL shouldn't invite — and a
|
||||||
|
DAG (the reserved multi-parent shape) doesn't linearize into a path
|
||||||
|
anyway. `?chain=` stays a query parameter: pages keep one canonical
|
||||||
|
URL, lineage rides along only when it's actually held.
|
||||||
|
|
||||||
|
## Migration
|
||||||
|
|
||||||
|
Phase 1 is fully backward compatible (explicit `id` wins, flat repos
|
||||||
|
are just trees of depth one). The content repos migrate by `git mv`:
|
||||||
|
uhhm's develop flow nests under `develop/`, its followups either stay
|
||||||
|
top-level (`/applied` keeps its URL) or move with their flows if URL
|
||||||
|
churn is acceptable; redoal's three files are already the tree. Lint
|
||||||
|
learns the same resolution rules in the same commit, so a bad
|
||||||
|
reference stays a caught push, never a 404.
|
||||||
|
|
||||||
|
## Order of value
|
||||||
|
|
||||||
|
Phase 1 is cheap and pays immediately (the repo listing becomes the
|
||||||
|
sitemap). Phase 2 is small and unlocks gated areas properly. Phase 3
|
||||||
|
is the real feature work — `[record]` pages change what desks and
|
||||||
|
automations can link to — and can wait until something concrete needs
|
||||||
|
it.
|
||||||
+320
-43
@@ -12,8 +12,10 @@
|
|||||||
//
|
//
|
||||||
// When a relay URL is given, the widget also speaks the redoal-relay
|
// When a relay URL is given, the widget also speaks the redoal-relay
|
||||||
// protocol (ADR-0013 in the redoal repo): announce the stroke, receive
|
// protocol (ADR-0013 in the redoal repo): announce the stroke, receive
|
||||||
// an ack carrying the stroke's gesture key + the key's own decoded
|
// an ack carrying the stroke's gesture key plus the key's own decoded
|
||||||
// path ("what the network heard", drawn as a ghost), and receive
|
// path - "what the network heard", drawn as a ghost under the stroke
|
||||||
|
// when the key is v2 or later (ADR-0014's ordered turning chain; a v1
|
||||||
|
// key's histogram decode is a blob and stays hidden) - and receive
|
||||||
// echoes of similar strokes other visitors drew, shown as thumbnails.
|
// echoes of similar strokes other visitors drew, shown as thumbnails.
|
||||||
// Everything network is best-effort: no relay, refused connection, or
|
// Everything network is best-effort: no relay, refused connection, or
|
||||||
// a dropped socket all degrade to a plain offline drawing input.
|
// a dropped socket all degrade to a plain offline drawing input.
|
||||||
@@ -26,13 +28,13 @@
|
|||||||
const THEMES = {
|
const THEMES = {
|
||||||
dark: {
|
dark: {
|
||||||
stroke: '#8ec2c0',
|
stroke: '#8ec2c0',
|
||||||
ghost: 'rgba(255, 255, 255, 0.28)',
|
|
||||||
echo: '#8ec2c0',
|
echo: '#8ec2c0',
|
||||||
|
ghost: 'rgba(255, 255, 255, 0.28)',
|
||||||
},
|
},
|
||||||
light: {
|
light: {
|
||||||
stroke: '#47807e',
|
stroke: '#47807e',
|
||||||
ghost: 'rgba(29, 29, 27, 0.30)',
|
|
||||||
echo: '#47807e',
|
echo: '#47807e',
|
||||||
|
ghost: 'rgba(29, 29, 27, 0.30)',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -41,15 +43,87 @@ const MAX_ECHOES = 8;
|
|||||||
const RECONNECT_BASE_MS = 1000;
|
const RECONNECT_BASE_MS = 1000;
|
||||||
const RECONNECT_MAX_MS = 30000;
|
const RECONNECT_MAX_MS = 30000;
|
||||||
|
|
||||||
|
// ── Convergence animation (ink → what the network heard) ──────────
|
||||||
|
//
|
||||||
|
// When the ack lands, a glowing copy of the stroke peels off and
|
||||||
|
// converges point-by-point onto the key's decoded path: a wave of
|
||||||
|
// "being understood" travels from the stroke's start to its end,
|
||||||
|
// and the ghost materializes where the light settles. WebGL point
|
||||||
|
// sprites with additive glow on a dedicated overlay canvas; the 2d
|
||||||
|
// layer underneath never changes its final render, so losing WebGL
|
||||||
|
// (or prefers-reduced-motion) degrades to exactly today's behavior.
|
||||||
|
const CONVERGE_MS = 1500;
|
||||||
|
const CONVERGE_FADE_MS = 450;
|
||||||
|
const CONVERGE_POINTS = 128;
|
||||||
|
const CONVERGE_STAGGER = 0.6; // fraction of the timeline spent on the travelling wave
|
||||||
|
|
||||||
|
const GLOW_VERT = `
|
||||||
|
attribute vec2 aFrom;
|
||||||
|
attribute vec2 aTo;
|
||||||
|
attribute float aIndex;
|
||||||
|
uniform float uT;
|
||||||
|
uniform vec2 uResolution;
|
||||||
|
uniform float uDpr;
|
||||||
|
varying float vLife;
|
||||||
|
void main() {
|
||||||
|
float lead = aIndex * ${CONVERGE_STAGGER};
|
||||||
|
float p = clamp((uT * ${1.0 + CONVERGE_STAGGER} - lead), 0.0, 1.0);
|
||||||
|
float e = p < 0.5 ? 4.0 * p * p * p : 1.0 - pow(-2.0 * p + 2.0, 3.0) / 2.0;
|
||||||
|
vec2 pos = mix(aFrom, aTo, e);
|
||||||
|
vec2 clip = (pos / uResolution) * 2.0 - 1.0;
|
||||||
|
gl_Position = vec4(clip.x, -clip.y, 0.0, 1.0);
|
||||||
|
float pulse = 1.0 + 1.4 * sin(3.14159 * p);
|
||||||
|
gl_PointSize = 9.0 * uDpr * pulse;
|
||||||
|
vLife = p;
|
||||||
|
}`;
|
||||||
|
|
||||||
|
const GLOW_FRAG = `
|
||||||
|
precision mediump float;
|
||||||
|
uniform vec3 uColor;
|
||||||
|
uniform float uAlpha;
|
||||||
|
varying float vLife;
|
||||||
|
void main() {
|
||||||
|
vec2 d = gl_PointCoord - 0.5;
|
||||||
|
float fall = exp(-dot(d, d) * 18.0);
|
||||||
|
float breathe = 0.55 + 0.45 * sin(3.14159 * vLife);
|
||||||
|
gl_FragColor = vec4(uColor, 1.0) * (fall * uAlpha * breathe);
|
||||||
|
}`;
|
||||||
|
|
||||||
|
// Uniform arc-length resample of a pixel-space polyline to n points.
|
||||||
|
function resamplePx(points, n) {
|
||||||
|
if (points.length === 1) return Array(n).fill(points[0]);
|
||||||
|
const dists = [0];
|
||||||
|
for (let i = 1; i < points.length; i++) {
|
||||||
|
const dx = points[i][0] - points[i - 1][0];
|
||||||
|
const dy = points[i][1] - points[i - 1][1];
|
||||||
|
dists.push(dists[i - 1] + Math.hypot(dx, dy));
|
||||||
|
}
|
||||||
|
const total = dists[dists.length - 1] || 1;
|
||||||
|
const out = [];
|
||||||
|
let seg = 0;
|
||||||
|
for (let i = 0; i < n; i++) {
|
||||||
|
const target = (i / (n - 1)) * total;
|
||||||
|
while (seg < points.length - 2 && dists[seg + 1] < target) seg++;
|
||||||
|
const span = dists[seg + 1] - dists[seg] || 1;
|
||||||
|
const t = (target - dists[seg]) / span;
|
||||||
|
out.push([
|
||||||
|
points[seg][0] + (points[seg + 1][0] - points[seg][0]) * t,
|
||||||
|
points[seg][1] + (points[seg + 1][1] - points[seg][1]) * t,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
class GestureWidget {
|
class GestureWidget {
|
||||||
constructor(container, hidden, relayUrl, hero) {
|
constructor(container, hidden, relayUrl) {
|
||||||
this.container = container;
|
this.container = container;
|
||||||
this.hidden = hidden || null;
|
this.hidden = hidden || null;
|
||||||
this.relayUrl = relayUrl || '';
|
this.relayUrl = relayUrl || '';
|
||||||
this.hero = !!hero;
|
|
||||||
this.points = [];
|
|
||||||
this.ghost = null;
|
this.ghost = null;
|
||||||
this.ambient = []; // hero mode: echoed strokes drawn in place
|
this.ownKey = null;
|
||||||
|
this.selected = null; // {key, path, distance} - a place the visitor picked
|
||||||
|
this.seenKeys = new Set();
|
||||||
|
this.points = [];
|
||||||
this.drawing = false;
|
this.drawing = false;
|
||||||
this.stopped = false;
|
this.stopped = false;
|
||||||
this.ws = null;
|
this.ws = null;
|
||||||
@@ -60,11 +134,25 @@ class GestureWidget {
|
|||||||
this.canvas = document.createElement('canvas');
|
this.canvas = document.createElement('canvas');
|
||||||
this.canvas.className = 'gesture-canvas';
|
this.canvas.className = 'gesture-canvas';
|
||||||
container.appendChild(this.canvas);
|
container.appendChild(this.canvas);
|
||||||
if (!this.hero) {
|
// Overlay for the convergence glow; sized with the main canvas,
|
||||||
this.echoes = document.createElement('div');
|
// inert to pointers, empty until an ack arrives.
|
||||||
this.echoes.className = 'gesture-echoes';
|
this.glow = document.createElement('canvas');
|
||||||
container.appendChild(this.echoes);
|
this.glow.className = 'gesture-glow';
|
||||||
}
|
this.glow.style.position = 'absolute';
|
||||||
|
this.glow.style.pointerEvents = 'none';
|
||||||
|
if (!container.style.position) container.style.position = 'relative';
|
||||||
|
container.appendChild(this.glow);
|
||||||
|
this.gl = null;
|
||||||
|
this.animFrame = null;
|
||||||
|
this.converging = false;
|
||||||
|
this.echoes = document.createElement('div');
|
||||||
|
this.echoes.className = 'gesture-echoes';
|
||||||
|
this.echoes.setAttribute('role', 'listbox');
|
||||||
|
this.echoes.setAttribute('aria-label', 'places near your shape');
|
||||||
|
container.appendChild(this.echoes);
|
||||||
|
this.empty = document.createElement('p');
|
||||||
|
this.empty.className = 'gesture-empty';
|
||||||
|
container.appendChild(this.empty);
|
||||||
if (this.relayUrl) {
|
if (this.relayUrl) {
|
||||||
this.status = document.createElement('span');
|
this.status = document.createElement('span');
|
||||||
this.status.className = 'gesture-status offline';
|
this.status.className = 'gesture-status offline';
|
||||||
@@ -104,6 +192,13 @@ class GestureWidget {
|
|||||||
this.ctx.scale(dpr, dpr);
|
this.ctx.scale(dpr, dpr);
|
||||||
this.cssWidth = rect.width;
|
this.cssWidth = rect.width;
|
||||||
this.cssHeight = rect.height;
|
this.cssHeight = rect.height;
|
||||||
|
this.glow.style.left = `${this.canvas.offsetLeft}px`;
|
||||||
|
this.glow.style.top = `${this.canvas.offsetTop}px`;
|
||||||
|
this.glow.style.width = `${rect.width}px`;
|
||||||
|
this.glow.style.height = `${rect.height}px`;
|
||||||
|
this.glow.width = this.canvas.width;
|
||||||
|
this.glow.height = this.canvas.height;
|
||||||
|
this.cancelConvergence(); // buffers are in old pixels
|
||||||
}
|
}
|
||||||
|
|
||||||
pos(e) {
|
pos(e) {
|
||||||
@@ -115,11 +210,16 @@ class GestureWidget {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.canvas.setPointerCapture(e.pointerId);
|
this.canvas.setPointerCapture(e.pointerId);
|
||||||
// One stroke only - a new pointerdown replaces the old drawing
|
// One stroke only - a new pointerdown replaces the old drawing
|
||||||
// (and any ghost/ambient trails from the previous round).
|
// (and any ghost from the previous round).
|
||||||
this.drawing = true;
|
this.drawing = true;
|
||||||
this.points = [this.pos(e)];
|
this.cancelConvergence();
|
||||||
this.ghost = null;
|
this.ghost = null;
|
||||||
this.ambient = [];
|
this.ownKey = null;
|
||||||
|
this.selected = null;
|
||||||
|
this.seenKeys.clear();
|
||||||
|
this.echoes.replaceChildren();
|
||||||
|
this.empty.textContent = '';
|
||||||
|
this.points = [this.pos(e)];
|
||||||
this.render();
|
this.render();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -217,28 +317,77 @@ class GestureWidget {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (msg.type === 'ack') {
|
if (msg.type === 'ack') {
|
||||||
if (this.points.length >= 2) {
|
this.ownKey = msg.key;
|
||||||
this.setValue({ points: this.normalized(), key: msg.key });
|
// Version nibble is the key's first hex digit.
|
||||||
}
|
const version = parseInt((msg.key || '0')[0], 16);
|
||||||
this.ghost = msg.path;
|
this.ownGhost = version >= 2 && Array.isArray(msg.path) ? msg.path : null;
|
||||||
this.render();
|
this.applySelection();
|
||||||
} else if (msg.type === 'echo') {
|
// Places arrive right after the ack; say so if none do.
|
||||||
if (this.hero) {
|
clearTimeout(this.emptyTimer);
|
||||||
this.ambient.push(msg.path);
|
this.emptyTimer = setTimeout(() => {
|
||||||
if (this.ambient.length > MAX_ECHOES) this.ambient.shift();
|
if (!this.echoes.children.length) this.empty.textContent = msg.empty || 'Nothing kept at this shape yet.';
|
||||||
this.render();
|
}, 1500);
|
||||||
} else {
|
} else if (msg.type === 'echo' || msg.type === 'place') {
|
||||||
this.addEchoThumbnail(msg);
|
if (!msg.key || this.seenKeys.has(msg.key)) return;
|
||||||
}
|
this.seenKeys.add(msg.key);
|
||||||
|
this.empty.textContent = '';
|
||||||
|
this.addEchoThumbnail(msg);
|
||||||
}
|
}
|
||||||
// 'error' frames are intentionally silent: the widget is a
|
// 'error' frames are intentionally silent: the widget is a
|
||||||
// form field first, and a rate-limited announce shouldn't
|
// form field first, and a rate-limited announce shouldn't
|
||||||
// alarm anyone mid-form.
|
// alarm anyone mid-form.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The key the input carries: the visitor's own, or the place they
|
||||||
|
// picked (selection re-derives the key - the ghost under the
|
||||||
|
// stroke becomes that place's decode, and the answer records both).
|
||||||
|
applySelection() {
|
||||||
|
if (this.points.length < 2) return;
|
||||||
|
const points = this.normalized();
|
||||||
|
const before = this.ghost;
|
||||||
|
if (this.selected) {
|
||||||
|
this.ghost = this.selected.path;
|
||||||
|
this.setValue({ points, key: this.selected.key, own_key: this.ownKey, selected_from: this.ownKey, selected_distance: this.selected.distance });
|
||||||
|
} else {
|
||||||
|
this.ghost = this.ownGhost || null;
|
||||||
|
this.setValue({ points, key: this.ownKey });
|
||||||
|
}
|
||||||
|
if (this.ghost && this.ghost !== before) this.startConvergence(this.ghost);
|
||||||
|
for (const el of this.echoes.children) {
|
||||||
|
el.classList.toggle('selected', !!this.selected && el.dataset.key === this.selected.key);
|
||||||
|
el.setAttribute('aria-selected', String(!!this.selected && el.dataset.key === this.selected.key));
|
||||||
|
}
|
||||||
|
this.render();
|
||||||
|
}
|
||||||
|
|
||||||
|
select(thumb) {
|
||||||
|
const key = thumb.dataset.key;
|
||||||
|
if (this.selected && this.selected.key === key) {
|
||||||
|
this.selected = null;
|
||||||
|
} else {
|
||||||
|
this.selected = { key, path: JSON.parse(thumb.dataset.path), distance: Number(thumb.dataset.distance) };
|
||||||
|
// The relay counts picks per place for ranking.
|
||||||
|
if (this.ws && this.ws.readyState === WebSocket.OPEN && this.ownKey) {
|
||||||
|
this.ws.send(JSON.stringify({ type: 'select', key, from: this.ownKey, distance: this.selected.distance }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.applySelection();
|
||||||
|
}
|
||||||
|
|
||||||
addEchoThumbnail(msg) {
|
addEchoThumbnail(msg) {
|
||||||
const thumb = document.createElement('canvas');
|
const thumb = document.createElement('canvas');
|
||||||
thumb.className = 'gesture-echo';
|
thumb.className = 'gesture-echo' + (msg.type === 'place' ? ' place' : '');
|
||||||
|
thumb.dataset.key = msg.key;
|
||||||
|
thumb.dataset.path = JSON.stringify(msg.path || []);
|
||||||
|
thumb.dataset.distance = String(msg.distance || 0);
|
||||||
|
thumb.setAttribute('role', 'option');
|
||||||
|
thumb.setAttribute('tabindex', '0');
|
||||||
|
thumb.setAttribute('aria-selected', 'false');
|
||||||
|
thumb.title = msg.type === 'place'
|
||||||
|
? `A place with ${msg.recordings || 0} recording${msg.recordings === 1 ? '' : 's'} - tap to make it your address`
|
||||||
|
: 'Someone at this shape right now';
|
||||||
|
thumb.addEventListener('click', () => this.select(thumb));
|
||||||
|
thumb.addEventListener('keydown', (e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); this.select(thumb); } });
|
||||||
// Closer strokes render stronger; 500 is comfortably past the
|
// Closer strokes render stronger; 500 is comfortably past the
|
||||||
// relay's default threshold, so everything stays visible.
|
// relay's default threshold, so everything stays visible.
|
||||||
const strength = Math.max(0.35, Math.min(1, 1 - msg.distance / 500));
|
const strength = Math.max(0.35, Math.min(1, 1 - msg.distance / 500));
|
||||||
@@ -260,6 +409,140 @@ class GestureWidget {
|
|||||||
setTimeout(() => thumb.classList.add('shown'), 30);
|
setTimeout(() => thumb.classList.add('shown'), 30);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Convergence ────────────────────────────────────────────────
|
||||||
|
|
||||||
|
initGlow() {
|
||||||
|
if (this.gl) return this.gl;
|
||||||
|
const gl = this.glow.getContext('webgl', { alpha: true, premultipliedAlpha: true });
|
||||||
|
if (!gl) return null;
|
||||||
|
const compile = (type, src) => {
|
||||||
|
const s = gl.createShader(type);
|
||||||
|
gl.shaderSource(s, src);
|
||||||
|
gl.compileShader(s);
|
||||||
|
return s;
|
||||||
|
};
|
||||||
|
const prog = gl.createProgram();
|
||||||
|
gl.attachShader(prog, compile(gl.VERTEX_SHADER, GLOW_VERT));
|
||||||
|
gl.attachShader(prog, compile(gl.FRAGMENT_SHADER, GLOW_FRAG));
|
||||||
|
gl.linkProgram(prog);
|
||||||
|
if (!gl.getProgramParameter(prog, gl.LINK_STATUS)) return null;
|
||||||
|
gl.useProgram(prog);
|
||||||
|
this.gl = gl;
|
||||||
|
this.glProg = prog;
|
||||||
|
this.glLoc = {
|
||||||
|
aFrom: gl.getAttribLocation(prog, 'aFrom'),
|
||||||
|
aTo: gl.getAttribLocation(prog, 'aTo'),
|
||||||
|
aIndex: gl.getAttribLocation(prog, 'aIndex'),
|
||||||
|
uT: gl.getUniformLocation(prog, 'uT'),
|
||||||
|
uResolution: gl.getUniformLocation(prog, 'uResolution'),
|
||||||
|
uDpr: gl.getUniformLocation(prog, 'uDpr'),
|
||||||
|
uColor: gl.getUniformLocation(prog, 'uColor'),
|
||||||
|
uAlpha: gl.getUniformLocation(prog, 'uAlpha'),
|
||||||
|
};
|
||||||
|
this.glBufFrom = gl.createBuffer();
|
||||||
|
this.glBufTo = gl.createBuffer();
|
||||||
|
this.glBufIndex = gl.createBuffer();
|
||||||
|
return gl;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The ghost's pixel frame - same fit drawPath uses.
|
||||||
|
ghostToPx(path) {
|
||||||
|
const scale = (Math.min(this.cssWidth, this.cssHeight) / 2) * 0.8;
|
||||||
|
const cx = this.cssWidth / 2, cy = this.cssHeight / 2;
|
||||||
|
return path.map(([x, y]) => [cx + x * scale, cy + y * scale]);
|
||||||
|
}
|
||||||
|
|
||||||
|
startConvergence(targetPath) {
|
||||||
|
this.cancelConvergence();
|
||||||
|
if (!targetPath || this.points.length < 2) return;
|
||||||
|
if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) return;
|
||||||
|
const gl = this.initGlow();
|
||||||
|
if (!gl) return;
|
||||||
|
|
||||||
|
const dpr = window.devicePixelRatio || 1;
|
||||||
|
const from = resamplePx(this.points.map((p) => [p.x, p.y]), CONVERGE_POINTS);
|
||||||
|
const to = resamplePx(this.ghostToPx(targetPath), CONVERGE_POINTS);
|
||||||
|
const f = new Float32Array(CONVERGE_POINTS * 2);
|
||||||
|
const t = new Float32Array(CONVERGE_POINTS * 2);
|
||||||
|
const idx = new Float32Array(CONVERGE_POINTS);
|
||||||
|
for (let i = 0; i < CONVERGE_POINTS; i++) {
|
||||||
|
f[i * 2] = from[i][0] * dpr;
|
||||||
|
f[i * 2 + 1] = from[i][1] * dpr;
|
||||||
|
t[i * 2] = to[i][0] * dpr;
|
||||||
|
t[i * 2 + 1] = to[i][1] * dpr;
|
||||||
|
idx[i] = i / (CONVERGE_POINTS - 1);
|
||||||
|
}
|
||||||
|
const bind = (buf, data, loc, size) => {
|
||||||
|
gl.bindBuffer(gl.ARRAY_BUFFER, buf);
|
||||||
|
gl.bufferData(gl.ARRAY_BUFFER, data, gl.STATIC_DRAW);
|
||||||
|
gl.enableVertexAttribArray(loc);
|
||||||
|
gl.vertexAttribPointer(loc, size, gl.FLOAT, false, 0, 0);
|
||||||
|
};
|
||||||
|
gl.useProgram(this.glProg);
|
||||||
|
bind(this.glBufFrom, f, this.glLoc.aFrom, 2);
|
||||||
|
bind(this.glBufTo, t, this.glLoc.aTo, 2);
|
||||||
|
bind(this.glBufIndex, idx, this.glLoc.aIndex, 1);
|
||||||
|
gl.viewport(0, 0, this.glow.width, this.glow.height);
|
||||||
|
gl.uniform2f(this.glLoc.uResolution, this.glow.width, this.glow.height);
|
||||||
|
gl.uniform1f(this.glLoc.uDpr, dpr);
|
||||||
|
|
||||||
|
const light = this._themeQuery.matches;
|
||||||
|
const color = light ? [0x47 / 255, 0x80 / 255, 0x7e / 255] : [0x8e / 255, 0xc2 / 255, 0xc0 / 255];
|
||||||
|
gl.uniform3f(this.glLoc.uColor, color[0], color[1], color[2]);
|
||||||
|
// Additive light on the dark ground; normal ink on the light one.
|
||||||
|
gl.enable(gl.BLEND);
|
||||||
|
if (light) gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
|
||||||
|
else gl.blendFunc(gl.ONE, gl.ONE);
|
||||||
|
|
||||||
|
this.converging = true;
|
||||||
|
this.render();
|
||||||
|
const started = performance.now();
|
||||||
|
const step = (now) => {
|
||||||
|
const raw = (now - started) / CONVERGE_MS;
|
||||||
|
if (raw >= 1) {
|
||||||
|
// Deposit the ghost, then let the glow breathe out.
|
||||||
|
if (this.converging) {
|
||||||
|
this.converging = false;
|
||||||
|
this.render();
|
||||||
|
}
|
||||||
|
const fade = (now - started - CONVERGE_MS) / CONVERGE_FADE_MS;
|
||||||
|
if (fade >= 1) {
|
||||||
|
this.cancelConvergence();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gl.clearColor(0, 0, 0, 0);
|
||||||
|
gl.clear(gl.COLOR_BUFFER_BIT);
|
||||||
|
gl.uniform1f(this.glLoc.uT, 1);
|
||||||
|
gl.uniform1f(this.glLoc.uAlpha, 0.32 * (1 - fade));
|
||||||
|
gl.drawArrays(gl.POINTS, 0, CONVERGE_POINTS);
|
||||||
|
} else {
|
||||||
|
gl.clearColor(0, 0, 0, 0);
|
||||||
|
gl.clear(gl.COLOR_BUFFER_BIT);
|
||||||
|
// Trailing passes give the wave a comet tail.
|
||||||
|
for (const [lag, alpha] of [[0, 0.32], [0.035, 0.16], [0.07, 0.08], [0.105, 0.04]]) {
|
||||||
|
gl.uniform1f(this.glLoc.uT, Math.max(0, raw - lag));
|
||||||
|
gl.uniform1f(this.glLoc.uAlpha, alpha);
|
||||||
|
gl.drawArrays(gl.POINTS, 0, CONVERGE_POINTS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.animFrame = requestAnimationFrame(step);
|
||||||
|
};
|
||||||
|
this.animFrame = requestAnimationFrame(step);
|
||||||
|
}
|
||||||
|
|
||||||
|
cancelConvergence() {
|
||||||
|
if (this.animFrame) cancelAnimationFrame(this.animFrame);
|
||||||
|
this.animFrame = null;
|
||||||
|
if (this.converging) {
|
||||||
|
this.converging = false;
|
||||||
|
this.render();
|
||||||
|
}
|
||||||
|
if (this.gl) {
|
||||||
|
this.gl.clearColor(0, 0, 0, 0);
|
||||||
|
this.gl.clear(this.gl.COLOR_BUFFER_BIT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ── Rendering ──────────────────────────────────────────────────
|
// ── Rendering ──────────────────────────────────────────────────
|
||||||
|
|
||||||
// Draw a normalized (-1..1) path fitted into w×h with padding.
|
// Draw a normalized (-1..1) path fitted into w×h with padding.
|
||||||
@@ -284,12 +567,7 @@ class GestureWidget {
|
|||||||
if (!this.ctx) return;
|
if (!this.ctx) return;
|
||||||
const t = this.theme();
|
const t = this.theme();
|
||||||
this.ctx.clearRect(0, 0, this.cssWidth, this.cssHeight);
|
this.ctx.clearRect(0, 0, this.cssWidth, this.cssHeight);
|
||||||
for (const path of this.ambient) {
|
if (this.ghost && !this.converging) {
|
||||||
this.ctx.globalAlpha = 0.25;
|
|
||||||
this.drawPath(this.ctx, path, this.cssWidth, this.cssHeight, t.echo, 1.5, 0.2);
|
|
||||||
}
|
|
||||||
this.ctx.globalAlpha = 1;
|
|
||||||
if (this.ghost) {
|
|
||||||
this.drawPath(this.ctx, this.ghost, this.cssWidth, this.cssHeight, t.ghost, 2, 0.2);
|
this.drawPath(this.ctx, this.ghost, this.cssWidth, this.cssHeight, t.ghost, 2, 0.2);
|
||||||
}
|
}
|
||||||
if (this.points.length >= 1) {
|
if (this.points.length >= 1) {
|
||||||
@@ -308,6 +586,8 @@ class GestureWidget {
|
|||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
this.stopped = true;
|
this.stopped = true;
|
||||||
|
if (this.animFrame) cancelAnimationFrame(this.animFrame);
|
||||||
|
clearTimeout(this.emptyTimer);
|
||||||
if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
|
if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
|
||||||
if (this.ws) {
|
if (this.ws) {
|
||||||
// The close event still fires, but scheduleReconnect
|
// The close event still fires, but scheduleReconnect
|
||||||
@@ -325,11 +605,8 @@ class GestureWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function mountGesture(container, hidden, relayUrl) {
|
export function mountGesture(container, hidden, relayUrl) {
|
||||||
return new GestureWidget(container, hidden, relayUrl, false);
|
// Dev convenience: `?relay=ws://127.0.0.1:9040` points every widget
|
||||||
}
|
// on the page at a local relay (prod relays reject foreign Origins).
|
||||||
|
const override = new URLSearchParams(window.location.search).get('relay');
|
||||||
// Hero variant: no form field to mirror into, and echoes render as
|
return new GestureWidget(container, hidden, override || relayUrl);
|
||||||
// ambient strokes on the drawing canvas itself instead of thumbnails.
|
|
||||||
export function mountGestureHero(container, relayUrl) {
|
|
||||||
return new GestureWidget(container, null, relayUrl, true);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,12 @@ pub struct AggregateSchema {
|
|||||||
pub event_for_state: HashMap<String, String>,
|
pub event_for_state: HashMap<String, String>,
|
||||||
pub state_for_event: HashMap<String, String>,
|
pub state_for_event: HashMap<String, String>,
|
||||||
pub transitions: HashMap<String, Vec<String>>,
|
pub transitions: HashMap<String, Vec<String>>,
|
||||||
|
/// Names what consumes this bucket's answers when no page in the
|
||||||
|
/// content repo reads it (e.g. "n8n newsletter compose").
|
||||||
|
/// Free-text - it exists so `validate_questions`' attended-bucket
|
||||||
|
/// rule has an explicit, auditable opt-out instead of a silent
|
||||||
|
/// one, and so the next reader knows where the answers go.
|
||||||
|
pub attended_by: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AggregateSchema {
|
impl AggregateSchema {
|
||||||
@@ -57,6 +63,8 @@ struct RawAggregateSchema {
|
|||||||
states: HashMap<String, RawState>,
|
states: HashMap<String, RawState>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
transitions: HashMap<String, Vec<String>>,
|
transitions: HashMap<String, Vec<String>>,
|
||||||
|
#[serde(default)]
|
||||||
|
attended_by: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, serde::Deserialize)]
|
#[derive(Debug, serde::Deserialize)]
|
||||||
@@ -123,6 +131,7 @@ pub fn parse_aggregates_yaml(raw: &str) -> anyhow::Result<HashMap<String, Aggreg
|
|||||||
event_for_state,
|
event_for_state,
|
||||||
state_for_event,
|
state_for_event,
|
||||||
transitions: raw_schema.transitions,
|
transitions: raw_schema.transitions,
|
||||||
|
attended_by: raw_schema.attended_by,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
+159
@@ -0,0 +1,159 @@
|
|||||||
|
//! Announced pages (`Question.event`): keeps one `portal_events` record
|
||||||
|
//! per event question and, once a window closes, moves it to
|
||||||
|
//! `awaiting_summary` - the "post what happened" task - publishing the
|
||||||
|
//! transition on `portal.answers.submitted` like any desk decision, so
|
||||||
|
//! the desktop notifier and n8n hear it. Runs on a one-minute tick;
|
||||||
|
//! every step is idempotent, so a restart or a content reload in the
|
||||||
|
//! middle changes nothing.
|
||||||
|
|
||||||
|
use crate::answers::{store_answer, Answer};
|
||||||
|
use crate::content::EVENTS_BUCKET;
|
||||||
|
use crate::events::{emit_answer_submitted, AnswerSubmitted};
|
||||||
|
use crate::server::AppState;
|
||||||
|
|
||||||
|
/// Alternative name stamped on the auto-created record and on the
|
||||||
|
/// transition event - what an n8n workflow gates on.
|
||||||
|
pub const EVENT_ALTERNATIVE: &str = "Announced";
|
||||||
|
pub const SUMMARY_DUE_LABEL: &str = "Summary due";
|
||||||
|
|
||||||
|
/// Record id for an event question: its id with `/` folded to `-`
|
||||||
|
/// (`/events/opening` -> `events-opening`), so one page is one record
|
||||||
|
/// however many times the sweeper runs.
|
||||||
|
pub fn record_id(question_id: &str) -> String {
|
||||||
|
question_id.trim_matches('/').replace('/', "-")
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn run(state: AppState) {
|
||||||
|
let mut tick = tokio::time::interval(std::time::Duration::from_secs(60));
|
||||||
|
loop {
|
||||||
|
tick.tick().await;
|
||||||
|
if let Err(e) = sweep(&state).await {
|
||||||
|
tracing::warn!(error = %e, "event sweep failed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One pass: create missing records, close ended windows.
|
||||||
|
pub async fn sweep(state: &AppState) -> anyhow::Result<()> {
|
||||||
|
let now_ms = chrono::Utc::now().timestamp_millis();
|
||||||
|
let questions = state.questions.load();
|
||||||
|
let events: Vec<_> = questions.values().filter(|q| q.event.is_some()).cloned().collect();
|
||||||
|
if events.is_empty() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let aggregates = state.aggregates.load();
|
||||||
|
let schema = aggregates
|
||||||
|
.get(EVENTS_BUCKET)
|
||||||
|
.ok_or_else(|| anyhow::anyhow!("no {EVENTS_BUCKET} schema"))?;
|
||||||
|
let store = match state.jetstream.get_key_value(EVENTS_BUCKET).await {
|
||||||
|
Ok(store) => Some(store),
|
||||||
|
Err(_) => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
for q in events {
|
||||||
|
let event = q.event.as_ref().expect("filtered");
|
||||||
|
let (starts, ends) = match event.window_ms() {
|
||||||
|
Ok(w) => w,
|
||||||
|
Err(_) => continue, // validated on load; belt and braces
|
||||||
|
};
|
||||||
|
let id = record_id(&q.id);
|
||||||
|
let existing: Option<Answer> = match &store {
|
||||||
|
Some(store) => store
|
||||||
|
.get(&id)
|
||||||
|
.await?
|
||||||
|
.and_then(|bytes| serde_json::from_slice(&bytes).ok()),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let responses = serde_json::json!({
|
||||||
|
"name": q.name,
|
||||||
|
"starts": event.starts,
|
||||||
|
"starts_ms": starts,
|
||||||
|
"ends_ms": ends,
|
||||||
|
"place": event.place,
|
||||||
|
"page": q.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
let answer = match existing {
|
||||||
|
None => {
|
||||||
|
store_answer(
|
||||||
|
&state.jetstream,
|
||||||
|
&aggregates,
|
||||||
|
EVENTS_BUCKET,
|
||||||
|
id.clone(),
|
||||||
|
&q.id,
|
||||||
|
EVENT_ALTERNATIVE,
|
||||||
|
&responses,
|
||||||
|
now_ms,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(question = %q.id, "event record created");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Some(a) => a,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Content is the source of truth while the window is still
|
||||||
|
// open: a corrected date or place flows into the record, so the
|
||||||
|
// followup fires on the schedule the page actually announces.
|
||||||
|
if answer.state == schema.initial && answer.responses != responses {
|
||||||
|
let mut refreshed = answer.clone();
|
||||||
|
refreshed.responses = responses.clone();
|
||||||
|
if let Some(store) = &store {
|
||||||
|
store.put(&id, serde_json::to_vec(&refreshed)?.into()).await?;
|
||||||
|
tracing::info!(question = %q.id, "event record refreshed from content");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if answer.state == schema.initial && now_ms >= ends {
|
||||||
|
let target = "awaiting_summary";
|
||||||
|
let payload = serde_json::json!({ "to": target, "item": id, "by": "portal" });
|
||||||
|
match crate::aggregates::transition(&state.jetstream, schema, &id, target, payload.clone(), now_ms).await {
|
||||||
|
Ok(_) => {}
|
||||||
|
Err(crate::aggregates::TransitionError::UnknownAggregate) => {
|
||||||
|
crate::aggregates::reseed(&state.jetstream, schema, &id, &answer.state, now_ms)
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("{e}"))?;
|
||||||
|
crate::aggregates::transition(&state.jetstream, schema, &id, target, payload.clone(), now_ms)
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("{e}"))?;
|
||||||
|
}
|
||||||
|
Err(e) => return Err(anyhow::anyhow!("{e}")),
|
||||||
|
}
|
||||||
|
let mut answer = answer;
|
||||||
|
answer.state = target.to_string();
|
||||||
|
answer.decided_ms = Some(now_ms);
|
||||||
|
answer.decided_by = Some("portal".to_string());
|
||||||
|
let store = state.jetstream.get_key_value(EVENTS_BUCKET).await?;
|
||||||
|
store.put(&id, serde_json::to_vec(&answer)?.into()).await?;
|
||||||
|
|
||||||
|
let parent_hashes = vec![id.clone()];
|
||||||
|
let chain_hash = crate::chain::hash_node(&q.id, &parent_hashes, &payload, now_ms);
|
||||||
|
emit_answer_submitted(
|
||||||
|
&state.nats,
|
||||||
|
&AnswerSubmitted {
|
||||||
|
chain_hash,
|
||||||
|
parent_hashes,
|
||||||
|
question_id: q.id.clone(),
|
||||||
|
alternative: SUMMARY_DUE_LABEL.to_string(),
|
||||||
|
responses: payload,
|
||||||
|
timestamp_ms: now_ms,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(question = %q.id, "event ended - summary due");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::record_id;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn record_id_is_stable_and_flat() {
|
||||||
|
assert_eq!(record_id("/events/opening"), "events-opening");
|
||||||
|
assert_eq!(record_id("/"), "");
|
||||||
|
assert_eq!(record_id("/opening"), "opening");
|
||||||
|
}
|
||||||
|
}
|
||||||
+521
-144
@@ -1,5 +1,5 @@
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
use leptos_meta::{provide_meta_context, MetaTags, Stylesheet, Title};
|
use leptos_meta::{provide_meta_context, HashedStylesheet, MetaTags, Title};
|
||||||
use leptos_router::{
|
use leptos_router::{
|
||||||
components::{Route, Router, Routes},
|
components::{Route, Router, Routes},
|
||||||
hooks::{use_location, use_navigate, use_query_map},
|
hooks::{use_location, use_navigate, use_query_map},
|
||||||
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
use crate::answers::{Answer, SelfTransitionAnswer, TransitionAnswers, TransitionItem};
|
use crate::answers::{Answer, SelfTransitionAnswer, TransitionAnswers, TransitionItem};
|
||||||
use crate::auth::{current_user, User};
|
use crate::auth::{current_user, User};
|
||||||
use crate::content::{is_qualified, Alternative, Question, Responsible, SiteConfig, Transition};
|
use crate::content::{is_qualified, render_inline_markdown, Alternative, Question, Responsible, SiteConfig, Transition};
|
||||||
use crate::resource::{get_requirement_binding, get_requirement_options, get_resource};
|
use crate::resource::{get_requirement_binding, get_requirement_options, get_resource};
|
||||||
|
|
||||||
/// The visible site name/wordmark - "portal" is just this codebase's
|
/// The visible site name/wordmark - "portal" is just this codebase's
|
||||||
@@ -39,6 +39,9 @@ pub fn shell(options: LeptosOptions) -> impl IntoView {
|
|||||||
// once loaded via <link>/<img> on Safari/iOS.
|
// once loaded via <link>/<img> on Safari/iOS.
|
||||||
<link rel="icon" media="(prefers-color-scheme: light)" href="/favicon-light.svg" type="image/svg+xml"/>
|
<link rel="icon" media="(prefers-color-scheme: light)" href="/favicon-light.svg" type="image/svg+xml"/>
|
||||||
<link rel="icon" media="(prefers-color-scheme: dark)" href="/favicon-dark.svg" type="image/svg+xml"/>
|
<link rel="icon" media="(prefers-color-scheme: dark)" href="/favicon-dark.svg" type="image/svg+xml"/>
|
||||||
|
// Server-side, so it can read hash.txt and link the
|
||||||
|
// content-hashed stylesheet (hash-files = true).
|
||||||
|
<HashedStylesheet id="leptos" options=options.clone()/>
|
||||||
<AutoReload options=options.clone()/>
|
<AutoReload options=options.clone()/>
|
||||||
<HydrationScripts options/>
|
<HydrationScripts options/>
|
||||||
<MetaTags/>
|
<MetaTags/>
|
||||||
@@ -54,20 +57,75 @@ pub fn shell(options: LeptosOptions) -> impl IntoView {
|
|||||||
pub fn App() -> impl IntoView {
|
pub fn App() -> impl IntoView {
|
||||||
provide_meta_context();
|
provide_meta_context();
|
||||||
|
|
||||||
|
// ONE site resource and ONE <Title> for the whole app, both living
|
||||||
|
// outside the router. Two dueling Title components (a static
|
||||||
|
// SITE_NAME fallback here + a per-page override) turned every SPA
|
||||||
|
// navigation into a remount race that the compile-time fallback
|
||||||
|
// kept winning - redoal.com's tab flipped to "uhhm" on the first
|
||||||
|
// client-side nav. App never remounts, so this Title never
|
||||||
|
// unmounts; the Suspense makes SSR await the resolved title so the
|
||||||
|
// served <head> is right too. Pages read the same resource via
|
||||||
|
// context instead of fetching their own copy.
|
||||||
|
let site = Resource::new(|| (), |_| get_site());
|
||||||
|
provide_context(site);
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<Stylesheet id="leptos" href="/pkg/portal.css"/>
|
<Suspense fallback=|| ()>
|
||||||
<Title text=SITE_NAME/>
|
{move || {
|
||||||
|
site.get()
|
||||||
|
.map(|res| {
|
||||||
|
let title = res
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| s.title)
|
||||||
|
.unwrap_or_else(|| SITE_NAME.to_string());
|
||||||
|
view! { <Title text=title/> }
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
</Suspense>
|
||||||
<Router>
|
<Router>
|
||||||
<Routes fallback=|| view! { <NotFound/> }>
|
<PortalShell/>
|
||||||
<Route path=path!("") view=QuestionPage/>
|
|
||||||
<Route path=path!("/*any") view=QuestionPage/>
|
|
||||||
</Routes>
|
|
||||||
</Router>
|
</Router>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every server-fn resource the pages read, created exactly once for
|
||||||
|
/// the app's lifetime and handed down via context. Wrapper structs
|
||||||
|
/// because a bare `Resource<T>` context is claimed by whoever provides
|
||||||
|
/// that T last.
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct QuestionRes(Resource<Result<Option<Page>, ServerFnError>>);
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct UserRes(Resource<Result<Option<User>, ServerFnError>>);
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct NavRes(Resource<Result<Vec<(String, String)>, ServerFnError>>);
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct AnnounceRes(Resource<Result<Vec<Announcement>, ServerFnError>>);
|
||||||
|
|
||||||
|
/// One live announced page (`Question.event`), pre-formatted on the
|
||||||
|
/// server so both renders agree and no client clock is involved.
|
||||||
|
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct Announcement {
|
||||||
|
pub id: String,
|
||||||
|
pub name: String,
|
||||||
|
/// "Sat 12 Sep, 18:00"
|
||||||
|
pub when: String,
|
||||||
|
/// "in 3 days" / "in 4 h" / "now"
|
||||||
|
pub relative: String,
|
||||||
|
pub place: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Owns the app's data resources, above the routes and reactive on the
|
||||||
|
/// location instead of recreated per page. Route components creating
|
||||||
|
/// their own resources broke on the first client-side navigation: the
|
||||||
|
/// remounted component's fresh Resource consumed a stale SSR hydration
|
||||||
|
/// buffer instead of fetching - concretely, the nav list
|
||||||
|
/// `[[id, name], ..]` deserialized as a `Page` (serde fills a struct
|
||||||
|
/// from a sequence in field order), rendering the landing question
|
||||||
|
/// gated behind its own nav entry. Stable resources + context makes
|
||||||
|
/// that class of misalignment impossible: navigation only changes a
|
||||||
|
/// key, and a key change always refetches.
|
||||||
#[component]
|
#[component]
|
||||||
fn QuestionPage() -> impl IntoView {
|
fn PortalShell() -> impl IntoView {
|
||||||
let location = use_location();
|
let location = use_location();
|
||||||
let query = use_query_map();
|
let query = use_query_map();
|
||||||
let path = Memo::new(move |_| {
|
let path = Memo::new(move |_| {
|
||||||
@@ -78,12 +136,39 @@ fn QuestionPage() -> impl IntoView {
|
|||||||
p
|
p
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
let chain = Memo::new(move |_| query.with(|q| q.get("chain")));
|
||||||
|
|
||||||
|
let question = Resource::new(
|
||||||
|
move || (path.get(), chain.get()),
|
||||||
|
|(path, chain)| get_question(path, chain),
|
||||||
|
);
|
||||||
|
let user = Resource::new(|| (), |_| current_user());
|
||||||
|
let nav = Resource::new(move || chain.get().is_some(), list_qualifying_questions);
|
||||||
|
let announcements = Resource::new(|| (), |_| list_announcements());
|
||||||
|
provide_context(QuestionRes(question));
|
||||||
|
provide_context(UserRes(user));
|
||||||
|
provide_context(NavRes(nav));
|
||||||
|
provide_context(AnnounceRes(announcements));
|
||||||
|
|
||||||
|
view! {
|
||||||
|
<Routes fallback=|| view! { <NotFound/> }>
|
||||||
|
<Route path=path!("") view=QuestionPage/>
|
||||||
|
<Route path=path!("/*any") view=QuestionPage/>
|
||||||
|
</Routes>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
fn QuestionPage() -> impl IntoView {
|
||||||
|
let query = use_query_map();
|
||||||
let parent_hash = Memo::new(move |_| query.with(|q| q.get("chain")));
|
let parent_hash = Memo::new(move |_| query.with(|q| q.get("chain")));
|
||||||
let query_email = Memo::new(move |_| query.with(|q| q.get("email")));
|
let query_email = Memo::new(move |_| query.with(|q| q.get("email")));
|
||||||
|
|
||||||
let question = Resource::new(move || path.get(), get_question);
|
// All shared, app-lifetime resources (see PortalShell / App) -
|
||||||
let user = Resource::new(|| (), |_| current_user());
|
// never created per navigation.
|
||||||
let site = Resource::new(|| (), |_| get_site());
|
let QuestionRes(question) = expect_context();
|
||||||
|
let UserRes(user) = expect_context();
|
||||||
|
let site = expect_context::<Resource<Result<SiteConfig, ServerFnError>>>();
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<Suspense fallback=|| {
|
<Suspense fallback=|| {
|
||||||
@@ -103,18 +188,12 @@ fn QuestionPage() -> impl IntoView {
|
|||||||
let site_cfg = site.get().and_then(|r| r.ok()).unwrap_or_default();
|
let site_cfg = site.get().and_then(|r| r.ok()).unwrap_or_default();
|
||||||
question_res
|
question_res
|
||||||
.map(|res| match res {
|
.map(|res| match res {
|
||||||
Ok(Some(q)) => {
|
Ok(Some(page)) => {
|
||||||
let current = user_res.and_then(|r| r.ok()).flatten();
|
let current = user_res.and_then(|r| r.ok()).flatten();
|
||||||
view! {
|
view! {
|
||||||
// A second <Title> outranks App's
|
|
||||||
// SITE_NAME fallback only when content
|
|
||||||
// actually declares one.
|
|
||||||
{site_cfg
|
|
||||||
.title
|
|
||||||
.clone()
|
|
||||||
.map(|t| view! { <Title text=t/> })}
|
|
||||||
<QuestionView
|
<QuestionView
|
||||||
question=q
|
question=page.question
|
||||||
|
chain_gate=page.chain_gate
|
||||||
parent_hash=parent_hash.get()
|
parent_hash=parent_hash.get()
|
||||||
query_email=query_email.get()
|
query_email=query_email.get()
|
||||||
user=current
|
user=current
|
||||||
@@ -133,12 +212,46 @@ fn QuestionPage() -> impl IntoView {
|
|||||||
#[component]
|
#[component]
|
||||||
fn QuestionView(
|
fn QuestionView(
|
||||||
question: Question,
|
question: Question,
|
||||||
|
chain_gate: Option<(String, String)>,
|
||||||
parent_hash: Option<String>,
|
parent_hash: Option<String>,
|
||||||
query_email: Option<String>,
|
query_email: Option<String>,
|
||||||
user: Option<User>,
|
user: Option<User>,
|
||||||
site: SiteConfig,
|
site: SiteConfig,
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
let question_id = question.id.clone();
|
let question_id = question.id.clone();
|
||||||
|
let has_chain = parent_hash.is_some();
|
||||||
|
|
||||||
|
// The provenance counterpart to the qualifies gate below: a
|
||||||
|
// requires_chain page whose visitor holds no verifiable lineage to
|
||||||
|
// the required question renders a pointer there instead of its
|
||||||
|
// alternatives.
|
||||||
|
if let Some((target, target_name)) = chain_gate {
|
||||||
|
let label = if target_name.is_empty() {
|
||||||
|
target.clone()
|
||||||
|
} else {
|
||||||
|
target_name
|
||||||
|
};
|
||||||
|
return view! {
|
||||||
|
<Hero
|
||||||
|
title=question.name.clone()
|
||||||
|
description=question.description.clone()
|
||||||
|
landing=question_id == "/"
|
||||||
|
current_id=question_id.clone()
|
||||||
|
site=site.clone()
|
||||||
|
/>
|
||||||
|
<div class="alternatives">
|
||||||
|
<section class="alt-card gate-card">
|
||||||
|
<p>"This page follows from an answer you don't seem to carry yet."</p>
|
||||||
|
<a class="alt-submit" href=target>
|
||||||
|
{label}
|
||||||
|
</a>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
// A gate is never a dead end: the same nav as every page.
|
||||||
|
<QuestionNav current_id=question_id has_chain=has_chain/>
|
||||||
|
}
|
||||||
|
.into_any();
|
||||||
|
}
|
||||||
|
|
||||||
// Generic: any question with `qualifies` set renders this same gate
|
// Generic: any question with `qualifies` set renders this same gate
|
||||||
// instead of its alternatives - "/review" isn't a special case, it's
|
// instead of its alternatives - "/review" isn't a special case, it's
|
||||||
@@ -150,6 +263,7 @@ fn QuestionView(
|
|||||||
title=question.name.clone()
|
title=question.name.clone()
|
||||||
description=question.description.clone()
|
description=question.description.clone()
|
||||||
landing=question_id == "/"
|
landing=question_id == "/"
|
||||||
|
current_id=question_id.clone()
|
||||||
site=site.clone()
|
site=site.clone()
|
||||||
/>
|
/>
|
||||||
<div class="alternatives">
|
<div class="alternatives">
|
||||||
@@ -171,6 +285,7 @@ fn QuestionView(
|
|||||||
}}
|
}}
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
<QuestionNav current_id=question_id has_chain=has_chain/>
|
||||||
}
|
}
|
||||||
.into_any();
|
.into_any();
|
||||||
}
|
}
|
||||||
@@ -180,7 +295,6 @@ fn QuestionView(
|
|||||||
// on pages where some alternative actually declares a deck.
|
// on pages where some alternative actually declares a deck.
|
||||||
let needs_swiper = question.alternatives.iter().any(|a| a.images.len() > 1);
|
let needs_swiper = question.alternatives.iter().any(|a| a.images.len() > 1);
|
||||||
|
|
||||||
let has_chain = parent_hash.is_some();
|
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
{needs_swiper.then(|| view! { <leptos_meta::Script src="/swiper-element-bundle.min.js"/> })}
|
{needs_swiper.then(|| view! { <leptos_meta::Script src="/swiper-element-bundle.min.js"/> })}
|
||||||
@@ -189,6 +303,7 @@ fn QuestionView(
|
|||||||
description=question.description.clone()
|
description=question.description.clone()
|
||||||
landing=question_id == "/"
|
landing=question_id == "/"
|
||||||
site=site.clone()
|
site=site.clone()
|
||||||
|
current_id=question_id.clone()
|
||||||
/>
|
/>
|
||||||
<div class="alternatives">
|
<div class="alternatives">
|
||||||
<For
|
<For
|
||||||
@@ -243,7 +358,8 @@ fn QuestionView(
|
|||||||
/// claiming front-page space (an owner also sees the gated desks here).
|
/// claiming front-page space (an owner also sees the gated desks here).
|
||||||
#[component]
|
#[component]
|
||||||
fn QuestionNav(current_id: String, has_chain: bool) -> impl IntoView {
|
fn QuestionNav(current_id: String, has_chain: bool) -> impl IntoView {
|
||||||
let nav = Resource::new(move || has_chain, list_qualifying_questions);
|
let _ = has_chain; // keyed into the shared resource by PortalShell
|
||||||
|
let NavRes(nav) = expect_context();
|
||||||
view! {
|
view! {
|
||||||
<Suspense fallback=|| ()>
|
<Suspense fallback=|| ()>
|
||||||
{move || {
|
{move || {
|
||||||
@@ -271,6 +387,45 @@ fn QuestionNav(current_id: String, has_chain: bool) -> impl IntoView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Live announced pages, as a strip at the top of the header - the one
|
||||||
|
/// place a page gets to claim attention before the question. Empty
|
||||||
|
/// (and unrendered) when nothing is announced.
|
||||||
|
#[component]
|
||||||
|
fn Announcements(current_id: String) -> impl IntoView {
|
||||||
|
let AnnounceRes(announcements) = expect_context();
|
||||||
|
view! {
|
||||||
|
<Suspense fallback=|| ()>
|
||||||
|
{move || {
|
||||||
|
let current_id = current_id.clone();
|
||||||
|
announcements.get().and_then(|res| res.ok()).map(|items| {
|
||||||
|
(!items.is_empty()).then(|| view! {
|
||||||
|
<nav class="announce" aria-label="Announcements">
|
||||||
|
<For
|
||||||
|
each=move || items.clone()
|
||||||
|
key=|a| a.id.clone()
|
||||||
|
children=move |a: Announcement| {
|
||||||
|
let current = a.id == current_id;
|
||||||
|
view! {
|
||||||
|
<a href=a.id.clone() class="announce-item" aria-current=current.then_some("page")>
|
||||||
|
<span class="announce-name">{a.name}</span>
|
||||||
|
<span class="announce-when">
|
||||||
|
{a.when}
|
||||||
|
{a.place.map(|p| format!(" · {p}"))}
|
||||||
|
</span>
|
||||||
|
<span class="announce-relative">{a.relative}</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
.into_any()
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</nav>
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
</Suspense>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// "Asked by X — contact them if you get stuck."
|
/// "Asked by X — contact them if you get stuck."
|
||||||
/// The mailto address is assembled from `data-user`/`data-domain` on a
|
/// The mailto address is assembled from `data-user`/`data-domain` on a
|
||||||
/// real mouse event, never baked into the server-rendered `href` -
|
/// real mouse event, never baked into the server-rendered `href` -
|
||||||
@@ -313,27 +468,6 @@ fn ResponsibleNote(responsible: Responsible) -> impl IntoView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Binds the actual "YES - Rasterized Lines" piece live at uhhm.no
|
|
||||||
// (ported to `public/yes.js`, an ES module now instead of a page-owning
|
|
||||||
// script) as a typed JS class - the idiomatic wasm-bindgen way to drive
|
|
||||||
// an existing JS module from Rust, rather than re-implementing canvas
|
|
||||||
// animation logic here.
|
|
||||||
#[cfg(feature = "hydrate")]
|
|
||||||
mod yes {
|
|
||||||
use wasm_bindgen::prelude::*;
|
|
||||||
|
|
||||||
#[wasm_bindgen(module = "/yes.js")]
|
|
||||||
extern "C" {
|
|
||||||
#[wasm_bindgen(js_name = RasterizedYES)]
|
|
||||||
pub type RasterizedYes;
|
|
||||||
|
|
||||||
#[wasm_bindgen(constructor, js_class = "RasterizedYES")]
|
|
||||||
pub fn new() -> RasterizedYes;
|
|
||||||
|
|
||||||
#[wasm_bindgen(method)]
|
|
||||||
pub fn stop(this: &RasterizedYes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Same idiomatic-typed-module approach as `yes` above, for the
|
// Same idiomatic-typed-module approach as `yes` above, for the
|
||||||
// prosekit-backed rich-text requirement kind (`prosekit-editor.js`,
|
// prosekit-backed rich-text requirement kind (`prosekit-editor.js`,
|
||||||
@@ -364,6 +498,28 @@ mod prosekit {
|
|||||||
// prosekit's hidden-input bridge for the value, yes.js's typed-handle
|
// prosekit's hidden-input bridge for the value, yes.js's typed-handle
|
||||||
// lifecycle for cleanup - it may own a live WebSocket to a
|
// lifecycle for cleanup - it may own a live WebSocket to a
|
||||||
// redoal-relay, which SPA navigation must close (`stop()`).
|
// redoal-relay, which SPA navigation must close (`stop()`).
|
||||||
|
#[cfg(feature = "hydrate")]
|
||||||
|
#[cfg(feature = "hydrate")]
|
||||||
|
mod voice {
|
||||||
|
use wasm_bindgen::prelude::*;
|
||||||
|
|
||||||
|
#[wasm_bindgen(module = "/voice.js")]
|
||||||
|
extern "C" {
|
||||||
|
pub type VoiceWidget;
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = mountVoice)]
|
||||||
|
pub fn mount_voice(
|
||||||
|
container: &web_sys::HtmlDivElement,
|
||||||
|
hidden: &web_sys::HtmlInputElement,
|
||||||
|
relay_url: &str,
|
||||||
|
key: &str,
|
||||||
|
) -> VoiceWidget;
|
||||||
|
|
||||||
|
#[wasm_bindgen(method)]
|
||||||
|
pub fn stop(this: &VoiceWidget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "hydrate")]
|
#[cfg(feature = "hydrate")]
|
||||||
mod gesture {
|
mod gesture {
|
||||||
use wasm_bindgen::prelude::*;
|
use wasm_bindgen::prelude::*;
|
||||||
@@ -379,114 +535,111 @@ mod gesture {
|
|||||||
relay_url: &str,
|
relay_url: &str,
|
||||||
) -> GestureWidget;
|
) -> GestureWidget;
|
||||||
|
|
||||||
#[wasm_bindgen(js_name = mountGestureHero)]
|
|
||||||
pub fn mount_gesture_hero(
|
|
||||||
container: &web_sys::HtmlDivElement,
|
|
||||||
relay_url: &str,
|
|
||||||
) -> GestureWidget;
|
|
||||||
|
|
||||||
#[wasm_bindgen(method)]
|
#[wasm_bindgen(method)]
|
||||||
pub fn stop(this: &GestureWidget);
|
pub fn stop(this: &GestureWidget);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
fn Hero(title: String, description: String, landing: bool, site: SiteConfig) -> impl IntoView {
|
fn Hero(title: String, description: String, landing: bool, site: SiteConfig, current_id: String) -> impl IntoView {
|
||||||
// Only the landing page gets a full interactive piece - it's the
|
// Only the landing page gets a piece - it's the one page a hero is
|
||||||
// one page a hero is actually "the" hero for; other pages
|
// actually "the" hero for; every other page gets the plain header.
|
||||||
// (thank-you pages, /review) get the plain dark header below.
|
// WHAT the piece is belongs to the content repo: site.yaml's
|
||||||
// WHICH piece is the content repo's call (`site.yaml`'s
|
// `hero: {kind: module, module: hero.js}` names a JavaScript module
|
||||||
// hero.kind): the YES canvas (default - uhhm's look), a redoal
|
// (served same-origin at /site/<path>) exporting
|
||||||
// gesture canvas, or nothing.
|
// `mount(container) -> handle` with `handle.stop()`. Portal knows
|
||||||
let hero_kind = if landing { site.hero.kind.clone() } else { "plain".to_string() };
|
// nothing about what it draws.
|
||||||
let show_yes = hero_kind == "yes";
|
let module = if landing && site.hero.kind == "module" {
|
||||||
let show_gesture = hero_kind == "gesture";
|
site.hero.module.clone()
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
let has_module = module.is_some();
|
||||||
let wordmark = site.wordmark.clone().unwrap_or_else(|| "/wordmark.svg".to_string());
|
let wordmark = site.wordmark.clone().unwrap_or_else(|| "/wordmark.svg".to_string());
|
||||||
let site_title = site.title.clone().unwrap_or_else(|| SITE_NAME.to_string());
|
let site_title = site.title.clone().unwrap_or_else(|| SITE_NAME.to_string());
|
||||||
|
|
||||||
// Starts the YES animation once the canvas elements exist, and
|
let piece_ref: NodeRef<leptos::html::Div> = NodeRef::new();
|
||||||
// explicitly stops the requestAnimationFrame loop on unmount - the
|
|
||||||
// original page-owning script never needed this since navigating
|
|
||||||
// away meant a full document unload, which doesn't happen in an
|
|
||||||
// SPA.
|
|
||||||
let raster_ref: NodeRef<leptos::html::Canvas> = NodeRef::new();
|
|
||||||
let gesture_ref: NodeRef<leptos::html::Div> = NodeRef::new();
|
|
||||||
#[cfg(feature = "hydrate")]
|
#[cfg(feature = "hydrate")]
|
||||||
if show_yes {
|
if has_module {
|
||||||
// `on_cleanup` requires Send + Sync (even single-threaded, wasm),
|
use wasm_bindgen::JsCast;
|
||||||
// which a JS-backed value never is - `StoredValue`'s `LocalStorage`
|
// Handle = whatever the module's mount() returned; kept as a
|
||||||
// variant is the established way around this (same pattern
|
// raw JsValue so the contract stays "has a stop()", nothing
|
||||||
// cnats' WebRTC call state uses for its own non-Send peer map).
|
// typed on the Rust side.
|
||||||
let instance: StoredValue<Option<yes::RasterizedYes>, LocalStorage> =
|
let handle: StoredValue<Option<wasm_bindgen::JsValue>, LocalStorage> =
|
||||||
StoredValue::new_local(None);
|
|
||||||
// Gated on the canvas NodeRef resolving, not just "the Effect
|
|
||||||
// ran" - on a fresh page load the DOM is already there by the
|
|
||||||
// time this fires, but navigating back to `/` client-side hit a
|
|
||||||
// real race: the Effect ran before the new view's <canvas> was
|
|
||||||
// actually inserted, RasterizedYES::new() (yes.js) did an
|
|
||||||
// unchecked `document.getElementById(...).getContext(...)` on
|
|
||||||
// null and threw mid-reactive-update - which then corrupted
|
|
||||||
// wasm_bindgen_futures' single-threaded executor state badly
|
|
||||||
// enough to panic ("RefCell already borrowed") on the next
|
|
||||||
// tick. Waiting for the NodeRef itself guarantees DOM presence
|
|
||||||
// the same way the prosekit editor's own mount Effect does.
|
|
||||||
Effect::new(move |_| {
|
|
||||||
if raster_ref.get().is_none() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
instance.set_value(Some(yes::RasterizedYes::new()));
|
|
||||||
});
|
|
||||||
on_cleanup(move || {
|
|
||||||
instance.update_value(|opt| {
|
|
||||||
if let Some(inst) = opt.take() {
|
|
||||||
inst.stop();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// The gesture hero mounts the same widget the `type: gesture`
|
|
||||||
// requirement uses, in hero mode (no form field; echoes render as
|
|
||||||
// ambient strokes on the canvas itself). Same StoredValue +
|
|
||||||
// on_cleanup shape as the YES piece - it may own a live WebSocket.
|
|
||||||
#[cfg(feature = "hydrate")]
|
|
||||||
if show_gesture {
|
|
||||||
let relay = site.hero.relay.clone().unwrap_or_default();
|
|
||||||
let widget: StoredValue<Option<gesture::GestureWidget>, LocalStorage> =
|
|
||||||
StoredValue::new_local(None);
|
StoredValue::new_local(None);
|
||||||
Effect::new(move |_| {
|
Effect::new(move |_| {
|
||||||
let Some(container) = gesture_ref.get() else {
|
let Some(container) = piece_ref.get() else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
if widget.with_value(|w| w.is_some()) {
|
if handle.with_value(|h| h.is_some()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
widget.set_value(Some(gesture::mount_gesture_hero(&container, &relay)));
|
// Adopt the inline early-mount's instance (started at HTML
|
||||||
|
// parse time) if it's there; otherwise (client-side
|
||||||
|
// navigation back to /) mount fresh through the helper the
|
||||||
|
// inline script left on window. Either order is safe.
|
||||||
|
let global = js_sys::global();
|
||||||
|
let _ = js_sys::Reflect::set(&global, &"__heroAdopted".into(), &true.into());
|
||||||
|
let early = js_sys::Reflect::get(&global, &"__heroEarly".into())
|
||||||
|
.ok()
|
||||||
|
.filter(|v| !v.is_undefined() && !v.is_null());
|
||||||
|
match early {
|
||||||
|
Some(v) => {
|
||||||
|
let _ = js_sys::Reflect::delete_property(&global, &"__heroEarly".into());
|
||||||
|
handle.set_value(Some(v));
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
if let Ok(mounter) = js_sys::Reflect::get(&global, &"__mountHero".into()) {
|
||||||
|
if let Some(f) = mounter.dyn_ref::<js_sys::Function>() {
|
||||||
|
if let Ok(promise) = f.call1(&global, &container) {
|
||||||
|
let promise: js_sys::Promise = promise.unchecked_into();
|
||||||
|
leptos::task::spawn_local(async move {
|
||||||
|
if let Ok(h) =
|
||||||
|
wasm_bindgen_futures::JsFuture::from(promise).await
|
||||||
|
{
|
||||||
|
handle.set_value(Some(h));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
on_cleanup(move || {
|
on_cleanup(move || {
|
||||||
widget.update_value(|opt| {
|
handle.update_value(|opt| {
|
||||||
if let Some(w) = opt.take() {
|
if let Some(h) = opt.take() {
|
||||||
w.stop();
|
if let Ok(stop) = js_sys::Reflect::get(&h, &"stop".into()) {
|
||||||
|
if let Some(f) = stop.dyn_ref::<js_sys::Function>() {
|
||||||
|
let _ = f.call0(&h);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The inline script starts the piece at HTML parse time instead of
|
||||||
|
// waiting out the wasm bundle; it also leaves __mountHero for the
|
||||||
|
// hydrate side's client-side-navigation case. Module path is
|
||||||
|
// validated to plain segments by SiteConfig::validate, so it can't
|
||||||
|
// break out of the string here.
|
||||||
|
let early_script = module.as_ref().map(|m| {
|
||||||
|
format!(
|
||||||
|
"const url = '/site/{m}'; window.__mountHero = (el) => import(url).then((mod) => mod.mount(el)); if (!window.__heroAdopted && !window.__heroEarly) window.__mountHero(document.querySelector('.hero-piece')).then((h) => {{ if (!window.__heroAdopted) window.__heroEarly = h; else if (h && h.stop) h.stop(); }});"
|
||||||
|
)
|
||||||
|
});
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<header class="hero" class:hero-yes=show_yes class:hero-gesture=show_gesture>
|
<header class="hero" class:hero-module=has_module>
|
||||||
{show_yes
|
<Announcements current_id=current_id/>
|
||||||
|
{has_module
|
||||||
.then(|| {
|
.then(|| {
|
||||||
view! {
|
view! {
|
||||||
<div class="hero-canvas" aria-hidden="true">
|
<div class="hero-piece" aria-hidden="true" node_ref=piece_ref></div>
|
||||||
<canvas id="lineCanvas"></canvas>
|
<script type="module" inner_html=early_script.unwrap_or_default()></script>
|
||||||
<canvas id="rasterCanvas" node_ref=raster_ref></canvas>
|
|
||||||
</div>
|
|
||||||
}
|
}
|
||||||
})}
|
})}
|
||||||
{show_gesture
|
|
||||||
.then(|| {
|
|
||||||
view! { <div class="hero-draw" node_ref=gesture_ref></div> }
|
|
||||||
})}
|
|
||||||
<div class="hero-copy">
|
<div class="hero-copy">
|
||||||
<a class="wordmark" href="/">
|
<a class="wordmark" href="/">
|
||||||
<img src=wordmark alt=site_title/>
|
<img src=wordmark alt=site_title/>
|
||||||
@@ -549,7 +702,7 @@ fn AlternativeCard(
|
|||||||
return view! {
|
return view! {
|
||||||
<section class="alt-card">
|
<section class="alt-card">
|
||||||
<h2>{alternative.name.clone()}</h2>
|
<h2>{alternative.name.clone()}</h2>
|
||||||
<p class="alt-description">{alternative.description.clone()}</p>
|
<p class="alt-description" inner_html=render_inline_markdown(&alternative.description)></p>
|
||||||
{move || {
|
{move || {
|
||||||
let question_id_for_action = question_id_for_action.clone();
|
let question_id_for_action = question_id_for_action.clone();
|
||||||
let alt_name_for_action = alt_name_for_action.clone();
|
let alt_name_for_action = alt_name_for_action.clone();
|
||||||
@@ -635,12 +788,16 @@ fn AlternativeCard(
|
|||||||
.or_insert_with(|| RwSignal::new(Vec::new()));
|
.or_insert_with(|| RwSignal::new(Vec::new()));
|
||||||
select_multi.insert(req.name.clone(), req.multiple);
|
select_multi.insert(req.name.clone(), req.multiple);
|
||||||
} else {
|
} else {
|
||||||
if req.kind == "gesture" {
|
// Widget-owned fields hold JSON objects, not strings.
|
||||||
|
if req.kind == "gesture" || req.kind == "voice" {
|
||||||
gesture_fields.insert(req.name.clone());
|
gesture_fields.insert(req.name.clone());
|
||||||
}
|
}
|
||||||
|
// A voice field's preset is the key it records at,
|
||||||
|
// not a value to submit.
|
||||||
|
let preset = if req.kind == "voice" { String::new() } else { req.value.clone().unwrap_or_default() };
|
||||||
field_map
|
field_map
|
||||||
.entry(req.name.clone())
|
.entry(req.name.clone())
|
||||||
.or_insert_with(|| RwSignal::new(String::new()));
|
.or_insert_with(|| RwSignal::new(preset));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -771,7 +928,7 @@ fn AlternativeCard(
|
|||||||
<section class="alt-card">
|
<section class="alt-card">
|
||||||
<AltImages images=alternative.images.clone() />
|
<AltImages images=alternative.images.clone() />
|
||||||
<h2>{alternative.name.clone()}</h2>
|
<h2>{alternative.name.clone()}</h2>
|
||||||
<p class="alt-description">{alternative.description.clone()}</p>
|
<p class="alt-description" inner_html=render_inline_markdown(&alternative.description)></p>
|
||||||
<div class="features">
|
<div class="features">
|
||||||
<For
|
<For
|
||||||
each={
|
each={
|
||||||
@@ -820,7 +977,7 @@ fn AlternativeCard(
|
|||||||
let description = feature.description.clone();
|
let description = feature.description.clone();
|
||||||
move || !description.is_empty()
|
move || !description.is_empty()
|
||||||
}>
|
}>
|
||||||
<p>{feature.description.clone()}</p>
|
<p inner_html=render_inline_markdown(&feature.description)></p>
|
||||||
</Show>
|
</Show>
|
||||||
{resource.map(|spec| {
|
{resource.map(|spec| {
|
||||||
view! {
|
view! {
|
||||||
@@ -829,6 +986,7 @@ fn AlternativeCard(
|
|||||||
alternative=alt_name.clone()
|
alternative=alt_name.clone()
|
||||||
feature_name=feature_name.clone()
|
feature_name=feature_name.clone()
|
||||||
transitions=spec.transitions.clone()
|
transitions=spec.transitions.clone()
|
||||||
|
empty=spec.empty.clone()
|
||||||
pending_transitions=pending_transitions
|
pending_transitions=pending_transitions
|
||||||
transition_batch=transition_batch
|
transition_batch=transition_batch
|
||||||
/>
|
/>
|
||||||
@@ -1006,6 +1164,54 @@ fn AlternativeCard(
|
|||||||
.into_any();
|
.into_any();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if req.kind == "voice" {
|
||||||
|
let container_ref: NodeRef<leptos::html::Div> = NodeRef::new();
|
||||||
|
let hidden_ref: NodeRef<leptos::html::Input> = NodeRef::new();
|
||||||
|
|
||||||
|
#[cfg(feature = "hydrate")]
|
||||||
|
{
|
||||||
|
let relay = req.relay.clone().unwrap_or_default();
|
||||||
|
let key = req.value.clone().unwrap_or_default();
|
||||||
|
let widget: StoredValue<Option<voice::VoiceWidget>, LocalStorage> =
|
||||||
|
StoredValue::new_local(None);
|
||||||
|
Effect::new(move |_| {
|
||||||
|
let (Some(container), Some(hidden)) =
|
||||||
|
(container_ref.get(), hidden_ref.get())
|
||||||
|
else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
if widget.with_value(|w| w.is_some()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
widget.set_value(Some(voice::mount_voice(
|
||||||
|
&container, &hidden, &relay, &key,
|
||||||
|
)));
|
||||||
|
});
|
||||||
|
on_cleanup(move || {
|
||||||
|
widget.update_value(|opt| {
|
||||||
|
if let Some(w) = opt.take() {
|
||||||
|
w.stop();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return view! {
|
||||||
|
<div class="field">
|
||||||
|
{label_text}
|
||||||
|
<input
|
||||||
|
id=field_id
|
||||||
|
type="hidden"
|
||||||
|
node_ref=hidden_ref
|
||||||
|
prop:value=move || sig.get()
|
||||||
|
on:input=move |ev| sig.set(event_target_value(&ev))
|
||||||
|
/>
|
||||||
|
<div class="voice-wrap" node_ref=container_ref></div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
.into_any();
|
||||||
|
}
|
||||||
|
|
||||||
if req.kind == "prosekit" {
|
if req.kind == "prosekit" {
|
||||||
let container_ref: NodeRef<leptos::html::Div> = NodeRef::new();
|
let container_ref: NodeRef<leptos::html::Div> = NodeRef::new();
|
||||||
let hidden_ref: NodeRef<leptos::html::Input> = NodeRef::new();
|
let hidden_ref: NodeRef<leptos::html::Input> = NodeRef::new();
|
||||||
@@ -1038,6 +1244,20 @@ fn AlternativeCard(
|
|||||||
.into_any();
|
.into_any();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if req.kind == "hidden" {
|
||||||
|
// A carrier value only — no label row, or a
|
||||||
|
// preset key reads as a second visible field.
|
||||||
|
return view! {
|
||||||
|
<input
|
||||||
|
id=field_id
|
||||||
|
type="hidden"
|
||||||
|
prop:value=move || sig.get()
|
||||||
|
on:input=move |ev| sig.set(event_target_value(&ev))
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
.into_any();
|
||||||
|
}
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<label class="field" for=label_for>
|
<label class="field" for=label_for>
|
||||||
{label_text}
|
{label_text}
|
||||||
@@ -1105,7 +1325,17 @@ fn AlternativeCard(
|
|||||||
children=move |e| view! { <p class="alt-encouragement">{e}</p> }
|
children=move |e| view! { <p class="alt-encouragement">{e}</p> }
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{if is_gateway {
|
{if alternative.disabled {
|
||||||
|
// Advertised, not yet takeable: the label
|
||||||
|
// stays (it says what will be possible),
|
||||||
|
// the button doesn't act.
|
||||||
|
view! {
|
||||||
|
<button type="button" class="alt-submit soon" disabled=true title="Not yet">
|
||||||
|
{button_label.clone()}
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
.into_any()
|
||||||
|
} else if is_gateway {
|
||||||
let href = alternative.action.clone().unwrap_or_default();
|
let href = alternative.action.clone().unwrap_or_default();
|
||||||
view! {
|
view! {
|
||||||
<a class="alt-submit" href=href>{button_label.clone()}</a>
|
<a class="alt-submit" href=href>{button_label.clone()}</a>
|
||||||
@@ -1148,6 +1378,7 @@ fn ResourceFeature(
|
|||||||
alternative: String,
|
alternative: String,
|
||||||
feature_name: String,
|
feature_name: String,
|
||||||
transitions: Vec<Transition>,
|
transitions: Vec<Transition>,
|
||||||
|
empty: Option<String>,
|
||||||
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
|
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
|
||||||
transition_batch: ServerAction<TransitionAnswers>,
|
transition_batch: ServerAction<TransitionAnswers>,
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
@@ -1181,6 +1412,7 @@ fn ResourceFeature(
|
|||||||
{move || {
|
{move || {
|
||||||
let feature_name = feature_name.clone();
|
let feature_name = feature_name.clone();
|
||||||
let transitions = transitions.clone();
|
let transitions = transitions.clone();
|
||||||
|
let empty = empty.clone().unwrap_or_else(|| "Nothing here yet.".to_string());
|
||||||
data.get()
|
data.get()
|
||||||
.map(|res| match res {
|
.map(|res| match res {
|
||||||
Ok(value) => {
|
Ok(value) => {
|
||||||
@@ -1188,6 +1420,7 @@ fn ResourceFeature(
|
|||||||
<ResourceValue
|
<ResourceValue
|
||||||
feature_name=feature_name
|
feature_name=feature_name
|
||||||
transitions=transitions
|
transitions=transitions
|
||||||
|
empty=empty
|
||||||
value=value
|
value=value
|
||||||
pending_transitions=pending_transitions
|
pending_transitions=pending_transitions
|
||||||
transition_batch=transition_batch
|
transition_batch=transition_batch
|
||||||
@@ -1214,11 +1447,23 @@ fn ResourceFeature(
|
|||||||
fn ResourceValue(
|
fn ResourceValue(
|
||||||
feature_name: String,
|
feature_name: String,
|
||||||
transitions: Vec<Transition>,
|
transitions: Vec<Transition>,
|
||||||
|
empty: String,
|
||||||
value: serde_json::Value,
|
value: serde_json::Value,
|
||||||
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
|
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
|
||||||
transition_batch: ServerAction<TransitionAnswers>,
|
transition_batch: ServerAction<TransitionAnswers>,
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
|
// A jq like `.[] | {...}` over an empty list yields no output at
|
||||||
|
// all - that arrives as null, and it's the same silence as [].
|
||||||
|
if value.is_null() {
|
||||||
|
return view! { <p class="resource-empty">{empty}</p> }.into_any();
|
||||||
|
}
|
||||||
if let serde_json::Value::Array(items) = &value {
|
if let serde_json::Value::Array(items) = &value {
|
||||||
|
// Before the Answer parse below: an empty list deserializes as
|
||||||
|
// an (empty) Vec<Answer> too, and rendered as a blank
|
||||||
|
// answer-list instead of saying anything.
|
||||||
|
if items.is_empty() {
|
||||||
|
return view! { <p class="resource-empty">{empty}</p> }.into_any();
|
||||||
|
}
|
||||||
if let Ok(answers) = serde_json::from_value::<Vec<Answer>>(value.clone()) {
|
if let Ok(answers) = serde_json::from_value::<Vec<Answer>>(value.clone()) {
|
||||||
let mut answers = answers;
|
let mut answers = answers;
|
||||||
answers.sort_by(|a, b| {
|
answers.sort_by(|a, b| {
|
||||||
@@ -1251,9 +1496,6 @@ fn ResourceValue(
|
|||||||
}
|
}
|
||||||
.into_any();
|
.into_any();
|
||||||
}
|
}
|
||||||
if items.is_empty() {
|
|
||||||
return view! { <p class="resource-empty">"Nothing here yet."</p> }.into_any();
|
|
||||||
}
|
|
||||||
// A list of plain objects (e.g. a jq-shaped GiteaStarred/Url
|
// A list of plain objects (e.g. a jq-shaped GiteaStarred/Url
|
||||||
// resource) - render as cards rather than dumping raw JSON.
|
// resource) - render as cards rather than dumping raw JSON.
|
||||||
// Generic on purpose, no content-declared "kind": `name`/`title`
|
// Generic on purpose, no content-declared "kind": `name`/`title`
|
||||||
@@ -1300,8 +1542,11 @@ fn ItemCard(item: serde_json::Value) -> impl IntoView {
|
|||||||
let name = text_field(&obj, &["name", "title"]);
|
let name = text_field(&obj, &["name", "title"]);
|
||||||
let description = text_field(&obj, &["description"]);
|
let description = text_field(&obj, &["description"]);
|
||||||
let url = text_field(&obj, &["url", "html_url"]);
|
let url = text_field(&obj, &["url", "html_url"]);
|
||||||
|
// A playable recording (an https URL to audio) renders as a
|
||||||
|
// player, not a link - the relay's /blob/<digest>.wav.
|
||||||
|
let audio = text_field(&obj, &["audio"]).filter(|a| a.starts_with("https://"));
|
||||||
|
|
||||||
let known = ["name", "title", "description", "url", "html_url"];
|
let known = ["name", "title", "description", "url", "html_url", "audio"];
|
||||||
let extra: Vec<(String, String)> = obj
|
let extra: Vec<(String, String)> = obj
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|(k, v)| !known.contains(&k.as_str()) && !v.is_null())
|
.filter(|(k, v)| !known.contains(&k.as_str()) && !v.is_null())
|
||||||
@@ -1340,7 +1585,9 @@ fn ItemCard(item: serde_json::Value) -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
})}
|
})}
|
||||||
{description.map(|d| view! { <p class="item-card-description">{d}</p> })}
|
{description
|
||||||
|
.map(|d| view! { <p class="item-card-description" inner_html=render_inline_markdown(&d)></p> })}
|
||||||
|
{audio.map(|src| view! { <audio class="item-card-audio" controls preload="none" src=src></audio> })}
|
||||||
{(!extra.is_empty())
|
{(!extra.is_empty())
|
||||||
.then(|| {
|
.then(|| {
|
||||||
view! {
|
view! {
|
||||||
@@ -1640,11 +1887,56 @@ fn NotFound() -> impl IntoView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// What a URL resolves to: the question (dynamic pages arrive with
|
||||||
|
/// their segment value already substituted, see
|
||||||
|
/// `content::resolve_question`) plus whether a `requires_chain` gate
|
||||||
|
/// blocked it - `(target id, target name)` so the gate can point the
|
||||||
|
/// visitor at where the required answer comes from.
|
||||||
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
|
pub struct Page {
|
||||||
|
pub question: Question,
|
||||||
|
pub chain_gate: Option<(String, String)>,
|
||||||
|
}
|
||||||
|
|
||||||
#[server(endpoint = "get_question")]
|
#[server(endpoint = "get_question")]
|
||||||
pub async fn get_question(path: String) -> Result<Option<Question>, ServerFnError> {
|
pub async fn get_question(
|
||||||
|
path: String,
|
||||||
|
chain: Option<String>,
|
||||||
|
) -> Result<Option<Page>, ServerFnError> {
|
||||||
|
use crate::content::{path_matches, resolve_question};
|
||||||
use crate::server::AppState;
|
use crate::server::AppState;
|
||||||
let state = expect_context::<AppState>();
|
let state = expect_context::<AppState>();
|
||||||
Ok(state.questions.load().get(&path).cloned())
|
let questions = state.questions.load();
|
||||||
|
let Some(question) = resolve_question(&questions, &path) else {
|
||||||
|
return Ok(None);
|
||||||
|
};
|
||||||
|
let mut chain_gate = None;
|
||||||
|
if let Some(target) = &question.requires_chain {
|
||||||
|
// The claimed lineage must verifiably end at the required
|
||||||
|
// question - an unindexed or absent hash reads as unverified,
|
||||||
|
// and the gate stays shut. Dynamic targets match any concrete
|
||||||
|
// answer of theirs.
|
||||||
|
let verified = match &chain {
|
||||||
|
Some(hash) => crate::chain::lookup_node(&state.jetstream, hash)
|
||||||
|
.await
|
||||||
|
.is_some_and(|node| {
|
||||||
|
node.question_id == *target
|
||||||
|
|| path_matches(target, &node.question_id).is_some()
|
||||||
|
}),
|
||||||
|
None => false,
|
||||||
|
};
|
||||||
|
if !verified {
|
||||||
|
let name = questions
|
||||||
|
.get(target)
|
||||||
|
.map(|q| q.name.clone())
|
||||||
|
.unwrap_or_default();
|
||||||
|
chain_gate = Some((target.clone(), name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(Some(Page {
|
||||||
|
question,
|
||||||
|
chain_gate,
|
||||||
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The content repo's branding (`site.yaml`) - title, wordmark, hero
|
/// The content repo's branding (`site.yaml`) - title, wordmark, hero
|
||||||
@@ -1676,18 +1968,86 @@ pub async fn list_qualifying_questions(
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| ServerFnError::new(e.to_string()))?;
|
.map_err(|e| ServerFnError::new(e.to_string()))?;
|
||||||
|
|
||||||
|
let now_ms = chrono::Utc::now().timestamp_millis();
|
||||||
let mut out: Vec<(String, String)> = state
|
let mut out: Vec<(String, String)> = state
|
||||||
.questions
|
.questions
|
||||||
.load()
|
.load()
|
||||||
.values()
|
.values()
|
||||||
.filter(|q| is_qualified(user.as_ref(), q))
|
.filter(|q| is_qualified(user.as_ref(), q))
|
||||||
.filter(|q| !q.followup || has_chain)
|
// An ended event page is a followup from then on - only a
|
||||||
|
// visitor carrying a chain (they answered it) still sees it.
|
||||||
|
.filter(|q| !(q.is_followup() || q.event_ended_at(now_ms)) || has_chain)
|
||||||
|
// A live event is announced in the header instead.
|
||||||
|
.filter(|q| !q.event_live_at(now_ms))
|
||||||
|
// A dynamic page has no URL of its own to link to.
|
||||||
|
.filter(|q| !q.is_dynamic())
|
||||||
.map(|q| (q.id.clone(), q.name.clone()))
|
.map(|q| (q.id.clone(), q.name.clone()))
|
||||||
.collect();
|
.collect();
|
||||||
out.sort();
|
out.sort();
|
||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every announced page whose window is still open and that the
|
||||||
|
/// visitor qualifies for, soonest first.
|
||||||
|
#[server(endpoint = "list_announcements")]
|
||||||
|
pub async fn list_announcements() -> Result<Vec<Announcement>, ServerFnError> {
|
||||||
|
use crate::auth::{User, SESSION_USER_KEY};
|
||||||
|
use crate::content::is_qualified;
|
||||||
|
use crate::server::AppState;
|
||||||
|
|
||||||
|
let state = expect_context::<AppState>();
|
||||||
|
let session: tower_sessions::Session = leptos_axum::extract().await?;
|
||||||
|
let user = session
|
||||||
|
.get::<User>(SESSION_USER_KEY)
|
||||||
|
.await
|
||||||
|
.map_err(|e| ServerFnError::new(e.to_string()))?;
|
||||||
|
let now_ms = chrono::Utc::now().timestamp_millis();
|
||||||
|
|
||||||
|
let mut live: Vec<(i64, Announcement)> = state
|
||||||
|
.questions
|
||||||
|
.load()
|
||||||
|
.values()
|
||||||
|
.filter(|q| is_qualified(user.as_ref(), q) && q.event_live_at(now_ms))
|
||||||
|
.filter_map(|q| {
|
||||||
|
let event = q.event.as_ref()?;
|
||||||
|
let starts = chrono::DateTime::parse_from_rfc3339(&event.starts).ok()?;
|
||||||
|
let starts_ms = starts.timestamp_millis();
|
||||||
|
let relative = relative_until(starts_ms - now_ms);
|
||||||
|
Some((
|
||||||
|
starts_ms,
|
||||||
|
Announcement {
|
||||||
|
id: q.id.clone(),
|
||||||
|
name: q.name.clone(),
|
||||||
|
when: starts.format("%a %-d %b, %H:%M").to_string(),
|
||||||
|
relative,
|
||||||
|
place: event.place.clone(),
|
||||||
|
},
|
||||||
|
))
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
live.sort_by_key(|(starts, _)| *starts);
|
||||||
|
Ok(live.into_iter().map(|(_, a)| a).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "in 3 days" / "in 4 h" / "in 20 min" / "now" (already started).
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
fn relative_until(delta_ms: i64) -> String {
|
||||||
|
const MIN: i64 = 60_000;
|
||||||
|
const HOUR: i64 = 60 * MIN;
|
||||||
|
const DAY: i64 = 24 * HOUR;
|
||||||
|
if delta_ms <= 0 {
|
||||||
|
"now".to_string()
|
||||||
|
} else if delta_ms >= 2 * DAY {
|
||||||
|
format!("in {} days", delta_ms / DAY)
|
||||||
|
} else if delta_ms >= DAY {
|
||||||
|
"tomorrow".to_string()
|
||||||
|
} else if delta_ms >= HOUR {
|
||||||
|
format!("in {} h", delta_ms / HOUR)
|
||||||
|
} else {
|
||||||
|
format!("in {} min", (delta_ms / MIN).max(1))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
pub struct SubmitResult {
|
pub struct SubmitResult {
|
||||||
pub next: Option<String>,
|
pub next: Option<String>,
|
||||||
@@ -1709,11 +2069,10 @@ pub async fn submit_answer(
|
|||||||
use crate::server::AppState;
|
use crate::server::AppState;
|
||||||
|
|
||||||
let state = expect_context::<AppState>();
|
let state = expect_context::<AppState>();
|
||||||
let question = state
|
// resolve_question, not a plain map get: a dynamic page's concrete
|
||||||
.questions
|
// path (what the client holds as its question id) resolves to the
|
||||||
.load()
|
// pattern page it came from.
|
||||||
.get(&question_id)
|
let question = crate::content::resolve_question(&state.questions.load(), &question_id)
|
||||||
.cloned()
|
|
||||||
.ok_or_else(|| ServerFnError::new("unknown question"))?;
|
.ok_or_else(|| ServerFnError::new("unknown question"))?;
|
||||||
|
|
||||||
let session: tower_sessions::Session = leptos_axum::extract().await?;
|
let session: tower_sessions::Session = leptos_axum::extract().await?;
|
||||||
@@ -1730,11 +2089,21 @@ pub async fn submit_answer(
|
|||||||
.iter()
|
.iter()
|
||||||
.find(|a| a.name == alternative)
|
.find(|a| a.name == alternative)
|
||||||
.ok_or_else(|| ServerFnError::new("unknown alternative"))?;
|
.ok_or_else(|| ServerFnError::new("unknown alternative"))?;
|
||||||
let next = alt.action.clone();
|
if alt.disabled {
|
||||||
|
return Err(ServerFnError::new("this alternative isn't open yet"));
|
||||||
|
}
|
||||||
let record_as = alt.record_as.clone();
|
let record_as = alt.record_as.clone();
|
||||||
|
|
||||||
let responses: serde_json::Value = serde_json::from_str(&responses_json)
|
let responses: serde_json::Value = serde_json::from_str(&responses_json)
|
||||||
.map_err(|e| ServerFnError::new(format!("invalid responses: {e}")))?;
|
.map_err(|e| ServerFnError::new(format!("invalid responses: {e}")))?;
|
||||||
|
// `/shape/{curve.key}`: the next page may be chosen by the answer.
|
||||||
|
let next = match alt.action.as_deref() {
|
||||||
|
Some(action) => Some(
|
||||||
|
crate::content::template_action(action, &responses)
|
||||||
|
.ok_or_else(|| ServerFnError::new("this answer is missing what the next page needs"))?,
|
||||||
|
),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
|
||||||
let parent_hashes: Vec<String> = parent_hash.into_iter().collect();
|
let parent_hashes: Vec<String> = parent_hash.into_iter().collect();
|
||||||
let timestamp_ms = chrono::Utc::now().timestamp_millis();
|
let timestamp_ms = chrono::Utc::now().timestamp_millis();
|
||||||
@@ -1754,6 +2123,14 @@ pub async fn submit_answer(
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| ServerFnError::new(format!("nats publish failed: {e}")))?;
|
.map_err(|e| ServerFnError::new(format!("nats publish failed: {e}")))?;
|
||||||
|
|
||||||
|
// Index the node so requires_chain pages can verify lineage.
|
||||||
|
// Best-effort: the NATS event above is the durable record.
|
||||||
|
if let Err(e) =
|
||||||
|
crate::chain::record_node(&state.jetstream, &chain_hash, &question_id, timestamp_ms).await
|
||||||
|
{
|
||||||
|
tracing::error!("failed to index chain node: {e}");
|
||||||
|
}
|
||||||
|
|
||||||
// Best-effort: a bucket-write hiccup shouldn't fail a submission the
|
// Best-effort: a bucket-write hiccup shouldn't fail a submission the
|
||||||
// NATS event has already recorded.
|
// NATS event has already recorded.
|
||||||
if let Some(bucket) = &record_as {
|
if let Some(bucket) = &record_as {
|
||||||
|
|||||||
+40
-12
@@ -52,8 +52,21 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
eprintln!("FAIL: {e}");
|
eprintln!("FAIL: {e}");
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
|
let aggregates_map = content::with_builtin_aggregates(aggregates_map);
|
||||||
match content::validate_questions(&questions, &aggregates_map) {
|
match content::validate_questions(&questions, &aggregates_map) {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
|
// The runtime's own event desk: a repo announcing pages
|
||||||
|
// (Question.event) should read portal_events somewhere, or
|
||||||
|
// "post what happened" tasks pile up unseen. Warn, don't
|
||||||
|
// fail - the runtime creates the records either way.
|
||||||
|
if questions.values().any(|q| q.event.is_some())
|
||||||
|
&& !content::bucket_is_read(&questions, content::EVENTS_BUCKET)
|
||||||
|
{
|
||||||
|
eprintln!(
|
||||||
|
"WARN: pages carry `event:` but no kv resource reads bucket {:?} - add a desk so summaries get posted",
|
||||||
|
content::EVENTS_BUCKET
|
||||||
|
);
|
||||||
|
}
|
||||||
println!(
|
println!(
|
||||||
"OK: {} question(s), {} aggregate(s) valid",
|
"OK: {} question(s), {} aggregate(s) valid",
|
||||||
questions.len(),
|
questions.len(),
|
||||||
@@ -108,23 +121,38 @@ fn load_aggregates_from_dir(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The offline counterpart to `content::load_questions_from_gitea` -
|
/// The offline counterpart to `content::load_questions_from_gitea` -
|
||||||
/// same "every `*.yaml` file becomes a `Question` keyed by its own
|
/// the same recursive tree walk and `content::build_questions`
|
||||||
/// `id`" shape, just reading a local checkout instead of Gitea's API,
|
/// pipeline (derived ids, relative refs, sections, followup
|
||||||
|
/// inference), just reading a local checkout instead of Gitea's API,
|
||||||
/// for linting a branch that hasn't been pushed yet.
|
/// for linting a branch that hasn't been pushed yet.
|
||||||
fn load_from_dir(
|
fn load_from_dir(
|
||||||
dir: &str,
|
dir: &str,
|
||||||
) -> anyhow::Result<std::collections::HashMap<String, content::Question>> {
|
) -> anyhow::Result<std::collections::HashMap<String, content::Question>> {
|
||||||
let mut out = std::collections::HashMap::new();
|
let base = std::path::Path::new(dir);
|
||||||
|
let mut files = Vec::new();
|
||||||
|
collect_yaml(base, base, &mut files)?;
|
||||||
|
content::build_questions(&files)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_yaml(
|
||||||
|
base: &std::path::Path,
|
||||||
|
dir: &std::path::Path,
|
||||||
|
out: &mut Vec<(String, String)>,
|
||||||
|
) -> anyhow::Result<()> {
|
||||||
for entry in std::fs::read_dir(dir)? {
|
for entry in std::fs::read_dir(dir)? {
|
||||||
let entry = entry?;
|
let path = entry?.path();
|
||||||
let path = entry.path();
|
if path.is_dir() {
|
||||||
if path.extension().and_then(|e| e.to_str()) != Some("yaml") {
|
collect_yaml(base, &path, out)?;
|
||||||
continue;
|
} else if path.extension().and_then(|e| e.to_str()) == Some("yaml") {
|
||||||
|
let rel = path
|
||||||
|
.strip_prefix(base)
|
||||||
|
.expect("walked paths sit under their base")
|
||||||
|
.to_string_lossy()
|
||||||
|
.replace('\\', "/");
|
||||||
|
let raw = std::fs::read_to_string(&path)
|
||||||
|
.map_err(|e| anyhow::anyhow!("reading {}: {e}", path.display()))?;
|
||||||
|
out.push((rel, raw));
|
||||||
}
|
}
|
||||||
let raw = std::fs::read_to_string(&path)?;
|
|
||||||
let question: content::Question = serde_yaml::from_str(&raw)
|
|
||||||
.map_err(|e| anyhow::anyhow!("parsing {}: {e}", path.display()))?;
|
|
||||||
out.insert(question.id.clone(), question);
|
|
||||||
}
|
}
|
||||||
Ok(out)
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,60 @@ use sha2::{Digest, Sha256};
|
|||||||
/// submitted responses, and a timestamp. Parents are sorted first so the
|
/// submitted responses, and a timestamp. Parents are sorted first so the
|
||||||
/// hash doesn't depend on the order multiple parents happened to arrive
|
/// hash doesn't depend on the order multiple parents happened to arrive
|
||||||
/// in.
|
/// in.
|
||||||
|
/// Where submitted chain nodes are indexed - hash → which question was
|
||||||
|
/// answered. Small on purpose (no responses), and shared by every
|
||||||
|
/// portal instance on the JetStream (hashes are globally unique, so
|
||||||
|
/// cross-site collisions can't happen). This is what lets
|
||||||
|
/// `requires_chain` pages verify a visitor's `?chain=` actually ends
|
||||||
|
/// at the question they claim to have answered.
|
||||||
|
pub const CHAIN_BUCKET: &str = "portal_chains";
|
||||||
|
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
pub struct ChainNode {
|
||||||
|
pub question_id: String,
|
||||||
|
pub timestamp_ms: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Indexes one submitted node. Best-effort by design (the caller logs
|
||||||
|
/// and continues): the NATS event is the durable record, this is a
|
||||||
|
/// lookup convenience.
|
||||||
|
pub async fn record_node(
|
||||||
|
js: &async_nats::jetstream::Context,
|
||||||
|
chain_hash: &str,
|
||||||
|
question_id: &str,
|
||||||
|
timestamp_ms: i64,
|
||||||
|
) -> anyhow::Result<()> {
|
||||||
|
let store = match js.get_key_value(CHAIN_BUCKET).await {
|
||||||
|
Ok(store) => store,
|
||||||
|
Err(_) => {
|
||||||
|
js.create_key_value(async_nats::jetstream::kv::Config {
|
||||||
|
bucket: CHAIN_BUCKET.to_string(),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
.await?
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let node = ChainNode {
|
||||||
|
question_id: question_id.to_string(),
|
||||||
|
timestamp_ms,
|
||||||
|
};
|
||||||
|
store.put(chain_hash, serde_json::to_vec(&node)?.into()).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Looks a chain hash up - `None` covers both "no such node" and
|
||||||
|
/// "bucket not created yet" (no submissions anywhere), which read the
|
||||||
|
/// same to a `requires_chain` check: the claimed lineage can't be
|
||||||
|
/// verified, so the gate stays shut.
|
||||||
|
pub async fn lookup_node(
|
||||||
|
js: &async_nats::jetstream::Context,
|
||||||
|
chain_hash: &str,
|
||||||
|
) -> Option<ChainNode> {
|
||||||
|
let store = js.get_key_value(CHAIN_BUCKET).await.ok()?;
|
||||||
|
let bytes = store.get(chain_hash).await.ok()??;
|
||||||
|
serde_json::from_slice(&bytes).ok()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn hash_node(
|
pub fn hash_node(
|
||||||
question_id: &str,
|
question_id: &str,
|
||||||
parent_hashes: &[String],
|
parent_hashes: &[String],
|
||||||
|
|||||||
+1083
-71
File diff suppressed because it is too large
Load Diff
@@ -9,6 +9,9 @@ pub mod resource;
|
|||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
pub mod aggregates;
|
pub mod aggregates;
|
||||||
|
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub mod announce;
|
||||||
|
|
||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
pub mod server;
|
pub mod server;
|
||||||
|
|
||||||
|
|||||||
+29
-3
@@ -29,7 +29,10 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
.unwrap_or_else(|_| "https://project.uhhm.no/uhhm/questions".to_string());
|
.unwrap_or_else(|_| "https://project.uhhm.no/uhhm/questions".to_string());
|
||||||
let content_branch = std::env::var("CONTENT_BRANCH").unwrap_or_else(|_| "main".to_string());
|
let content_branch = std::env::var("CONTENT_BRANCH").unwrap_or_else(|_| "main".to_string());
|
||||||
let gitea_base = content::gitea_api_base(&content_repo)?;
|
let gitea_base = content::gitea_api_base(&content_repo)?;
|
||||||
let aggregates = content::load_aggregates_from_gitea(&content_repo, &content_branch).await?;
|
let content_raw_base = content::gitea_raw_base(&content_repo)?;
|
||||||
|
let aggregates = content::with_builtin_aggregates(
|
||||||
|
content::load_aggregates_from_gitea(&content_repo, &content_branch).await?,
|
||||||
|
);
|
||||||
let questions = content::load_questions_from_gitea(&content_repo, &content_branch, "questions").await?;
|
let questions = content::load_questions_from_gitea(&content_repo, &content_branch, "questions").await?;
|
||||||
content::validate_questions(&questions, &aggregates)?;
|
content::validate_questions(&questions, &aggregates)?;
|
||||||
let site = content::load_site_from_gitea(&content_repo, &content_branch).await?;
|
let site = content::load_site_from_gitea(&content_repo, &content_branch).await?;
|
||||||
@@ -67,7 +70,7 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
tokio::spawn(content::watch_for_reload(
|
tokio::spawn(content::watch_for_reload(
|
||||||
nats.clone(),
|
nats.clone(),
|
||||||
content_repo,
|
content_repo,
|
||||||
content_branch,
|
content_branch.clone(),
|
||||||
"questions".to_string(),
|
"questions".to_string(),
|
||||||
questions.clone(),
|
questions.clone(),
|
||||||
aggregates.clone(),
|
aggregates.clone(),
|
||||||
@@ -82,10 +85,16 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
aggregates,
|
aggregates,
|
||||||
site,
|
site,
|
||||||
gitea_base,
|
gitea_base,
|
||||||
|
content_raw_base,
|
||||||
|
content_branch: content_branch.clone(),
|
||||||
oidc: oidc_state,
|
oidc: oidc_state,
|
||||||
garage,
|
garage,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Announced pages: keep their desk records current, close ended
|
||||||
|
// windows (see announce.rs).
|
||||||
|
tokio::spawn(portal::announce::run(state.clone()));
|
||||||
|
|
||||||
// Dev-friendly defaults: in-memory sessions, secure cookies only when
|
// Dev-friendly defaults: in-memory sessions, secure cookies only when
|
||||||
// COOKIE_SECURE=true (set it behind TLS in production) - same
|
// COOKIE_SECURE=true (set it behind TLS in production) - same
|
||||||
// defaults cnats uses. SameSite=Lax (tower-sessions defaults to
|
// defaults cnats uses. SameSite=Lax (tower-sessions defaults to
|
||||||
@@ -138,8 +147,25 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
.route("/api/{*fn_name}", any(server_fn_handler))
|
.route("/api/{*fn_name}", any(server_fn_handler))
|
||||||
.route("/upload", post(upload::upload))
|
.route("/upload", post(upload::upload))
|
||||||
.route("/gitea-repo", get(content::gitea_repo_handler))
|
.route("/gitea-repo", get(content::gitea_repo_handler))
|
||||||
|
// Content-shipped assets (hero module etc.), same-origin.
|
||||||
|
.route("/site/{*path}", get(content::site_asset_handler))
|
||||||
.route("/automation/kv/{bucket}", get(content::automation_kv_handler))
|
.route("/automation/kv/{bucket}", get(content::automation_kv_handler))
|
||||||
.nest_service("/pkg", ServeDir::new(pkg_dir))
|
// no-cache = "revalidate before reuse", not "don't cache":
|
||||||
|
// pkg files keep the same names across releases (portal.js,
|
||||||
|
// portal.wasm), and without this browsers heuristically cache
|
||||||
|
// them - a stale wasm from the previous release then talks to
|
||||||
|
// a server whose server-fn wire format has moved on and every
|
||||||
|
// page renders as its error branch. A 304 per load is the
|
||||||
|
// price of never shipping that skew again.
|
||||||
|
.nest_service(
|
||||||
|
"/pkg",
|
||||||
|
tower::ServiceBuilder::new()
|
||||||
|
.layer(tower_http::set_header::SetResponseHeaderLayer::overriding(
|
||||||
|
axum::http::header::CACHE_CONTROL,
|
||||||
|
axum::http::HeaderValue::from_static("no-cache"),
|
||||||
|
))
|
||||||
|
.service(ServeDir::new(pkg_dir)),
|
||||||
|
)
|
||||||
.nest_service("/fonts", ServeDir::new(fonts_dir))
|
.nest_service("/fonts", ServeDir::new(fonts_dir))
|
||||||
.route_service("/favicon-light.svg", ServeFile::new(favicon_light_path))
|
.route_service("/favicon-light.svg", ServeFile::new(favicon_light_path))
|
||||||
.route_service("/favicon-dark.svg", ServeFile::new(favicon_dark_path))
|
.route_service("/favicon-dark.svg", ServeFile::new(favicon_dark_path))
|
||||||
|
|||||||
+6
-5
@@ -122,11 +122,12 @@ fn find_feature(
|
|||||||
alternative: &str,
|
alternative: &str,
|
||||||
feature_name: &str,
|
feature_name: &str,
|
||||||
) -> Result<crate::content::Feature, ServerFnError> {
|
) -> Result<crate::content::Feature, ServerFnError> {
|
||||||
let question = state
|
// resolve_question, not a plain map get: a dynamic page's client
|
||||||
.questions
|
// holds its concrete path as the question id, and resolution is
|
||||||
.load()
|
// also what substitutes the URL segment into the page's resource
|
||||||
.get(question_id)
|
// keys - so this lookup is where a `/review/<record>` page's
|
||||||
.cloned()
|
// feature acquires its record-specific key.
|
||||||
|
let question = crate::content::resolve_question(&state.questions.load(), question_id)
|
||||||
.ok_or_else(|| ServerFnError::new("unknown question"))?;
|
.ok_or_else(|| ServerFnError::new("unknown question"))?;
|
||||||
question
|
question
|
||||||
.alternatives
|
.alternatives
|
||||||
|
|||||||
@@ -38,6 +38,10 @@ pub struct AppState {
|
|||||||
/// rather than re-derived per call, since `resolve_gitea_repo` needs
|
/// rather than re-derived per call, since `resolve_gitea_repo` needs
|
||||||
/// it too and has no other reason to see `CONTENT_REPO` itself.
|
/// it too and has no other reason to see `CONTENT_REPO` itself.
|
||||||
pub gitea_base: String,
|
pub gitea_base: String,
|
||||||
|
/// `{gitea}/api/v1/repos/{owner}/{repo}/raw` and the branch - what
|
||||||
|
/// `content::site_asset_handler` proxies content-shipped assets from.
|
||||||
|
pub content_raw_base: String,
|
||||||
|
pub content_branch: String,
|
||||||
pub oidc: Arc<oidc::Oidc>,
|
pub oidc: Arc<oidc::Oidc>,
|
||||||
/// `None` when `GARAGE_*` env vars aren't set - uploads are the one
|
/// `None` when `GARAGE_*` env vars aren't set - uploads are the one
|
||||||
/// optional feature, everything else works without Garage.
|
/// optional feature, everything else works without Garage.
|
||||||
|
|||||||
+209
-87
@@ -51,7 +51,7 @@
|
|||||||
--ink-dim: #9a9a9a;
|
--ink-dim: #9a9a9a;
|
||||||
--line: #2a2a2a;
|
--line: #2a2a2a;
|
||||||
|
|
||||||
/* Cards float over the sticky YES canvas - translucent so the piece
|
/* Cards float over a sticky hero piece - translucent so the piece
|
||||||
reads faintly through them (paired with backdrop-filter on
|
reads faintly through them (paired with backdrop-filter on
|
||||||
.alt-card), shadowed so their edge against the animated backdrop
|
.alt-card), shadowed so their edge against the animated backdrop
|
||||||
is a soft lift rather than a hard contrast line. */
|
is a soft lift rather than a hard contrast line. */
|
||||||
@@ -78,8 +78,9 @@
|
|||||||
/* Light theme: the same muted-press idea on white stock - warm paper,
|
/* Light theme: the same muted-press idea on white stock - warm paper,
|
||||||
near-black ink, and the accent deepened from dusty cyan to a teal
|
near-black ink, and the accent deepened from dusty cyan to a teal
|
||||||
ink that actually carries as text on light paper (the dark theme's
|
ink that actually carries as text on light paper (the dark theme's
|
||||||
#8ec2c0 washes out there). yes.js mirrors this palette on its own
|
#8ec2c0 washes out there). Canvas-drawing modules (gesture.js, and
|
||||||
(matchMedia in setupTheme) since canvas paint can't read CSS vars. */
|
content-shipped hero modules) mirror this palette on their own,
|
||||||
|
since canvas paint can't read CSS vars. */
|
||||||
@media (prefers-color-scheme: light) {
|
@media (prefers-color-scheme: light) {
|
||||||
:root {
|
:root {
|
||||||
--accent: #47807e;
|
--accent: #47807e;
|
||||||
@@ -105,12 +106,6 @@
|
|||||||
filter: invert(0.92);
|
filter: invert(0.92);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* overlay against near-white paper resolves to ~white and the
|
|
||||||
raster ghost vanishes; multiply lets the light theme's gray YES
|
|
||||||
(see rasterizeText's themed repaint in yes.js) show as ink. */
|
|
||||||
.hero-canvas #rasterCanvas {
|
|
||||||
mix-blend-mode: multiply;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
* {
|
* {
|
||||||
@@ -200,91 +195,65 @@ main.not-found {
|
|||||||
max-width: 46ch;
|
max-width: 46ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* the actual "YES - Rasterized Lines" piece live at uhhm.no (see
|
/* A content-shipped hero module (site.yaml hero.kind: module) draws
|
||||||
public/yes.js) - landing page only. Full-viewport so it's a real
|
into .hero-piece; the module owns its look (it may restyle .hero
|
||||||
moment, not a thumbnail; hero-copy overlays near the bottom rather
|
itself). Portal only reserves the box so the copy doesn't jump when
|
||||||
than interrupting the canvas. */
|
the module mounts - plain-vh fallback first, as everywhere. */
|
||||||
|
.hero-module .hero-piece {
|
||||||
.hero-yes {
|
position: relative;
|
||||||
/* Sticky at the viewport top for the whole scroll (its containing
|
|
||||||
block is the page itself), so the piece stays animating behind
|
|
||||||
everything that follows - the translucent cards scroll over it
|
|
||||||
and it shows through them and in the gaps around them. z-index 0
|
|
||||||
so positioned content below can stack above with z-index 1. */
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
z-index: 0;
|
|
||||||
max-width: none;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
/* svh here is only the pre-JS/no-JS fallback (and first paint before
|
min-height: 55vh;
|
||||||
yes.js's constructor runs). Once yes.js mounts, it overwrites this
|
min-height: 55svh;
|
||||||
with an inline `height: <px>` frozen from a single measurement -
|
|
||||||
see setupCanvas()'s comment in yes.js for why: on real mobile
|
|
||||||
Safari, content bottom-aligned inside this box kept sliding down
|
|
||||||
as the address bar collapsed even with a spec'd-stable viewport
|
|
||||||
unit here, so the box's actual height can't be trusted to stay
|
|
||||||
put on that unit alone. An inline style set from JS always wins
|
|
||||||
the cascade over this rule, so that frozen number is what
|
|
||||||
actually governs once the page is interactive.
|
|
||||||
Plain-vh fallback declared first - an engine without svh support
|
|
||||||
ignores the invalid second line rather than falling through to
|
|
||||||
auto height, which would collapse this to the height of its
|
|
||||||
in-flow content and clip the canvas via overflow:hidden below. */
|
|
||||||
height: 100vh;
|
|
||||||
height: 100svh;
|
|
||||||
padding: 0;
|
|
||||||
justify-content: flex-end;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-canvas {
|
/* announcements - live event pages, a strip above the hero copy.
|
||||||
position: absolute;
|
Header, not footer: the one place a page claims attention before
|
||||||
inset: 0;
|
the question is asked. */
|
||||||
}
|
.announce {
|
||||||
|
width: 100%;
|
||||||
.hero-canvas canvas {
|
display: flex;
|
||||||
position: absolute;
|
flex-wrap: wrap;
|
||||||
top: 0;
|
justify-content: center;
|
||||||
left: 0;
|
gap: 0.6rem 1.2rem;
|
||||||
cursor: pointer;
|
margin: -2rem 0 0.5rem;
|
||||||
}
|
font-size: 0.88rem;
|
||||||
|
|
||||||
.hero-canvas #rasterCanvas {
|
|
||||||
mix-blend-mode: overlay;
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hero-yes .hero-copy {
|
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
padding: 0 1.5rem 3.5rem;
|
|
||||||
gap: 0.6rem;
|
|
||||||
text-shadow: 0 0.12em 1.4em var(--hero-glow);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The gesture hero (site.yaml hero.kind: gesture - redoal.com's
|
.announce-item {
|
||||||
landing): a tall drawing surface where the visitor's stroke and
|
display: inline-flex;
|
||||||
ambient echoes from the relay share the stage. Not sticky like the
|
flex-wrap: wrap;
|
||||||
YES piece - drawing and scrolling fight over the same finger. */
|
align-items: baseline;
|
||||||
.hero-gesture .hero-draw {
|
gap: 0.35rem 0.7rem;
|
||||||
position: relative;
|
padding: 0.45rem 0.9rem;
|
||||||
width: 100%;
|
border: 0.06rem solid var(--line);
|
||||||
max-width: 46rem;
|
border-left: 0.2rem solid var(--accent);
|
||||||
|
border-radius: 0.3rem;
|
||||||
|
color: var(--ink);
|
||||||
|
text-decoration: none;
|
||||||
|
background: var(--paper);
|
||||||
|
transition: border-color 120ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-gesture .gesture-canvas {
|
.announce-item:hover,
|
||||||
aspect-ratio: auto;
|
.announce-item[aria-current="page"] {
|
||||||
/* Plain-vh fallback first, same reasoning as .hero-yes's height. */
|
border-color: var(--accent);
|
||||||
height: 55vh;
|
|
||||||
height: 55svh;
|
|
||||||
border: none;
|
|
||||||
background: transparent;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-gesture .gesture-status {
|
.announce-name {
|
||||||
top: auto;
|
font-weight: 600;
|
||||||
bottom: 0.55rem;
|
}
|
||||||
right: 0.55rem;
|
|
||||||
|
.announce-when {
|
||||||
|
color: var(--ink-dim);
|
||||||
|
}
|
||||||
|
|
||||||
|
.announce-relative {
|
||||||
|
color: var(--accent);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
font-size: 0.72rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* alternatives */
|
/* alternatives */
|
||||||
@@ -461,10 +430,9 @@ main.not-found {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.feature-icon {
|
.feature-icon {
|
||||||
float: left;
|
|
||||||
width: 1.3rem;
|
width: 1.3rem;
|
||||||
height: 1.3rem;
|
height: 1.3rem;
|
||||||
margin: 0.1rem 0.6rem 0.4rem 0;
|
margin-top: 0.1rem;
|
||||||
background-color: var(--feature-accent, currentColor);
|
background-color: var(--feature-accent, currentColor);
|
||||||
mask-repeat: no-repeat;
|
mask-repeat: no-repeat;
|
||||||
mask-size: contain;
|
mask-size: contain;
|
||||||
@@ -474,11 +442,105 @@ main.not-found {
|
|||||||
-webkit-mask-position: center;
|
-webkit-mask-position: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* With an icon the feature is two columns: the icon in the first,
|
||||||
|
everything else - name, description, fields, resources - in the
|
||||||
|
second, so every line of text shares one left edge instead of
|
||||||
|
wrapping back under the icon. */
|
||||||
|
.feature:has(> .feature-icon) {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1.3rem minmax(0, 1fr);
|
||||||
|
column-gap: 0.7rem;
|
||||||
|
align-items: start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.feature:has(> .feature-icon) > .feature-icon {
|
||||||
|
grid-column: 1;
|
||||||
|
grid-row: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.feature:has(> .feature-icon) > :not(.feature-icon) {
|
||||||
|
grid-column: 2;
|
||||||
|
}
|
||||||
|
|
||||||
.feature h3 {
|
.feature h3 {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
margin-bottom: 0.15em;
|
margin-bottom: 0.15em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* voice field (voice.js): a record button, a status line, a preview */
|
||||||
|
.voice-wrap {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.6rem 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-button {
|
||||||
|
font: inherit;
|
||||||
|
padding: 0.55rem 1.1rem;
|
||||||
|
border: 0.06rem solid var(--accent);
|
||||||
|
border-radius: 2rem;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--ink);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-button:hover:not(:disabled) {
|
||||||
|
background: var(--accent);
|
||||||
|
color: var(--paper);
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-button.recording {
|
||||||
|
background: var(--accent);
|
||||||
|
color: var(--paper);
|
||||||
|
animation: voice-pulse 1.2s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-button:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes voice-pulse {
|
||||||
|
50% { opacity: 0.6; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-status {
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: var(--ink-dim);
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-preview,
|
||||||
|
.item-card-audio {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 28rem;
|
||||||
|
margin-top: 0.4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* display:block above would beat the hidden attribute */
|
||||||
|
.voice-preview[hidden] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* links inside markdown descriptions */
|
||||||
|
.alt-description a,
|
||||||
|
.feature p a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
border-bottom: 0.06rem solid var(--accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.alt-description a:hover,
|
||||||
|
.feature p a:hover {
|
||||||
|
color: var(--accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.alt-description code,
|
||||||
|
.feature p code {
|
||||||
|
font-size: 0.9em;
|
||||||
|
}
|
||||||
|
|
||||||
.feature p {
|
.feature p {
|
||||||
color: var(--ink-dim);
|
color: var(--ink-dim);
|
||||||
font-size: 0.95rem;
|
font-size: 0.95rem;
|
||||||
@@ -559,6 +621,17 @@ textarea:focus {
|
|||||||
custom properties - so palette changes go there AND here. */
|
custom properties - so palette changes go there AND here. */
|
||||||
.gesture-wrap {
|
.gesture-wrap {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The canvas is created by JS only after wasm hydration - reserve its
|
||||||
|
3/2 box until then so content below doesn't jump. Scoped to :empty
|
||||||
|
on purpose: on the mounted wrap (a stretched item inside the flex
|
||||||
|
.field) the same aspect-ratio turned the echo strip's extra height
|
||||||
|
into extra WIDTH and the whole card ballooned past the viewport
|
||||||
|
after the first stroke. */
|
||||||
|
.gesture-wrap:empty {
|
||||||
|
aspect-ratio: 3 / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gesture-canvas {
|
.gesture-canvas {
|
||||||
@@ -574,11 +647,17 @@ textarea:focus {
|
|||||||
touch-action: none;
|
touch-action: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Results overlay the canvas instead of growing the widget - the
|
||||||
|
page never jumps when places arrive (or don't). */
|
||||||
.gesture-echoes {
|
.gesture-echoes {
|
||||||
|
position: absolute;
|
||||||
|
left: 0.6rem;
|
||||||
|
right: 0.6rem;
|
||||||
|
bottom: 0.6rem;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
margin-top: 0.5rem;
|
pointer-events: none;
|
||||||
min-height: 3rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.gesture-echoes:empty {
|
.gesture-echoes:empty {
|
||||||
@@ -593,12 +672,48 @@ textarea:focus {
|
|||||||
border-radius: 0.4rem;
|
border-radius: 0.4rem;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 0.5s ease;
|
transition: opacity 0.5s ease;
|
||||||
|
pointer-events: auto;
|
||||||
|
box-shadow: 0 0.15rem 0.6rem rgba(0, 0, 0, 0.18);
|
||||||
}
|
}
|
||||||
|
|
||||||
.gesture-echo.shown {
|
.gesture-echo.shown {
|
||||||
opacity: var(--echo-strength, 1);
|
opacity: var(--echo-strength, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* places are pickable: the pick re-derives the input's key */
|
||||||
|
.gesture-echo {
|
||||||
|
cursor: pointer;
|
||||||
|
transition: opacity 0.5s ease, border-color 120ms, transform 120ms;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gesture-echo:hover,
|
||||||
|
.gesture-echo:focus-visible {
|
||||||
|
border-color: var(--accent);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gesture-echo.selected {
|
||||||
|
border-color: var(--accent);
|
||||||
|
box-shadow: 0 0 0 0.12rem var(--accent);
|
||||||
|
transform: translateY(-0.1rem);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gesture-empty {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0.7rem;
|
||||||
|
margin: 0;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: var(--ink-dim);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gesture-empty:empty {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.gesture-status {
|
.gesture-status {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0.55rem;
|
top: 0.55rem;
|
||||||
@@ -745,6 +860,13 @@ textarea:focus {
|
|||||||
cursor: wait;
|
cursor: wait;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* A content-disabled alternative (`disabled: true`): announced, not
|
||||||
|
yet takeable - reads as a promise, not as a stuck form. */
|
||||||
|
.alt-submit.soon:disabled {
|
||||||
|
cursor: not-allowed;
|
||||||
|
opacity: 0.6;
|
||||||
|
}
|
||||||
|
|
||||||
.gate-card {
|
.gate-card {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,205 @@
|
|||||||
|
// A `type: voice` requirement: leave a recording at a gesture key.
|
||||||
|
// Same contract as gesture.js - portal mounts it with the field's
|
||||||
|
// hidden input and the relay URL, and calls stop() on navigation.
|
||||||
|
//
|
||||||
|
// The browser records with MediaRecorder (whatever container it
|
||||||
|
// likes), decodes that to PCM with WebAudio, resamples to mono 48 kHz,
|
||||||
|
// and ships one binary frame `[0x01][20-byte key][i16le PCM]` to the
|
||||||
|
// relay, which encodes with the one recording codec, signs as itself,
|
||||||
|
// keeps it and announces it (ADR-0015).
|
||||||
|
//
|
||||||
|
// Nothing leaves the browser until the alternative's own submit
|
||||||
|
// ("Keep it here") is pressed: the widget intercepts that click,
|
||||||
|
// uploads, sets the field's value to {key, digest, duration_ms} on
|
||||||
|
// the relay's confirmation, and only then lets the submit through.
|
||||||
|
// A relay error keeps the recording for another try and submits
|
||||||
|
// nothing.
|
||||||
|
//
|
||||||
|
// Palette: colors come from the page's custom properties, no copy here.
|
||||||
|
|
||||||
|
const MAX_SECONDS = 60;
|
||||||
|
const SAMPLE_RATE = 48000;
|
||||||
|
|
||||||
|
class VoiceWidget {
|
||||||
|
constructor(container, hidden, relayUrl, key) {
|
||||||
|
this.container = container;
|
||||||
|
this.hidden = hidden || null;
|
||||||
|
this.relayUrl = relayUrl || '';
|
||||||
|
this.key = (key || '').trim();
|
||||||
|
this.stopped = false;
|
||||||
|
this.recorder = null;
|
||||||
|
this.stream = null;
|
||||||
|
this.chunks = [];
|
||||||
|
this.ws = null;
|
||||||
|
|
||||||
|
this.button = document.createElement('button');
|
||||||
|
this.button.type = 'button';
|
||||||
|
this.button.className = 'voice-button';
|
||||||
|
this.button.textContent = 'Record';
|
||||||
|
this.status = document.createElement('span');
|
||||||
|
this.status.className = 'voice-status';
|
||||||
|
this.preview = document.createElement('audio');
|
||||||
|
this.preview.className = 'voice-preview';
|
||||||
|
this.preview.controls = true;
|
||||||
|
this.preview.hidden = true;
|
||||||
|
container.append(this.button, this.status, this.preview);
|
||||||
|
|
||||||
|
this._onClick = () => this.toggle();
|
||||||
|
this.button.addEventListener('click', this._onClick);
|
||||||
|
this.pcm = null; // decoded, ready to upload
|
||||||
|
this.published = null;
|
||||||
|
this.passthrough = false;
|
||||||
|
// The alternative's submit button: hold it until the recording
|
||||||
|
// is kept at the relay.
|
||||||
|
this.card = container.closest('.alt-card');
|
||||||
|
this._onSubmit = (e) => this.onSubmitClick(e);
|
||||||
|
if (this.card) this.card.addEventListener('click', this._onSubmit, true);
|
||||||
|
if (!this.key || this.key.length !== 40) {
|
||||||
|
this.button.disabled = true;
|
||||||
|
this.say('This page has no address to leave a voice at.');
|
||||||
|
} else if (!navigator.mediaDevices || !window.MediaRecorder) {
|
||||||
|
this.button.disabled = true;
|
||||||
|
this.say('Recording needs a browser with a microphone API.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
say(text) {
|
||||||
|
this.status.textContent = text;
|
||||||
|
}
|
||||||
|
|
||||||
|
async toggle() {
|
||||||
|
if (this.recorder && this.recorder.state === 'recording') {
|
||||||
|
this.recorder.stop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
this.stream = await navigator.mediaDevices.getUserMedia({ audio: true });
|
||||||
|
} catch {
|
||||||
|
this.say('Microphone access was declined.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.chunks = [];
|
||||||
|
this.recorder = new MediaRecorder(this.stream);
|
||||||
|
this.recorder.addEventListener('dataavailable', (e) => { if (e.data.size) this.chunks.push(e.data); });
|
||||||
|
this.recorder.addEventListener('stop', () => this.finish());
|
||||||
|
this.recorder.start();
|
||||||
|
this.button.textContent = 'Stop';
|
||||||
|
this.button.classList.add('recording');
|
||||||
|
this.say(`Recording — up to ${MAX_SECONDS} seconds.`);
|
||||||
|
this.capTimer = setTimeout(() => { if (this.recorder && this.recorder.state === 'recording') this.recorder.stop(); }, MAX_SECONDS * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
async finish() {
|
||||||
|
clearTimeout(this.capTimer);
|
||||||
|
this.button.textContent = 'Record again';
|
||||||
|
this.button.classList.remove('recording');
|
||||||
|
if (this.stream) { this.stream.getTracks().forEach((t) => t.stop()); this.stream = null; }
|
||||||
|
const blob = new Blob(this.chunks, { type: this.recorder.mimeType || 'audio/webm' });
|
||||||
|
if (!blob.size) { this.say('Nothing was recorded.'); return; }
|
||||||
|
this.preview.src = URL.createObjectURL(blob);
|
||||||
|
this.preview.hidden = false;
|
||||||
|
this.published = null;
|
||||||
|
this.setValue(null);
|
||||||
|
try {
|
||||||
|
this.pcm = await this.toPcm16(await blob.arrayBuffer());
|
||||||
|
} catch (e) {
|
||||||
|
this.pcm = null;
|
||||||
|
this.say('Could not decode the recording — try once more.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.say(`${Math.round(this.pcm.length / 2 / SAMPLE_RATE)} s recorded. Listen back, then press the button below to keep it here.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmitClick(e) {
|
||||||
|
const button = e.target.closest && e.target.closest('.alt-submit');
|
||||||
|
if (!button || this.passthrough) return;
|
||||||
|
if (this.published) return; // already kept: let the submit go
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
if (!this.pcm) {
|
||||||
|
this.say(this.recorder && this.recorder.state === 'recording' ? 'Stop the recording first.' : 'Record something first.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.say('Sending to the relay…');
|
||||||
|
this.upload(this.pcm, () => {
|
||||||
|
// The relay confirmed: now the answer itself is submitted.
|
||||||
|
this.passthrough = true;
|
||||||
|
button.click();
|
||||||
|
this.passthrough = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decode → mono 48 kHz Float32 → Int16 little-endian bytes.
|
||||||
|
async toPcm16(buffer) {
|
||||||
|
const ctx = new (window.AudioContext || window.webkitAudioContext)();
|
||||||
|
const decoded = await ctx.decodeAudioData(buffer);
|
||||||
|
await ctx.close();
|
||||||
|
const frames = Math.ceil(decoded.duration * SAMPLE_RATE);
|
||||||
|
const offline = new OfflineAudioContext(1, frames, SAMPLE_RATE);
|
||||||
|
const src = offline.createBufferSource();
|
||||||
|
src.buffer = decoded;
|
||||||
|
src.connect(offline.destination);
|
||||||
|
src.start();
|
||||||
|
const rendered = await offline.startRendering();
|
||||||
|
const f32 = rendered.getChannelData(0);
|
||||||
|
const out = new Uint8Array(f32.length * 2);
|
||||||
|
const view = new DataView(out.buffer);
|
||||||
|
for (let i = 0; i < f32.length; i++) {
|
||||||
|
const s = Math.max(-1, Math.min(1, f32[i]));
|
||||||
|
view.setInt16(i * 2, s < 0 ? s * 32768 : s * 32767, true);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
upload(pcm, onPublished) {
|
||||||
|
if (!this.relayUrl) { this.say('No relay to send to.'); return; }
|
||||||
|
const frame = new Uint8Array(1 + 20 + pcm.length);
|
||||||
|
frame[0] = 1;
|
||||||
|
for (let i = 0; i < 20; i++) frame[1 + i] = parseInt(this.key.substr(i * 2, 2), 16);
|
||||||
|
frame.set(pcm, 21);
|
||||||
|
const ws = new WebSocket(this.relayUrl);
|
||||||
|
ws.binaryType = 'arraybuffer';
|
||||||
|
this.ws = ws;
|
||||||
|
ws.addEventListener('open', () => ws.send(frame));
|
||||||
|
ws.addEventListener('message', (e) => {
|
||||||
|
let msg; try { msg = JSON.parse(e.data); } catch { return; }
|
||||||
|
if (msg.type === 'published') {
|
||||||
|
this.published = { key: this.key, digest: msg.digest, duration_ms: msg.duration_ms };
|
||||||
|
this.setValue(this.published);
|
||||||
|
this.say(`Kept at this address — ${Math.round(msg.duration_ms / 1000)} s.`);
|
||||||
|
this.button.disabled = true;
|
||||||
|
ws.close();
|
||||||
|
if (onPublished) onPublished();
|
||||||
|
} else if (msg.type === 'error') {
|
||||||
|
this.say((msg.message || 'The relay declined the recording.') + ' Your recording is still here — try again.');
|
||||||
|
ws.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
ws.addEventListener('error', () => this.say('The relay could not be reached. Your recording is still here — try again.'));
|
||||||
|
ws.addEventListener('close', (e) => {
|
||||||
|
if (!this.published && e.code !== 1000 && e.code !== 1005) {
|
||||||
|
this.say('The relay closed the connection. Your recording is still here — try again.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
setValue(value) {
|
||||||
|
if (!this.hidden) return;
|
||||||
|
this.hidden.value = value ? JSON.stringify(value) : '';
|
||||||
|
this.hidden.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
this.stopped = true;
|
||||||
|
clearTimeout(this.capTimer);
|
||||||
|
if (this.recorder && this.recorder.state === 'recording') this.recorder.stop();
|
||||||
|
if (this.stream) this.stream.getTracks().forEach((t) => t.stop());
|
||||||
|
if (this.ws) this.ws.close();
|
||||||
|
this.button.removeEventListener('click', this._onClick);
|
||||||
|
if (this.card) this.card.removeEventListener('click', this._onSubmit, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function mountVoice(container, hidden, relayUrl, key) {
|
||||||
|
return new VoiceWidget(container, hidden, relayUrl, key);
|
||||||
|
}
|
||||||
@@ -1,578 +0,0 @@
|
|||||||
// Ported from ~/repos/webpage/content/visualize/ah.html ("YES - Rasterized
|
|
||||||
// Lines"), the piece currently live at uhhm.no - kept as the actual asset,
|
|
||||||
// not reinvented. Two changes from the original: exported as a class (no
|
|
||||||
// auto-init on `window load`, since Leptos controls when this mounts) and
|
|
||||||
// a `stop()` method that actually breaks the requestAnimationFrame loop -
|
|
||||||
// the original ran forever once started, fine for a static page that's
|
|
||||||
// the whole document, not fine in an SPA where this hero mounts/unmounts
|
|
||||||
// as you navigate.
|
|
||||||
|
|
||||||
export class RasterizedYES {
|
|
||||||
constructor() {
|
|
||||||
this.rasterCanvas = document.getElementById('rasterCanvas');
|
|
||||||
this.lineCanvas = document.getElementById('lineCanvas');
|
|
||||||
|
|
||||||
// The Rust side only constructs this once it's confirmed (via a
|
|
||||||
// NodeRef) that the canvas is mounted, but that guard has shown
|
|
||||||
// a real gap on fast client-side re-navigation back to `/` -
|
|
||||||
// this is the actual failure point, so it gets its own defense
|
|
||||||
// rather than depending on getting that timing exactly right
|
|
||||||
// from the other side of the wasm boundary. Leaving the
|
|
||||||
// instance otherwise-inert (no crash, no animation) rather than
|
|
||||||
// throwing mid-render - `stop()` already tolerates a partially
|
|
||||||
// (non-)initialized instance.
|
|
||||||
if (!this.rasterCanvas || !this.lineCanvas) {
|
|
||||||
console.warn('RasterizedYES: canvas not in DOM yet, skipping');
|
|
||||||
this.destroyed = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.rasterCtx = this.rasterCanvas.getContext('2d');
|
|
||||||
this.lineCtx = this.lineCanvas.getContext('2d');
|
|
||||||
|
|
||||||
this.lines = [];
|
|
||||||
this.rasterData = null;
|
|
||||||
this.isActive = true;
|
|
||||||
this.destroyed = false;
|
|
||||||
this.time = 0;
|
|
||||||
|
|
||||||
this.containmentStrength = 0.5;
|
|
||||||
this.wiggleAmount = 0.5;
|
|
||||||
|
|
||||||
// .hero-canvas is inset:0 inside this - freezing an inline
|
|
||||||
// height here (below) is what actually locks the box, not
|
|
||||||
// just reading its rect.
|
|
||||||
this.heroEl = this.rasterCanvas.closest('.hero');
|
|
||||||
|
|
||||||
this.setupCanvas();
|
|
||||||
this.setupResizeHandler();
|
|
||||||
this.setupDrift();
|
|
||||||
this.setupTheme();
|
|
||||||
this.setupScrollFade();
|
|
||||||
this.setupClickHandler();
|
|
||||||
this.rasterizeText();
|
|
||||||
this.initializeLines();
|
|
||||||
this.animate();
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
this.destroyed = true;
|
|
||||||
if (this._resizeHandler) {
|
|
||||||
window.removeEventListener('resize', this._resizeHandler);
|
|
||||||
}
|
|
||||||
if (this._themeQuery) {
|
|
||||||
this._themeQuery.removeEventListener('change', this._themeHandler);
|
|
||||||
}
|
|
||||||
if (this._scrollHandler) {
|
|
||||||
window.removeEventListener('scroll', this._scrollHandler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The hero is position: sticky (main.css), so without this the
|
|
||||||
// title/wordmark stay pinned at the viewport bottom for the whole
|
|
||||||
// page and ghost through the translucent cards scrolling over
|
|
||||||
// them. Fade the copy out across the first half-screen of scroll;
|
|
||||||
// visibility: hidden at the end so the wordmark link can't be
|
|
||||||
// clicked while invisible.
|
|
||||||
setupScrollFade() {
|
|
||||||
this.heroCopy = this.heroEl ? this.heroEl.querySelector('.hero-copy') : null;
|
|
||||||
if (!this.heroCopy) return;
|
|
||||||
this._scrollHandler = () => {
|
|
||||||
const opacity = Math.max(0, 1 - window.scrollY / (this.displayHeight * 0.5));
|
|
||||||
this.heroCopy.style.opacity = opacity;
|
|
||||||
this.heroCopy.style.visibility = opacity <= 0.01 ? 'hidden' : '';
|
|
||||||
};
|
|
||||||
window.addEventListener('scroll', this._scrollHandler, { passive: true });
|
|
||||||
this._scrollHandler();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Canvas paint can't read CSS custom properties, so the piece
|
|
||||||
// carries its own copy of both palettes and follows
|
|
||||||
// prefers-color-scheme itself - values must track main.css's :root
|
|
||||||
// (--paper especially: the fade fill IS the page background where
|
|
||||||
// the canvas shows through translucent cards). Dark keeps the
|
|
||||||
// original neon-on-black inks; light restates them as CMYK process
|
|
||||||
// inks dark enough to carry on paper, since 80%-lightness pastels
|
|
||||||
// vanish on white.
|
|
||||||
setupTheme() {
|
|
||||||
this._themeQuery = window.matchMedia('(prefers-color-scheme: light)');
|
|
||||||
this._themeHandler = () => {
|
|
||||||
this.applyTheme();
|
|
||||||
// Repaint the raster ghost in the new theme's ink and
|
|
||||||
// hard-clear the trails - a slow 3%-alpha fade from the
|
|
||||||
// old paper color would smear across the flip otherwise.
|
|
||||||
this.rasterizeText();
|
|
||||||
this.lineCtx.fillStyle = this.theme.paper;
|
|
||||||
this.lineCtx.fillRect(0, 0, this.displayWidth, this.displayHeight);
|
|
||||||
};
|
|
||||||
this._themeQuery.addEventListener('change', this._themeHandler);
|
|
||||||
this.applyTheme();
|
|
||||||
}
|
|
||||||
|
|
||||||
applyTheme() {
|
|
||||||
this.theme = this._themeQuery.matches
|
|
||||||
? {
|
|
||||||
paper: '#f6f5f1',
|
|
||||||
fade: 'rgba(246, 245, 241, 0.03)',
|
|
||||||
// White ground so multiply (the light theme's CSS
|
|
||||||
// blend mode for #rasterCanvas) leaves the paper
|
|
||||||
// untouched; gray ink becomes the faint YES ghost.
|
|
||||||
rasterBg: '#ffffff',
|
|
||||||
rasterInk: '#6b6b6b',
|
|
||||||
strokes: [
|
|
||||||
'hsla(185, 70%, 32%, 0.85)',
|
|
||||||
'hsla(315, 60%, 38%, 0.85)',
|
|
||||||
'hsla(50, 90%, 40%, 0.85)'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
: {
|
|
||||||
paper: '#0a0a0a',
|
|
||||||
fade: 'rgba(10, 10, 10, 0.03)',
|
|
||||||
rasterBg: '#111111',
|
|
||||||
rasterInk: '#ffffff',
|
|
||||||
strokes: [
|
|
||||||
'hsla(180, 90%, 80%, 0.8)',
|
|
||||||
'hsla(300, 90%, 80%, 0.8)',
|
|
||||||
'hsla(60, 90%, 80%, 0.8)'
|
|
||||||
]
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reading .hero-canvas's rendered rect (a prior attempt at this)
|
|
||||||
// only helps if that rect actually stays put - and on real mobile
|
|
||||||
// Safari it didn't: .hero-copy (bottom-aligned via flexbox inside
|
|
||||||
// .hero-yes) kept sliding down as the address bar collapsed, even
|
|
||||||
// with a spec'd-stable viewport unit (svh, then lvh) driving the
|
|
||||||
// box's height. Either the browser isn't holding up its end, or
|
|
||||||
// something in the cascade is still landing on a live value - not
|
|
||||||
// provable from here without the device. Rather than keep
|
|
||||||
// guessing at which CSS viewport unit actually holds still, yes.js
|
|
||||||
// becomes the source of truth instead: it freezes .hero-yes's
|
|
||||||
// rendered height to a literal inline px value once, up front. An
|
|
||||||
// inline style always wins the cascade over the stylesheet's
|
|
||||||
// `height: 100svh`, so once this runs, nothing the browser does
|
|
||||||
// with that unit afterward can move the box - the number is fixed
|
|
||||||
// in the DOM, not recomputed from a unit at all.
|
|
||||||
setupCanvas() {
|
|
||||||
const pixelRatio = window.devicePixelRatio || 1;
|
|
||||||
const width = window.innerWidth;
|
|
||||||
const height = window.innerHeight;
|
|
||||||
|
|
||||||
if (this.heroEl) {
|
|
||||||
this.heroEl.style.height = height + 'px';
|
|
||||||
}
|
|
||||||
|
|
||||||
this.rasterCanvas.style.width = width + 'px';
|
|
||||||
this.rasterCanvas.style.height = height + 'px';
|
|
||||||
this.lineCanvas.style.width = width + 'px';
|
|
||||||
this.lineCanvas.style.height = height + 'px';
|
|
||||||
|
|
||||||
this.rasterCanvas.width = width * pixelRatio;
|
|
||||||
this.rasterCanvas.height = height * pixelRatio;
|
|
||||||
this.lineCanvas.width = width * pixelRatio;
|
|
||||||
this.lineCanvas.height = height * pixelRatio;
|
|
||||||
|
|
||||||
this.rasterCtx.scale(pixelRatio, pixelRatio);
|
|
||||||
this.lineCtx.scale(pixelRatio, pixelRatio);
|
|
||||||
|
|
||||||
this.displayWidth = width;
|
|
||||||
this.displayHeight = height;
|
|
||||||
this.pixelRatio = pixelRatio;
|
|
||||||
}
|
|
||||||
|
|
||||||
setupResizeHandler() {
|
|
||||||
// Gate on width, not height: mobile Safari's address-bar
|
|
||||||
// animation changes window.innerHeight continuously with no
|
|
||||||
// real layout change to react to (that's the live value this
|
|
||||||
// whole method exists to stop trusting). A genuine resize -
|
|
||||||
// orientation change, desktop window drag - always changes
|
|
||||||
// width too, so that's the real signal to re-freeze on.
|
|
||||||
this._resizeHandler = () => {
|
|
||||||
if (window.innerWidth === this.displayWidth) return;
|
|
||||||
this.setupCanvas();
|
|
||||||
this.rasterizeText();
|
|
||||||
};
|
|
||||||
window.addEventListener('resize', this._resizeHandler);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The two behavior dials (containmentStrength from x, wiggleAmount
|
|
||||||
// from y) used to follow the pointer. Now a smooth noise field
|
|
||||||
// wanders them instead - the same 0..1 inputs a mouse would give,
|
|
||||||
// but drifting at cloud pace, so the piece breathes on its own and
|
|
||||||
// behaves identically with nobody touching it (which on a landing
|
|
||||||
// hero is most of the time, and on touch devices was always the
|
|
||||||
// case between taps). Value noise with two octaves: smooth
|
|
||||||
// (C1-continuous via smoothstep), never repeats visibly, no jumps.
|
|
||||||
setupDrift() {
|
|
||||||
const channel = (seed) => {
|
|
||||||
const rand = (i) => {
|
|
||||||
let h = Math.imul(i ^ seed, 2654435761) >>> 0;
|
|
||||||
h ^= h >>> 13;
|
|
||||||
h = Math.imul(h, 0x5bd1e995) >>> 0;
|
|
||||||
// The >>> 0 here is load-bearing: ^ yields a SIGNED
|
|
||||||
// 32-bit value, and without the reinterpret a set top
|
|
||||||
// bit made this "0..1" noise go as low as -0.5,
|
|
||||||
// pushing both dials below their intended floors.
|
|
||||||
h = (h ^ (h >>> 15)) >>> 0;
|
|
||||||
return h / 4294967296;
|
|
||||||
};
|
|
||||||
const noise = (t) => {
|
|
||||||
const i = Math.floor(t);
|
|
||||||
const f = t - i;
|
|
||||||
const s = f * f * (3 - 2 * f);
|
|
||||||
return rand(i) * (1 - s) + rand(i + 1) * s;
|
|
||||||
};
|
|
||||||
// Two octaves, renormalized to 0..1: the slow octave sets
|
|
||||||
// the overall weather, the faster one keeps it from
|
|
||||||
// feeling like a pendulum.
|
|
||||||
return (t) => (noise(t) * 2 / 3 + noise(t * 2.7 + 913) * 1 / 3);
|
|
||||||
};
|
|
||||||
|
|
||||||
// One full "weather change" roughly every DRIFT_PERIOD
|
|
||||||
// seconds per octave - the pace of watching clouds, not of a
|
|
||||||
// hand on a mouse.
|
|
||||||
this.driftPeriod = 25;
|
|
||||||
this.driftX = channel(0x9e3779b9);
|
|
||||||
this.driftY = channel(0x85ebca6b);
|
|
||||||
|
|
||||||
this.containmentStrength = 0.55;
|
|
||||||
this.wiggleAmount = 1.05;
|
|
||||||
}
|
|
||||||
|
|
||||||
updateDrift() {
|
|
||||||
const t = this.time / this.driftPeriod;
|
|
||||||
const x = this.driftX(t);
|
|
||||||
const y = this.driftY(t);
|
|
||||||
// Same mapping the mouse position used to feed.
|
|
||||||
this.containmentStrength = 0.1 + (x * 0.9);
|
|
||||||
this.wiggleAmount = 0.1 + (y * 1.9);
|
|
||||||
}
|
|
||||||
|
|
||||||
setupClickHandler() {
|
|
||||||
this.lineCanvas.addEventListener('click', () => {
|
|
||||||
this.restartAnimation();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
restartAnimation() {
|
|
||||||
this.time = 0;
|
|
||||||
this.lineCtx.fillStyle = this.theme.paper;
|
|
||||||
this.lineCtx.fillRect(0, 0, this.displayWidth, this.displayHeight);
|
|
||||||
this.initializeLines();
|
|
||||||
this.isActive = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
rasterizeText() {
|
|
||||||
const width = this.displayWidth;
|
|
||||||
const height = this.displayHeight;
|
|
||||||
|
|
||||||
const aspectRatio = width / height;
|
|
||||||
let fontSize;
|
|
||||||
if (aspectRatio < 1) {
|
|
||||||
fontSize = width * 0.4;
|
|
||||||
} else {
|
|
||||||
fontSize = height * 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.fontSize = fontSize;
|
|
||||||
|
|
||||||
this.rasterCtx.font = `bold ${fontSize}px Arial, sans-serif`;
|
|
||||||
this.rasterCtx.textAlign = 'left';
|
|
||||||
this.rasterCtx.textBaseline = 'middle';
|
|
||||||
|
|
||||||
const fullTextMetrics = this.rasterCtx.measureText('YES');
|
|
||||||
const textWidth = fullTextMetrics.width;
|
|
||||||
const textStartX = (width - textWidth) / 2;
|
|
||||||
const textY = height / 2;
|
|
||||||
|
|
||||||
const letters = ['Y', 'E', 'S'];
|
|
||||||
this.letterPositions = [];
|
|
||||||
let currentX = textStartX;
|
|
||||||
|
|
||||||
for (let i = 0; i < letters.length; i++) {
|
|
||||||
const letterMetrics = this.rasterCtx.measureText(letters[i]);
|
|
||||||
this.letterPositions[i] = {
|
|
||||||
x: currentX,
|
|
||||||
y: textY,
|
|
||||||
width: letterMetrics.width,
|
|
||||||
centerX: currentX + letterMetrics.width / 2
|
|
||||||
};
|
|
||||||
currentX += letterMetrics.width;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.letterRasters = [];
|
|
||||||
|
|
||||||
for (let i = 0; i < 3; i++) {
|
|
||||||
this.rasterCtx.fillStyle = '#111';
|
|
||||||
this.rasterCtx.fillRect(0, 0, width, height);
|
|
||||||
|
|
||||||
this.rasterCtx.fillStyle = '#ffffff';
|
|
||||||
this.rasterCtx.fillText(letters[i], this.letterPositions[i].x, this.letterPositions[i].y);
|
|
||||||
|
|
||||||
this.letterRasters[i] = this.rasterCtx.getImageData(0, 0, this.rasterCanvas.width, this.rasterCanvas.height);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The visible layer, distinct from the letterRasters sampled
|
|
||||||
// above (those stay #111/#fff - isInSpecificLetter's red>128
|
|
||||||
// test depends on it): painted in theme ink so the ghost works
|
|
||||||
// under the theme's blend mode (overlay on dark, multiply on
|
|
||||||
// light - see #rasterCanvas in main.css).
|
|
||||||
this.rasterCtx.fillStyle = this.theme.rasterBg;
|
|
||||||
this.rasterCtx.fillRect(0, 0, width, height);
|
|
||||||
this.rasterCtx.fillStyle = this.theme.rasterInk;
|
|
||||||
this.rasterCtx.fillText('YES', textStartX, textY);
|
|
||||||
|
|
||||||
this.rasterData = this.rasterCtx.getImageData(0, 0, this.rasterCanvas.width, this.rasterCanvas.height);
|
|
||||||
}
|
|
||||||
|
|
||||||
isInSpecificLetter(x, y, letterIndex) {
|
|
||||||
const canvasX = x * this.pixelRatio;
|
|
||||||
const canvasY = y * this.pixelRatio;
|
|
||||||
|
|
||||||
if (!this.letterRasters || !this.letterRasters[letterIndex] ||
|
|
||||||
canvasX < 0 || canvasY < 0 ||
|
|
||||||
canvasX >= this.rasterCanvas.width || canvasY >= this.rasterCanvas.height) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const index = (Math.floor(canvasY) * this.rasterCanvas.width + Math.floor(canvasX)) * 4;
|
|
||||||
const red = this.letterRasters[letterIndex].data[index];
|
|
||||||
return red > 128;
|
|
||||||
}
|
|
||||||
|
|
||||||
initializeLines() {
|
|
||||||
this.lines = [];
|
|
||||||
const numLines = 60;
|
|
||||||
|
|
||||||
const letterCentroids = this.calculateLetterCentroids();
|
|
||||||
|
|
||||||
for (let i = 0; i < numLines; i++) {
|
|
||||||
const letterIndex = Math.floor(i / (numLines / 3));
|
|
||||||
let startX, startY, centerX, centerY;
|
|
||||||
|
|
||||||
if (letterCentroids[letterIndex]) {
|
|
||||||
centerX = letterCentroids[letterIndex].x;
|
|
||||||
centerY = letterCentroids[letterIndex].y;
|
|
||||||
|
|
||||||
const startVariation = this.fontSize * 0.1;
|
|
||||||
startX = centerX + (Math.random() - 0.5) * startVariation;
|
|
||||||
startY = centerY + (Math.random() - 0.5) * startVariation;
|
|
||||||
|
|
||||||
if (!this.isInSpecificLetter(startX, startY, letterIndex)) {
|
|
||||||
const nearestPoint = this.findNearestSpecificLetterPixel(startX, startY, letterIndex);
|
|
||||||
if (nearestPoint) {
|
|
||||||
startX = nearestPoint.x;
|
|
||||||
startY = nearestPoint.y;
|
|
||||||
} else {
|
|
||||||
startX = centerX;
|
|
||||||
startY = centerY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const letterPos = this.letterPositions[letterIndex];
|
|
||||||
startX = letterPos.centerX;
|
|
||||||
startY = letterPos.y;
|
|
||||||
centerX = startX;
|
|
||||||
centerY = startY;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stroke color lives on the theme, looked up per frame by
|
|
||||||
// letterIndex (see draw()) - not frozen per line - so a
|
|
||||||
// theme flip recolors live lines instead of leaving
|
|
||||||
// dark-theme neon smearing across light paper.
|
|
||||||
this.lines.push({
|
|
||||||
relativeX: (startX - centerX) / this.fontSize,
|
|
||||||
relativeY: (startY - centerY) / this.fontSize,
|
|
||||||
prevRelativeX: (startX - centerX) / this.fontSize,
|
|
||||||
prevRelativeY: (startY - centerY) / this.fontSize,
|
|
||||||
angle: Math.random() * Math.PI * 2,
|
|
||||||
letterIndex: letterIndex,
|
|
||||||
lastSeenInside: { x: (startX - centerX) / this.fontSize, y: (startY - centerY) / this.fontSize },
|
|
||||||
outsideDuration: 0
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
calculateLetterCentroids() {
|
|
||||||
const centroids = [];
|
|
||||||
|
|
||||||
for (let letterIndex = 0; letterIndex < 3; letterIndex++) {
|
|
||||||
let sumX = 0, sumY = 0, count = 0;
|
|
||||||
|
|
||||||
const letterPos = this.letterPositions[letterIndex];
|
|
||||||
const searchStartX = Math.max(0, letterPos.x - this.fontSize * 0.1);
|
|
||||||
const searchEndX = Math.min(this.displayWidth, letterPos.x + letterPos.width + this.fontSize * 0.1);
|
|
||||||
const searchStartY = Math.max(0, letterPos.y - this.fontSize * 0.6);
|
|
||||||
const searchEndY = Math.min(this.displayHeight, letterPos.y + this.fontSize * 0.6);
|
|
||||||
|
|
||||||
const step = Math.max(1, Math.floor(this.fontSize * 0.02));
|
|
||||||
for (let y = searchStartY; y <= searchEndY; y += step) {
|
|
||||||
for (let x = searchStartX; x <= searchEndX; x += step) {
|
|
||||||
if (this.isInSpecificLetter(x, y, letterIndex)) {
|
|
||||||
sumX += x;
|
|
||||||
sumY += y;
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count > 0) {
|
|
||||||
centroids[letterIndex] = {
|
|
||||||
x: sumX / count,
|
|
||||||
y: sumY / count
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
centroids[letterIndex] = {
|
|
||||||
x: letterPos.centerX,
|
|
||||||
y: letterPos.y
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return centroids;
|
|
||||||
}
|
|
||||||
|
|
||||||
updateLines() {
|
|
||||||
this.time += 0.016;
|
|
||||||
this.updateDrift();
|
|
||||||
if (!this.isActive) return;
|
|
||||||
|
|
||||||
const letterCentroids = this.calculateLetterCentroids();
|
|
||||||
|
|
||||||
this.lines.forEach(line => {
|
|
||||||
line.prevRelativeX = line.relativeX;
|
|
||||||
line.prevRelativeY = line.relativeY;
|
|
||||||
|
|
||||||
const centroid = letterCentroids[line.letterIndex];
|
|
||||||
if (!centroid) return;
|
|
||||||
|
|
||||||
const currentX = centroid.x + line.relativeX * this.fontSize;
|
|
||||||
const currentY = centroid.y + line.relativeY * this.fontSize;
|
|
||||||
|
|
||||||
const currentlyInside = this.isInSpecificLetter(currentX, currentY, line.letterIndex);
|
|
||||||
|
|
||||||
if (currentlyInside) {
|
|
||||||
line.outsideDuration = 0;
|
|
||||||
line.lastSeenInside = { x: line.relativeX, y: line.relativeY };
|
|
||||||
} else {
|
|
||||||
line.outsideDuration++;
|
|
||||||
}
|
|
||||||
|
|
||||||
const visionDistance = 0.08 * this.fontSize;
|
|
||||||
const centerX = currentX + Math.cos(line.angle) * visionDistance;
|
|
||||||
const centerY = currentY + Math.sin(line.angle) * visionDistance;
|
|
||||||
const leftX = currentX + Math.cos(line.angle - 0.4) * visionDistance;
|
|
||||||
const leftY = currentY + Math.sin(line.angle - 0.4) * visionDistance;
|
|
||||||
const rightX = currentX + Math.cos(line.angle + 0.4) * visionDistance;
|
|
||||||
const rightY = currentY + Math.sin(line.angle + 0.4) * visionDistance;
|
|
||||||
|
|
||||||
const centerSees = this.isInSpecificLetter(centerX, centerY, line.letterIndex);
|
|
||||||
const leftSees = this.isInSpecificLetter(leftX, leftY, line.letterIndex);
|
|
||||||
const rightSees = this.isInSpecificLetter(rightX, rightY, line.letterIndex);
|
|
||||||
|
|
||||||
let speed = 0.02;
|
|
||||||
|
|
||||||
const attractionThreshold = Math.floor(15 + (1 - this.containmentStrength) * 45);
|
|
||||||
|
|
||||||
if (line.outsideDuration > attractionThreshold) {
|
|
||||||
const targetX = line.lastSeenInside.x;
|
|
||||||
const targetY = line.lastSeenInside.y;
|
|
||||||
const deltaX = targetX - line.relativeX;
|
|
||||||
const deltaY = targetY - line.relativeY;
|
|
||||||
const angleToTarget = Math.atan2(deltaY, deltaX);
|
|
||||||
|
|
||||||
let angleDiff = angleToTarget - line.angle;
|
|
||||||
while (angleDiff > Math.PI) angleDiff -= 2 * Math.PI;
|
|
||||||
while (angleDiff < -Math.PI) angleDiff += 2 * Math.PI;
|
|
||||||
|
|
||||||
const baseAttraction = Math.min(0.4, line.outsideDuration / 80);
|
|
||||||
const attractionStrength = baseAttraction * this.containmentStrength;
|
|
||||||
line.angle += angleDiff * attractionStrength;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (centerSees) {
|
|
||||||
const baseWiggle = 0.15;
|
|
||||||
line.angle += (Math.random() - 0.5) * baseWiggle * this.wiggleAmount;
|
|
||||||
} else {
|
|
||||||
speed *= (0.3 + this.containmentStrength * 0.4);
|
|
||||||
|
|
||||||
const baseTurnStrength = 0.3 + (this.containmentStrength * 0.4);
|
|
||||||
const randomTurnAmount = 0.2 * this.wiggleAmount;
|
|
||||||
|
|
||||||
if (leftSees && !rightSees) {
|
|
||||||
line.angle -= baseTurnStrength + Math.random() * randomTurnAmount;
|
|
||||||
} else if (rightSees && !leftSees) {
|
|
||||||
line.angle += baseTurnStrength + Math.random() * randomTurnAmount;
|
|
||||||
} else {
|
|
||||||
const randomTurn = (Math.random() - 0.5) * (0.8 + this.wiggleAmount * 0.7);
|
|
||||||
line.angle += randomTurn;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
line.relativeX += Math.cos(line.angle) * speed;
|
|
||||||
line.relativeY += Math.sin(line.angle) * speed;
|
|
||||||
|
|
||||||
line.relativeX = Math.max(-1.7, Math.min(1.7, line.relativeX));
|
|
||||||
line.relativeY = Math.max(-1.7, Math.min(1.7, line.relativeY));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
findNearestSpecificLetterPixel(x, y, letterIndex) {
|
|
||||||
const searchRadius = this.fontSize * 0.08;
|
|
||||||
const step = Math.max(1, Math.floor(this.fontSize * 0.01));
|
|
||||||
let nearestPoint = null;
|
|
||||||
let nearestDistance = Infinity;
|
|
||||||
|
|
||||||
for (let dy = -searchRadius; dy <= searchRadius; dy += step) {
|
|
||||||
for (let dx = -searchRadius; dx <= searchRadius; dx += step) {
|
|
||||||
const testX = x + dx;
|
|
||||||
const testY = y + dy;
|
|
||||||
|
|
||||||
if (this.isInSpecificLetter(testX, testY, letterIndex)) {
|
|
||||||
const distance = Math.sqrt(dx * dx + dy * dy);
|
|
||||||
if (distance < nearestDistance) {
|
|
||||||
nearestDistance = distance;
|
|
||||||
nearestPoint = { x: testX, y: testY };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nearestPoint;
|
|
||||||
}
|
|
||||||
|
|
||||||
draw() {
|
|
||||||
this.lineCtx.fillStyle = this.theme.fade;
|
|
||||||
this.lineCtx.fillRect(0, 0, this.displayWidth, this.displayHeight);
|
|
||||||
|
|
||||||
const letterCentroids = this.calculateLetterCentroids();
|
|
||||||
|
|
||||||
this.lines.forEach(line => {
|
|
||||||
const centroid = letterCentroids[line.letterIndex];
|
|
||||||
if (!centroid) return;
|
|
||||||
|
|
||||||
const currentX = centroid.x + line.relativeX * this.fontSize;
|
|
||||||
const currentY = centroid.y + line.relativeY * this.fontSize;
|
|
||||||
const prevX = centroid.x + line.prevRelativeX * this.fontSize;
|
|
||||||
const prevY = centroid.y + line.prevRelativeY * this.fontSize;
|
|
||||||
|
|
||||||
if (prevX === currentX && prevY === currentY) return;
|
|
||||||
|
|
||||||
this.lineCtx.strokeStyle = this.theme.strokes[line.letterIndex];
|
|
||||||
this.lineCtx.lineWidth = this.fontSize * 0.003;
|
|
||||||
this.lineCtx.lineCap = 'round';
|
|
||||||
|
|
||||||
this.lineCtx.beginPath();
|
|
||||||
this.lineCtx.moveTo(prevX, prevY);
|
|
||||||
this.lineCtx.lineTo(currentX, currentY);
|
|
||||||
this.lineCtx.stroke();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
animate() {
|
|
||||||
if (this.destroyed) return;
|
|
||||||
this.updateLines();
|
|
||||||
this.draw();
|
|
||||||
requestAnimationFrame(() => this.animate());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user