Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d9ca806d50 | ||
|
|
19df36369c | ||
|
|
f037522052 | ||
|
|
c7600608d3 | ||
|
|
e476117c77 | ||
|
|
da533e8fa9 | ||
|
|
bc0227042b |
@@ -0,0 +1,14 @@
|
||||
-- A free natal analysis, once per user, when someone else first opens a link
|
||||
-- they shared (counted from the share page in the visitor's browser, so link
|
||||
-- preview robots do not count).
|
||||
ALTER TABLE credit_ledger DROP CONSTRAINT credit_ledger_reason_check;
|
||||
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_reason_check
|
||||
CHECK (reason IN ('monthly_grant', 'analysis', 'chat', 'refund', 'admin_adjust', 'purchase', 'person', 'package',
|
||||
'question', 'share_reward'));
|
||||
CREATE UNIQUE INDEX credit_ledger_share_reward_once ON credit_ledger (user_id) WHERE reason = 'share_reward';
|
||||
|
||||
-- Hash of the sharer's address when the link was made (salted with the slug):
|
||||
-- a visit from there is the sharer, not someone else.
|
||||
ALTER TABLE shares ADD COLUMN owner_ip_hash bytea;
|
||||
|
||||
COMMENT ON COLUMN shares.view_count IS 'visits by people (the share page reports them), robots excluded';
|
||||
@@ -20,3 +20,7 @@ SIGNUP_MODE=invite
|
||||
|
||||
# Image version; every deployment rewrites it
|
||||
TAG=latest
|
||||
|
||||
# worker-ai: analyses and answers written at the same time.
|
||||
# QUICK_CONCURRENCY=2 # summaries and answers
|
||||
# ANALYSIS_CONCURRENCY=4 # detailed analyses and forecasts
|
||||
|
||||
+2
-1
@@ -82,7 +82,8 @@ A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az en
|
||||
|
||||
## Üzemeltetés
|
||||
|
||||
- Naplók: `docker compose logs -f backend worker`
|
||||
- Naplók: `docker compose logs -f backend worker worker-ai`
|
||||
- A worker két konténerben fut, ugyanabból az image-ből: a `worker` küldi az e-maileket és takarít (`WORKER_TASKS=email,cleanup`, ide kerülnek a további háttérfeladatok is), a `worker-ai` írja az elemzéseket és a válaszokat (`WORKER_TASKS=analyses`, gyors és lassú sáv). A sávok mérete a szerver `.env` fájljában állítható (`QUICK_CONCURRENCY`, `ANALYSIS_CONCURRENCY`).
|
||||
- Visszaállás korábbi verzióra: `.env`-ben `TAG=<régebbi hash>`, utána `docker compose up -d`
|
||||
- Mentés: naponta egy `pg_dump` a `/opt/sorsfonalak/backups` mappába, 14 napig megmarad. A mentéseket érdemes a szerverről is elvinni (DigitalOcean backup, vagy `rsync` otthonra).
|
||||
- Visszatöltés: `gunzip -c backups/sorsfonalak-<dátum>.sql.gz | docker compose exec -T postgres psql -U sorsfonalak sorsfonalak`
|
||||
|
||||
@@ -99,10 +99,12 @@ services:
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
# E-mail delivery, cleanup and the other background jobs.
|
||||
worker:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
|
||||
environment:
|
||||
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
||||
WORKER_TASKS: email,cleanup
|
||||
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
||||
# listing them here with an empty default would override that file.
|
||||
SES_REGION: ${SES_REGION:-eu-central-1}
|
||||
@@ -118,11 +120,33 @@ services:
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
# The same image writing the analyses and answers (quick and slow lane);
|
||||
# OPENROUTER_API_KEY comes from .env.secrets.
|
||||
worker-ai:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
|
||||
environment:
|
||||
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
||||
WORKER_TASKS: analyses
|
||||
QUICK_CONCURRENCY: ${QUICK_CONCURRENCY:-2}
|
||||
ANALYSIS_CONCURRENCY: ${ANALYSIS_CONCURRENCY:-4}
|
||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||
env_file:
|
||||
- path: .env.secrets
|
||||
required: false
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-frontend:${TAG:-latest}
|
||||
environment:
|
||||
BACKEND_URL: http://backend:8081
|
||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||
# Absolute links of the share previews (og:image).
|
||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_healthy
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
# Megosztás
|
||||
|
||||
A képletoldalon, a rövid összefoglaló alatt van a **Megosztás** gomb. Ez egy nyilvános linket ad (`/s/<kód>`), amelyen a képlet rajza és a legfrissebb rövid összefoglaló látszik. Név és születési adatok nem kerülnek rá.
|
||||
|
||||
- **Ugyanaz a link:** ha ugyanazt a képletet újra megosztod, a már nyitott link jön vissza (`POST /v1/shares`: új linknél 201, meglévőnél 200).
|
||||
- **Visszavonás:** a „Link visszavonása” gomb után az oldal és a kép is 404-et ad.
|
||||
- **Keresők:** az oldal `noindex`, a keresők nem listázzák.
|
||||
|
||||
## Ajándék elemzés a megosztásért
|
||||
|
||||
**Mit kap:** felhasználónként **egyszer** +1 képletelemzést, amikor valaki más először megnyitja a megosztott linkjét. A gomb apró betűvel kiírja: „+1 ajándék elemzés jár érte, ha valaki megnézi”. Ha már megkapta, ezt: „Az ajándék elemzést már megkaptad”.
|
||||
|
||||
**Hogyan számolunk:**
|
||||
|
||||
- **A böngésző jelez.** A látogatást a megosztott oldal betöltése után maga a látogató böngészője jelzi (`POST /v1/public/shares/{slug}/visit`). Az előnézet-robotok nem futtatják az oldal szkriptjét, így ők nem számítanak.
|
||||
- **Ami nem számít:**
|
||||
- robotnak látszó vagy hiányzó böngészőazonosító;
|
||||
- a belépett tulajdonos;
|
||||
- látogatás arról az IP-címről, ahonnan a linket létrehozták. A cím a sluggal sózva, hash-ként van tárolva (`shares.owner_ip_hash`).
|
||||
- **Számláló:** a `shares.view_count` csak ezeket a valódi látogatásokat számolja.
|
||||
- **Jutalom egyszer:** a `credit_ledger` `share_reward` sora egyedi indexszel felhasználónként csak egyszer jöhet létre (`credit_ledger_share_reward_once`).
|
||||
- **`/v1/me`:** a `share_reward_granted` jelzi, ha már megkapta.
|
||||
|
||||
## Robotok
|
||||
|
||||
- **Az olvasás nem ír.** A megosztott tartalom lekérése (`GET /v1/public/shares/{slug}`) semmit nem ír az adatbázisba.
|
||||
- **Gyorsítótár:** a frontend 5 percig tartja (`fetch` `revalidate: 300`, `shares` tag), így a sűrűn visszatérő robotok el sem jutnak a backendig. Visszavonáskor az `/api/v1` proxy azonnal törli a taget.
|
||||
- **robots.txt** (`src/app/robots.ts`): kitiltja az ismert AI-robotokat (GPTBot, ClaudeBot, CCBot, PerplexityBot, Bytespider, meta-externalagent stb.). Az előnézet-robotok (facebookexternalhit, Slackbot, WhatsApp, Twitterbot, LinkedInBot) engedélyezve maradnak.
|
||||
- **Cloudflare:** a robots.txt-t be nem tartó robotokra a Cloudflare „Block AI bots” beállítása való (Security → Bots). Ez az előnézet-robotokat nem tiltja le. A „Bot Fight Mode” viszont az előnézeteket is elronthatja, azt ne kapcsoljuk be.
|
||||
|
||||
## Előnézet (Facebook, Messenger, WhatsApp, LinkedIn, X)
|
||||
|
||||
Az oldal `og:` és `twitter:` meta tagjei:
|
||||
|
||||
| Tag | Tartalom |
|
||||
|---|---|
|
||||
| cím | az összefoglaló címe |
|
||||
| leírás | az összefoglaló első ~200 karaktere |
|
||||
| kép | `/s/<kód>/kep/<verzió>.png` |
|
||||
|
||||
A kép egy 1200×630-as PNG. A Next.js beépített képgenerálója (`next/og`) készíti kérésre, a következőkkel:
|
||||
|
||||
- a radix (`src/lib/wheelSvg.ts`; ugyanaz a `<ChartWheel>`, mint az oldalon, beégetett színekkel);
|
||||
- a cím és a szöveg eleje;
|
||||
- a Nap, a Hold és az Aszcendens jegye.
|
||||
|
||||
Működése:
|
||||
|
||||
- **Betűtípusok:** a `src/assets/og` mappából olvassa őket. Hiányzó karakter miatt soha nem tölt le fontot az internetről, mert a nem betű, szám vagy írásjel karaktereket kiszűri.
|
||||
- **Verzió:** a fájlnévben lévő verzió az összefoglaló azonosítójából és elkészültének idejéből készül. Ha az összefoglaló újragenerálódik, új címet kap a kép, és a Facebook újra letölti.
|
||||
- **Gyorsítótár:** `Cache-Control: public, max-age=3600, s-maxage=86400`. A Cloudflare egy napig tartja, így egy visszavont link képe legfeljebb egy napig marad ott. A Facebook a saját példányát a saját szabályai szerint tartja meg, nagyjából 30 napig.
|
||||
- **Frissítés kézzel:** a Facebook megosztás-ellenőrzőjében (Sharing Debugger) a „Scrape Again” gombbal.
|
||||
|
||||
A frontend a `PUBLIC_BASE_URL` alapján írja az abszolút címeket; élesben ez `https://${DOMAIN}`.
|
||||
@@ -33,6 +33,7 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
let birth_change = crate::birth_changes::view(&mut conn, &auth).await?;
|
||||
let persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
|
||||
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
||||
let share_reward = super::shares::reward_granted(&state.db, auth.id()).await?;
|
||||
Ok(Json(json!({
|
||||
"user": UserView::from(&auth.user),
|
||||
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
||||
@@ -41,6 +42,8 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
"birth_change": birth_change,
|
||||
"persons": persons.view(),
|
||||
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
|
||||
// The free analysis for a shared link is used up (once per user).
|
||||
"share_reward_granted": share_reward,
|
||||
})))
|
||||
}
|
||||
|
||||
|
||||
@@ -100,6 +100,7 @@ pub fn router(state: Arc<AppState>) -> Router {
|
||||
.route("/v1/shares/{id}", delete(shares::revoke))
|
||||
// public, no login
|
||||
.route("/v1/public/shares/{slug}", get(shares::public_view))
|
||||
.route("/v1/public/shares/{slug}/visit", post(shares::visit))
|
||||
.route("/v1/public/invites/{token}", get(synastries::public_invite))
|
||||
.route("/v1/public/invitations/unsubscribe", post(invitations::unsubscribe))
|
||||
.route("/v1/public/invitations/{token}", get(invitations::public_view))
|
||||
|
||||
@@ -1,13 +1,24 @@
|
||||
//! Public sharing links. Creating and revoking a link needs login; opening
|
||||
//! one (`GET /v1/public/shares/{slug}`) does not. The public view never
|
||||
//! contains birth data unless the owner allowed it for their own chart.
|
||||
//! A shared chart comes with its newest short summary (the share page and
|
||||
//! its preview image show both). Sharing the same thing again returns the
|
||||
//! link that is already open.
|
||||
//!
|
||||
//! Reading a share writes nothing, so robots cost no database writes. The
|
||||
//! share page reports a visit from the visitor's browser
|
||||
//! (`POST /v1/public/shares/{slug}/visit`): it is counted unless it comes
|
||||
//! from a robot or from the sharer (logged in, or from the address the link
|
||||
//! was made at). The sharer's first such visit earns one free natal analysis,
|
||||
//! once per user.
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum::http::{HeaderMap, StatusCode};
|
||||
use axum_extra::extract::WithRejection;
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
use sha2::{Digest, Sha256};
|
||||
use sqlx::PgPool;
|
||||
use time::OffsetDateTime;
|
||||
use uuid::Uuid;
|
||||
@@ -16,7 +27,7 @@ use super::analyses::{can_see, find_analysis};
|
||||
use super::charts::{ChartRow, find_chart, owned_chart};
|
||||
use super::synastries::{VisibleSynastry, load_synastry, visible_synastry};
|
||||
use super::{Body, IdPath, St};
|
||||
use crate::auth::AuthUser;
|
||||
use crate::auth::{AuthUser, user_agent};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::{public_chart, rfc3339, rfc3339_opt};
|
||||
|
||||
@@ -42,10 +53,53 @@ struct ShareRow {
|
||||
view_count: i64,
|
||||
created_at: OffsetDateTime,
|
||||
revoked_at: Option<OffsetDateTime>,
|
||||
owner_ip_hash: Option<Vec<u8>>,
|
||||
}
|
||||
|
||||
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||
view_count, created_at, revoked_at";
|
||||
view_count, created_at, revoked_at, owner_ip_hash";
|
||||
|
||||
/// The visitor's address: the first `X-Forwarded-For` entry (Caddy writes it
|
||||
/// from Cloudflare's, the frontend passes it on).
|
||||
fn client_ip(headers: &HeaderMap) -> Option<String> {
|
||||
let first = headers.get("x-forwarded-for")?.to_str().ok()?.split(',').next()?.trim();
|
||||
(!first.is_empty()).then(|| first.to_string())
|
||||
}
|
||||
|
||||
/// An address salted with the slug, so the stored value says nothing by itself.
|
||||
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
||||
Sha256::digest(format!("{slug}:{ip}").as_bytes()).to_vec()
|
||||
}
|
||||
|
||||
/// Link preview robots, crawlers and scripts (they do not run the page's
|
||||
/// script anyway; this also stops a direct call).
|
||||
fn is_robot(user_agent: Option<&str>) -> bool {
|
||||
const MARKS: [&str; 16] = [
|
||||
"bot",
|
||||
"crawl",
|
||||
"spider",
|
||||
"slurp",
|
||||
"facebookexternalhit",
|
||||
"preview",
|
||||
"fetch",
|
||||
"curl",
|
||||
"wget",
|
||||
"python",
|
||||
"headless",
|
||||
"http-client",
|
||||
"okhttp",
|
||||
"java/",
|
||||
"go-http",
|
||||
"scrapy",
|
||||
];
|
||||
match user_agent {
|
||||
Some(ua) if !ua.trim().is_empty() => {
|
||||
let ua = ua.to_lowercase();
|
||||
MARKS.iter().any(|m| ua.contains(m))
|
||||
}
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
|
||||
/// 96 random bits, 16 URL-safe characters.
|
||||
fn new_slug() -> String {
|
||||
@@ -86,6 +140,7 @@ pub struct CreateShare {
|
||||
pub async fn create(
|
||||
State(state): St,
|
||||
auth: AuthUser,
|
||||
headers: HeaderMap,
|
||||
WithRejection(Json(req), _): Body<CreateShare>,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let (chart_id, synastry_id, analysis_id, kind) = match req.kind {
|
||||
@@ -109,19 +164,40 @@ pub async fn create(
|
||||
}
|
||||
};
|
||||
let title = req.title.map(|t| t.trim().chars().take(120).collect::<String>()).filter(|t| !t.is_empty());
|
||||
let open: Option<ShareRow> = sqlx::query_as(&format!(
|
||||
"SELECT {SHARE_COLUMNS} FROM shares WHERE owner_id = $1 AND kind = $2 AND revoked_at IS NULL \
|
||||
AND chart_id IS NOT DISTINCT FROM $3 AND synastry_id IS NOT DISTINCT FROM $4 \
|
||||
AND analysis_id IS NOT DISTINCT FROM $5 AND title IS NOT DISTINCT FROM $6 AND show_birth_data = $7 \
|
||||
ORDER BY created_at DESC LIMIT 1"
|
||||
))
|
||||
.bind(auth.id())
|
||||
.bind(kind)
|
||||
.bind(chart_id)
|
||||
.bind(synastry_id)
|
||||
.bind(analysis_id)
|
||||
.bind(&title)
|
||||
.bind(req.show_birth_data)
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
if let Some(row) = open {
|
||||
return Ok((StatusCode::OK, Json(row.view(&state.config.public_base_url))));
|
||||
}
|
||||
let slug = new_slug();
|
||||
let row: ShareRow = sqlx::query_as(&format!(
|
||||
"INSERT INTO shares (id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data) \
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING {SHARE_COLUMNS}"
|
||||
"INSERT INTO shares (id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||
owner_ip_hash) \
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING {SHARE_COLUMNS}"
|
||||
))
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(auth.id())
|
||||
.bind(new_slug())
|
||||
.bind(&slug)
|
||||
.bind(kind)
|
||||
.bind(chart_id)
|
||||
.bind(synastry_id)
|
||||
.bind(analysis_id)
|
||||
.bind(title)
|
||||
.bind(req.show_birth_data)
|
||||
.bind(client_ip(&headers).map(|ip| ip_hash(&slug, &ip)))
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
Ok((StatusCode::CREATED, Json(row.view(&state.config.public_base_url))))
|
||||
@@ -175,6 +251,7 @@ async fn public_body(db: &PgPool, share: &ShareRow) -> Result<Value, ApiError> {
|
||||
if let Some(chart_id) = share.chart_id {
|
||||
let chart = find_chart(db, chart_id).await?.ok_or(ApiError::NotFound("share"))?;
|
||||
body["chart"] = public_chart_block(&chart, share);
|
||||
body["summary"] = latest_summary(db, chart_id).await?;
|
||||
} else if let Some(synastry_id) = share.synastry_id {
|
||||
let s = load_synastry(db, synastry_id).await?.ok_or(ApiError::NotFound("share"))?;
|
||||
body["synastry"] = public_synastry_block(&s, share);
|
||||
@@ -198,14 +275,83 @@ async fn public_body(db: &PgPool, share: &ShareRow) -> Result<Value, ApiError> {
|
||||
Ok(body)
|
||||
}
|
||||
|
||||
/// Public: the shared content for the share page and its OG image.
|
||||
/// The newest finished short summary of a chart (`null` if none).
|
||||
async fn latest_summary(db: &PgPool, chart_id: Uuid) -> Result<Value, sqlx::Error> {
|
||||
type Row = (Uuid, String, Option<Value>, Option<OffsetDateTime>);
|
||||
let row: Option<Row> = sqlx::query_as(
|
||||
"SELECT id, language, content, completed_at FROM analyses \
|
||||
WHERE chart_id = $1 AND kind = 'summary' AND status = 'done' ORDER BY completed_at DESC LIMIT 1",
|
||||
)
|
||||
.bind(chart_id)
|
||||
.fetch_optional(db)
|
||||
.await?;
|
||||
Ok(match row {
|
||||
Some((id, language, content, completed_at)) => json!({
|
||||
"id": id,
|
||||
"language": language,
|
||||
"title": content.as_ref().and_then(|c| c["title"].as_str()),
|
||||
"summary": content.as_ref().and_then(|c| c["summary"].as_str()),
|
||||
"completed_at": rfc3339_opt(completed_at),
|
||||
}),
|
||||
None => Value::Null,
|
||||
})
|
||||
}
|
||||
|
||||
async fn open_share(db: &PgPool, slug: &str) -> Result<ShareRow, ApiError> {
|
||||
sqlx::query_as(&format!("SELECT {SHARE_COLUMNS} FROM shares WHERE slug = $1 AND revoked_at IS NULL"))
|
||||
.bind(slug.trim())
|
||||
.fetch_optional(db)
|
||||
.await?
|
||||
.ok_or(ApiError::NotFound("share"))
|
||||
}
|
||||
|
||||
/// Public: the shared content for the share page and its OG image (read only).
|
||||
pub async fn public_view(State(state): St, Path(slug): Path<String>) -> ApiResult<Json<Value>> {
|
||||
let share: ShareRow = sqlx::query_as(&format!(
|
||||
"UPDATE shares SET view_count = view_count + 1 WHERE slug = $1 AND revoked_at IS NULL RETURNING {SHARE_COLUMNS}"
|
||||
))
|
||||
.bind(slug.trim())
|
||||
.fetch_optional(&state.db)
|
||||
.await?
|
||||
.ok_or(ApiError::NotFound("share"))?;
|
||||
let share = open_share(&state.db, &slug).await?;
|
||||
Ok(Json(public_body(&state.db, &share).await?))
|
||||
}
|
||||
|
||||
/// Public: the share page reports that someone opened it. Counted unless a
|
||||
/// robot or the sharer; the sharer's first counted visit ever earns the reward.
|
||||
pub async fn visit(
|
||||
State(state): St,
|
||||
auth: Result<AuthUser, ApiError>,
|
||||
headers: HeaderMap,
|
||||
Path(slug): Path<String>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
let share = open_share(&state.db, &slug).await?;
|
||||
let sharer = auth.as_ref().is_ok_and(|a| a.id() == share.owner_id);
|
||||
let same_place = match (client_ip(&headers), &share.owner_ip_hash) {
|
||||
(Some(ip), Some(hash)) => ip_hash(&share.slug, &ip) == *hash,
|
||||
_ => false,
|
||||
};
|
||||
if sharer || same_place || is_robot(user_agent(&headers).as_deref()) {
|
||||
return Ok(Json(json!({ "counted": false })));
|
||||
}
|
||||
let mut tx = state.db.begin().await?;
|
||||
sqlx::query("UPDATE shares SET view_count = view_count + 1 WHERE id = $1").bind(share.id).execute(&mut *tx).await?;
|
||||
let rewarded = sqlx::query(
|
||||
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
||||
VALUES ($1, $2, 'natal', 1, 'share_reward', $3) ON CONFLICT DO NOTHING",
|
||||
)
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(share.owner_id)
|
||||
.bind(format!("first visit of share {}", share.id))
|
||||
.execute(&mut *tx)
|
||||
.await?
|
||||
.rows_affected()
|
||||
== 1;
|
||||
tx.commit().await?;
|
||||
if rewarded {
|
||||
tracing::info!(share = %share.id, "share reward granted");
|
||||
}
|
||||
Ok(Json(json!({ "counted": true })))
|
||||
}
|
||||
|
||||
/// Whether the user has already received the reward for sharing.
|
||||
pub async fn reward_granted(db: &PgPool, user_id: Uuid) -> Result<bool, sqlx::Error> {
|
||||
sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM credit_ledger WHERE user_id = $1 AND reason = 'share_reward')")
|
||||
.bind(user_id)
|
||||
.fetch_one(db)
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -163,7 +163,22 @@ impl TestApp {
|
||||
}
|
||||
|
||||
async fn call(&self, method: &str, uri: &str, token: Option<&str>, body: Option<Value>) -> Response {
|
||||
self.call_with(method, uri, token, body, &[]).await
|
||||
}
|
||||
|
||||
/// A request with extra headers (user agent, forwarded address).
|
||||
async fn call_with(
|
||||
&self,
|
||||
method: &str,
|
||||
uri: &str,
|
||||
token: Option<&str>,
|
||||
body: Option<Value>,
|
||||
headers: &[(&str, &str)],
|
||||
) -> Response {
|
||||
let mut req = Request::builder().method(method).uri(uri);
|
||||
for (name, value) in headers {
|
||||
req = req.header(*name, *value);
|
||||
}
|
||||
if let Some(t) = token {
|
||||
req = req.header("authorization", format!("Bearer {t}"));
|
||||
}
|
||||
@@ -628,6 +643,30 @@ async fn public_shares(pool: PgPool) {
|
||||
for hidden in ["input", "location", "time", "astronomy", "birth"] {
|
||||
assert!(shown.get(hidden).is_none(), "{hidden} must not be public");
|
||||
}
|
||||
assert!(r.body["summary"].is_null(), "no finished summary yet");
|
||||
|
||||
// the newest finished summary comes with the chart
|
||||
sqlx::query(
|
||||
"INSERT INTO analyses (id, kind, chart_id, requested_by, language, model, prompt_version, cache_key, \
|
||||
credits_charged, status, content, completed_at) \
|
||||
VALUES ($1, 'summary', $2::uuid, (SELECT id FROM users WHERE email = 'anna@example.com'), 'hu', 'm', 'v', \
|
||||
'k', 0, 'done', $3, now())",
|
||||
)
|
||||
.bind(uuid::Uuid::now_v7())
|
||||
.bind(chart_id)
|
||||
.bind(json!({"title": "Csendes erő", "summary": "Rövid **összefoglaló**."}))
|
||||
.execute(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let r = app.get(&format!("/v1/public/shares/{slug}"), None).await;
|
||||
assert_eq!(r.body["summary"]["title"], "Csendes erő");
|
||||
assert_eq!(r.body["summary"]["summary"], "Rövid **összefoglaló**.");
|
||||
|
||||
// sharing the same again gives the open link
|
||||
let r = app
|
||||
.post("/v1/shares", Some(&anna), json!({"kind": "chart", "target_id": chart_id, "title": "A radixom"}))
|
||||
.await;
|
||||
assert_eq!((r.status, r.body["slug"].as_str()), (StatusCode::OK, Some(slug.as_str())));
|
||||
|
||||
let r = app
|
||||
.post("/v1/shares", Some(&anna), json!({"kind": "chart", "target_id": chart_id, "show_birth_data": true}))
|
||||
@@ -682,7 +721,7 @@ async fn export_and_delete_account(pool: PgPool) {
|
||||
/// config and catalog, shared links, invitation pages, the waitlist and
|
||||
/// unsubscribing. Every other route (charts, calculations, analyses) needs a
|
||||
/// logged-in user, so other apps cannot use them.
|
||||
const PUBLIC_ROUTES: [&str; 14] = [
|
||||
const PUBLIC_ROUTES: [&str; 15] = [
|
||||
"/healthz",
|
||||
"/v1/config",
|
||||
"/v1/packages",
|
||||
@@ -693,12 +732,64 @@ const PUBLIC_ROUTES: [&str; 14] = [
|
||||
"/v1/auth/password-reset",
|
||||
"/v1/auth/password-reset/confirm",
|
||||
"/v1/public/shares/{slug}",
|
||||
"/v1/public/shares/{slug}/visit",
|
||||
"/v1/public/invites/{token}",
|
||||
"/v1/public/invitations/unsubscribe",
|
||||
"/v1/public/invitations/{token}",
|
||||
"/v1/public/waitlist",
|
||||
];
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn a_visit_by_someone_else_earns_one_analysis_once(pool: PgPool) {
|
||||
let app = TestApp::new(pool).await;
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||
let share = json!({"kind": "chart", "target_id": chart["id"]});
|
||||
let home = ("x-forwarded-for", "203.0.113.7");
|
||||
let r = app.call_with("POST", "/v1/shares", Some(&anna), Some(share), &[home]).await;
|
||||
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
|
||||
let visit = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
||||
let browser = ("user-agent", "Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) Mobile/15E148");
|
||||
let me = || async { app.get("/v1/me", Some(&anna)).await.body };
|
||||
let before = me().await["analyses_left"]["natal"].as_i64().unwrap();
|
||||
|
||||
// robots, a missing user agent, the sharer's address and the sharer do not count
|
||||
let elsewhere = ("x-forwarded-for", "198.51.100.1, 172.70.1.1");
|
||||
for (token, headers) in [
|
||||
(None, vec![("user-agent", "facebookexternalhit/1.1"), elsewhere]),
|
||||
(None, vec![elsewhere]),
|
||||
(None, vec![browser, home]),
|
||||
(Some(anna.as_str()), vec![browser, elsewhere]),
|
||||
] {
|
||||
let r = app.call_with("POST", &visit, token, None, &headers).await;
|
||||
assert_eq!((r.status, &r.body["counted"]), (StatusCode::OK, &json!(false)), "{headers:?}");
|
||||
}
|
||||
let body = me().await;
|
||||
assert_eq!((body["analyses_left"]["natal"].as_i64(), &body["share_reward_granted"]), (Some(before), &json!(false)));
|
||||
// reading the share counts nothing either
|
||||
app.get(&visit.replace("/visit", ""), None).await;
|
||||
|
||||
// someone else: counted, and the reward comes once
|
||||
for _ in 0..2 {
|
||||
let r = app.call_with("POST", &visit, None, None, &[browser, elsewhere]).await;
|
||||
assert_eq!(r.body["counted"], true);
|
||||
}
|
||||
let body = me().await;
|
||||
assert_eq!(
|
||||
(body["analyses_left"]["natal"].as_i64(), &body["share_reward_granted"]),
|
||||
(Some(before + 1), &json!(true))
|
||||
);
|
||||
let r = app.get("/v1/shares", Some(&anna)).await;
|
||||
assert_eq!(r.body["shares"][0]["view_count"], 2);
|
||||
|
||||
// a second link earns nothing more
|
||||
let r =
|
||||
app.post("/v1/shares", Some(&anna), json!({"kind": "chart", "target_id": chart["id"], "title": "Új"})).await;
|
||||
let other = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
||||
app.call_with("POST", &other, None, None, &[browser, elsewhere]).await;
|
||||
assert_eq!(me().await["analyses_left"]["natal"].as_i64(), Some(before + 1));
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn everything_else_needs_login(pool: PgPool) {
|
||||
let app = TestApp::new(pool).await;
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
<!-- BEGIN:nextjs-agent-rules -->
|
||||
|
||||
## This is NOT the Next.js you know
|
||||
|
||||
This version has breaking changes — APIs, conventions, and file structure may all differ from your training data. Read the relevant guide in `node_modules/next/dist/docs/` (resolved from this file's directory; in monorepos the `next` package may not be visible from the repo root) before writing any code. Heed deprecation notices.
|
||||
|
||||
This block is written and re-added by `next dev` — verify at `node_modules/next/dist/server/lib/generate-agent-files.js`. Removing it from a diff only re-creates the uncommitted change; committing it with your work keeps the tree clean.
|
||||
|
||||
<!-- END:nextjs-agent-rules -->
|
||||
@@ -4,6 +4,8 @@ const config: NextConfig = {
|
||||
// Small self-contained server for the container image.
|
||||
output: "standalone",
|
||||
poweredByHeader: false,
|
||||
// The fonts of the share preview images are read from disk at run time.
|
||||
outputFileTracingIncludes: { "/s/[slug]/kep/[file]": ["./src/assets/og/*.ttf"] },
|
||||
};
|
||||
|
||||
export default config;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
// Forwards /api/v1/* to the backend, so the browser talks to one origin and
|
||||
// the session cookie belongs to the frontend's host (no CORS needed).
|
||||
import { revalidateTag } from "next/cache";
|
||||
import type { NextRequest } from "next/server";
|
||||
|
||||
import { BACKEND_URL } from "@/lib/server";
|
||||
import { SHARES_TAG } from "@/lib/share";
|
||||
|
||||
const REQUEST_HEADERS = ["accept", "accept-language", "authorization", "content-type", "cookie", "user-agent"];
|
||||
// Hop-by-hop or re-computed by the runtime.
|
||||
@@ -38,6 +40,8 @@ async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[]
|
||||
if (!SKIP_RESPONSE_HEADERS.has(name)) out.set(name, value);
|
||||
});
|
||||
for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie);
|
||||
// A revoked link must disappear at once from the cached share pages.
|
||||
if (req.method === "DELETE" && path[0] === "shares" && res.ok) revalidateTag(SHARES_TAG, { expire: 0 });
|
||||
return new Response(res.body, { status: res.status, headers: out });
|
||||
}
|
||||
|
||||
|
||||
@@ -695,3 +695,30 @@ a.pair-row:hover strong { color: var(--gold); }
|
||||
.site-header { gap: 8px 12px; }
|
||||
.logo { font-size: 25px; }
|
||||
}
|
||||
|
||||
/* Sharing a chart (summary card) and the public share page */
|
||||
.share { display: flex; flex-direction: column; gap: 10px; align-items: stretch; }
|
||||
.share-button {
|
||||
display: flex; align-items: center; gap: 14px; width: 100%; padding: 12px 16px; text-align: left; cursor: pointer;
|
||||
border: 1px solid rgba(217, 180, 106, 0.55); border-radius: 12px; color: var(--ink); font: inherit;
|
||||
background: linear-gradient(135deg, rgba(217, 180, 106, 0.14), rgba(217, 180, 106, 0.03));
|
||||
transition: border-color 0.15s, background 0.15s;
|
||||
}
|
||||
.share-button:hover { border-color: var(--gold); background: linear-gradient(135deg, rgba(217, 180, 106, 0.22), rgba(217, 180, 106, 0.06)); }
|
||||
.share-button:disabled { opacity: 0.7; cursor: default; }
|
||||
.share-icon {
|
||||
flex: none; width: 40px; height: 40px; border-radius: 50%; display: inline-flex; align-items: center; justify-content: center;
|
||||
background: var(--gold); color: var(--gold-ink);
|
||||
}
|
||||
.share-button-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
|
||||
.share-button-text strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; line-height: 1.15; }
|
||||
.share-button-text small { font-size: 12.5px; color: var(--gold); }
|
||||
.share-fine { margin: 0; font-size: 12.5px; color: var(--muted); line-height: 1.5; }
|
||||
.share-open { align-items: stretch; padding: 14px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
|
||||
.share-link { display: flex; gap: 8px; }
|
||||
.share-link .inp { min-height: 36px; font-size: 14px; }
|
||||
.share-trio { display: flex; flex-wrap: wrap; gap: 6px 18px; color: var(--ink-2); font-size: 14px; }
|
||||
.share-trio .sym { color: var(--gold); }
|
||||
.share-cta { gap: 12px; }
|
||||
.share-cta h2 { font-size: 24px; }
|
||||
.share-cta .btn { align-self: flex-start; }
|
||||
|
||||
@@ -77,6 +77,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
||||
initial={summary}
|
||||
detailedDone={detailed?.status === "done"}
|
||||
isAdmin={me.user.roles.includes("admin")}
|
||||
shareRewardGranted={me.share_reward_granted}
|
||||
/>
|
||||
<BigThree chart={chart} />
|
||||
{(elements || modalities || phase) && (
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import type { MetadataRoute } from "next";
|
||||
|
||||
// AI crawlers that train models or answer from the site: they load pages
|
||||
// far more often than visitors do. Link preview robots (Facebook, Messenger,
|
||||
// Slack, WhatsApp, X, LinkedIn) stay allowed, they make the shared links work.
|
||||
const AI_CRAWLERS = [
|
||||
"GPTBot",
|
||||
"ChatGPT-User",
|
||||
"OAI-SearchBot",
|
||||
"ClaudeBot",
|
||||
"Claude-User",
|
||||
"Claude-SearchBot",
|
||||
"anthropic-ai",
|
||||
"CCBot",
|
||||
"Google-Extended",
|
||||
"GoogleOther",
|
||||
"Applebot-Extended",
|
||||
"PerplexityBot",
|
||||
"Perplexity-User",
|
||||
"Bytespider",
|
||||
"Amazonbot",
|
||||
"meta-externalagent",
|
||||
"meta-externalfetcher",
|
||||
"FacebookBot",
|
||||
"cohere-ai",
|
||||
"cohere-training-data-crawler",
|
||||
"Diffbot",
|
||||
"ImagesiftBot",
|
||||
"Omgilibot",
|
||||
"Omgili",
|
||||
"YouBot",
|
||||
"Timpibot",
|
||||
"AI2Bot",
|
||||
"Ai2Bot-Dolma",
|
||||
"DuckAssistBot",
|
||||
"MistralAI-User",
|
||||
"PetalBot",
|
||||
"Scrapy",
|
||||
];
|
||||
|
||||
export default function robots(): MetadataRoute.Robots {
|
||||
return {
|
||||
rules: [
|
||||
{ userAgent: AI_CRAWLERS, disallow: "/" },
|
||||
// Logged-in pages redirect anyway; shared links carry noindex.
|
||||
{ userAgent: "*", allow: "/", disallow: ["/api/", "/admin", "/profil", "/kepletek", "/osszevetesek", "/szemelyek"] },
|
||||
],
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
// The link preview image of a shared chart (og:image): 1200×630 PNG with the
|
||||
// wheel, the title and the text of the short summary. The file name carries
|
||||
// a version (see `imageVersion`), so a rewritten summary gets a new address
|
||||
// and Facebook and co. fetch it again.
|
||||
import { readFile } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
|
||||
import { ImageResponse } from "next/og";
|
||||
|
||||
import { SIGNS, signName } from "@/lib/astro";
|
||||
import { bigThree, loadShare, plain, shorten } from "@/lib/share";
|
||||
import { wheelSvg } from "@/lib/wheelSvg";
|
||||
|
||||
const W = 1200;
|
||||
const H = 630;
|
||||
const WHEEL = 590;
|
||||
|
||||
const FONTS = join(process.cwd(), "src/assets/og");
|
||||
let fonts: Promise<{ name: string; data: Buffer; weight: 400 | 600; style: "normal" }[]> | null = null;
|
||||
|
||||
function loadFonts() {
|
||||
fonts ??= Promise.all(
|
||||
(
|
||||
[
|
||||
["Cormorant Garamond", "CormorantGaramond-SemiBold.ttf", 600],
|
||||
["Inter", "Inter-Regular.ttf", 400],
|
||||
["Inter", "Inter-SemiBold.ttf", 600],
|
||||
["DejaVu Sans", "DejaVuSans.ttf", 400],
|
||||
] as const
|
||||
).map(async ([name, file, weight]) => ({
|
||||
name,
|
||||
data: await readFile(join(FONTS, file)),
|
||||
weight,
|
||||
style: "normal" as const,
|
||||
})),
|
||||
);
|
||||
return fonts;
|
||||
}
|
||||
|
||||
// Letters, digits, punctuation and spaces only: a character missing from the
|
||||
// fonts would make the renderer download a font from the internet.
|
||||
const printable = (s: string) => s.replace(/[^\p{L}\p{N}\p{P}\p{Zs}+=<>°]/gu, "");
|
||||
|
||||
export async function GET(_req: Request, { params }: { params: Promise<{ slug: string; file: string }> }) {
|
||||
const { slug } = await params;
|
||||
const share = await loadShare(slug);
|
||||
const chart = share?.chart?.chart;
|
||||
if (!share || !chart) return new Response("Not found", { status: 404 });
|
||||
|
||||
const title = printable(share.summary?.title ?? "Születési képlet");
|
||||
const text = printable(shorten(plain(share.summary?.summary ?? ""), 280));
|
||||
const svg = wheelSvg(chart, chart.time_known, WHEEL);
|
||||
const trio = bigThree(chart);
|
||||
|
||||
const image = new ImageResponse(
|
||||
(
|
||||
<div style={{ display: "flex", width: W, height: H, background: "#0d1220", color: "#ece6d8", fontFamily: "Inter" }}>
|
||||
<div style={{ display: "flex", width: WHEEL + 40, height: H, alignItems: "center", justifyContent: "center" }}>
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img
|
||||
src={`data:image/svg+xml;base64,${Buffer.from(svg).toString("base64")}`}
|
||||
width={WHEEL}
|
||||
height={WHEEL}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
style={{
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
flex: 1,
|
||||
padding: "56px 56px 44px 8px",
|
||||
gap: 18,
|
||||
}}
|
||||
>
|
||||
<div style={{ display: "flex", fontSize: 17, fontWeight: 600, letterSpacing: 2.5, color: "#d9b46a" }}>
|
||||
SZÜLETÉSI KÉPLET · RÖVIDEN
|
||||
</div>
|
||||
<div style={{ display: "flex", fontFamily: "Cormorant Garamond", fontSize: 56, lineHeight: 1.05 }}>{title}</div>
|
||||
{text && <div style={{ display: "flex", fontSize: 23, lineHeight: 1.45, color: "#c9cfdc" }}>{text}</div>}
|
||||
<div style={{ display: "flex", marginTop: "auto", gap: 22, fontSize: 21, color: "#c9cfdc" }}>
|
||||
{trio.map((t) => (
|
||||
<div key={t.label} style={{ display: "flex", alignItems: "center", gap: 8 }}>
|
||||
<span style={{ fontFamily: "DejaVu Sans", color: "#d9b46a" }}>
|
||||
{(SIGNS[t.sign]?.glyph ?? "").replace(/︎/g, "")}
|
||||
</span>
|
||||
<span>
|
||||
{t.label === "Aszcendens" ? "Asc" : t.label} {signName(t.sign)}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<div style={{ display: "flex", fontFamily: "Cormorant Garamond", fontSize: 30, color: "#ece6d8" }}>
|
||||
sors<span style={{ color: "#d9b46a" }}>fonalak</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
),
|
||||
{
|
||||
width: W,
|
||||
height: H,
|
||||
fonts: await loadFonts(),
|
||||
// A day at the edge: a revoked link's image goes away from there too.
|
||||
headers: { "Cache-Control": "public, max-age=3600, s-maxage=86400" },
|
||||
},
|
||||
);
|
||||
return image;
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
import { notFound } from "next/navigation";
|
||||
|
||||
import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
||||
import { Rich } from "@/components/Rich";
|
||||
import { ShareVisit } from "@/components/ShareVisit";
|
||||
import { Logo } from "@/components/SiteHeader";
|
||||
import { SIGNS, signName } from "@/lib/astro";
|
||||
import { getMe } from "@/lib/server";
|
||||
import { bigThree, imageVersion, loadShare, plain, shorten, siteUrl } from "@/lib/share";
|
||||
|
||||
type Props = { params: Promise<{ slug: string }> };
|
||||
|
||||
/** Title, description and preview image for Facebook, Messenger, WhatsApp and co. */
|
||||
export async function generateMetadata({ params }: Props): Promise<Metadata> {
|
||||
const { slug } = await params;
|
||||
const share = await loadShare(slug);
|
||||
if (!share?.chart) return { title: "A link nem érhető el", robots: { index: false } };
|
||||
const base = await siteUrl();
|
||||
const title = share.summary?.title ?? "Születési képlet";
|
||||
const description = share.summary?.summary
|
||||
? shorten(plain(share.summary.summary), 200)
|
||||
: "Egy születési képlet a Sorsfonalakon.";
|
||||
const url = `${base}/s/${slug}`;
|
||||
const image = { url: `${base}/s/${slug}/kep/${imageVersion(share)}.png`, width: 1200, height: 630, alt: title };
|
||||
return {
|
||||
title,
|
||||
description,
|
||||
// Personal content: shown when shared, not listed in search engines.
|
||||
robots: { index: false, follow: false },
|
||||
alternates: { canonical: url },
|
||||
openGraph: { type: "website", siteName: "Sorsfonalak", locale: "hu_HU", url, title, description, images: [image] },
|
||||
twitter: { card: "summary_large_image", title, description, images: [image.url] },
|
||||
};
|
||||
}
|
||||
|
||||
/** A shared chart: the wheel and its short summary, open to anyone with the link. */
|
||||
export default async function SharedChartPage({ params }: Props) {
|
||||
const { slug } = await params;
|
||||
const [share, me] = await Promise.all([loadShare(slug), getMe()]);
|
||||
const chart = share?.chart?.chart;
|
||||
if (!share || !chart) notFound();
|
||||
const summary = share.summary;
|
||||
const trio = bigThree(chart);
|
||||
|
||||
return (
|
||||
<>
|
||||
<ShareVisit slug={slug} />
|
||||
{!me && (
|
||||
<header className="site-header">
|
||||
<Logo />
|
||||
<span style={{ flex: 1 }} />
|
||||
<Link href="/belepes" className="btn btn-sm">
|
||||
Belépés
|
||||
</Link>
|
||||
</header>
|
||||
)}
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">Megosztott születési képlet</span>
|
||||
<h1>{summary?.title ?? "Születési képlet"}</h1>
|
||||
</div>
|
||||
|
||||
<section className="chart-layout" aria-label="A megosztott képlet">
|
||||
<div className="card chart-wheel-card">
|
||||
<ChartWheel chart={chart} timeKnown={chart.time_known} />
|
||||
<WheelLegend />
|
||||
</div>
|
||||
<div className="field chart-side">
|
||||
<section className="card summary-card" aria-label="Röviden">
|
||||
<span className="eyebrow">Röviden</span>
|
||||
{summary?.summary ? (
|
||||
<p className="summary-text" lang={summary.language}>
|
||||
<Rich text={summary.summary} />
|
||||
</p>
|
||||
) : (
|
||||
<p className="muted">Ehhez a képlethez még nincs rövid összefoglaló.</p>
|
||||
)}
|
||||
{trio.length > 0 && (
|
||||
<p className="share-trio">
|
||||
{trio.map((t) => (
|
||||
<span key={t.label}>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{SIGNS[t.sign]?.glyph}
|
||||
</span>{" "}
|
||||
{t.label} {signName(t.sign)}
|
||||
</span>
|
||||
))}
|
||||
</p>
|
||||
)}
|
||||
{!chart.time_known && (
|
||||
<p className="hint">A születési idő nem ismert, ezért a képleten nincsenek házak és Aszcendens.</p>
|
||||
)}
|
||||
</section>
|
||||
<section className="card share-cta">
|
||||
<h2>És a te képleted mit mutat?</h2>
|
||||
<p className="muted">
|
||||
Add meg a születési adataidat, és megkapod a saját képletedet a rövid összefoglalóval együtt, ingyen.
|
||||
</p>
|
||||
<Link href={me ? "/keplet" : "/belepes"} className="btn btn-primary">
|
||||
{me ? "A saját képletem" : "Elkészítem a sajátomat"}
|
||||
</Link>
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
<p className="hint">
|
||||
Ezt a képletet a tulajdonosa osztotta meg, név és születési adatok nélkül. A szöveget mesterséges intelligencia
|
||||
írta a képlet alapján.
|
||||
</p>
|
||||
</main>
|
||||
</>
|
||||
);
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,187 @@
|
||||
Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
|
||||
Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
|
||||
|
||||
|
||||
Bitstream Vera Fonts Copyright
|
||||
------------------------------
|
||||
|
||||
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
|
||||
a trademark of Bitstream, Inc.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of the fonts accompanying this license ("Fonts") and associated
|
||||
documentation files (the "Font Software"), to reproduce and distribute the
|
||||
Font Software, including without limitation the rights to use, copy, merge,
|
||||
publish, distribute, and/or sell copies of the Font Software, and to permit
|
||||
persons to whom the Font Software is furnished to do so, subject to the
|
||||
following conditions:
|
||||
|
||||
The above copyright and trademark notices and this permission notice shall
|
||||
be included in all copies of one or more of the Font Software typefaces.
|
||||
|
||||
The Font Software may be modified, altered, or added to, and in particular
|
||||
the designs of glyphs or characters in the Fonts may be modified and
|
||||
additional glyphs or characters may be added to the Fonts, only if the fonts
|
||||
are renamed to names not containing either the words "Bitstream" or the word
|
||||
"Vera".
|
||||
|
||||
This License becomes null and void to the extent applicable to Fonts or Font
|
||||
Software that has been modified and is distributed under the "Bitstream
|
||||
Vera" names.
|
||||
|
||||
The Font Software may be sold as part of a larger software package but no
|
||||
copy of one or more of the Font Software typefaces may be sold by itself.
|
||||
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
|
||||
TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
|
||||
FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
|
||||
ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
|
||||
THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
|
||||
FONT SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the names of Gnome, the Gnome
|
||||
Foundation, and Bitstream Inc., shall not be used in advertising or
|
||||
otherwise to promote the sale, use or other dealings in this Font Software
|
||||
without prior written authorization from the Gnome Foundation or Bitstream
|
||||
Inc., respectively. For further information, contact: fonts at gnome dot
|
||||
org.
|
||||
|
||||
Arev Fonts Copyright
|
||||
------------------------------
|
||||
|
||||
Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the fonts accompanying this license ("Fonts") and
|
||||
associated documentation files (the "Font Software"), to reproduce
|
||||
and distribute the modifications to the Bitstream Vera Font Software,
|
||||
including without limitation the rights to use, copy, merge, publish,
|
||||
distribute, and/or sell copies of the Font Software, and to permit
|
||||
persons to whom the Font Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright and trademark notices and this permission notice
|
||||
shall be included in all copies of one or more of the Font Software
|
||||
typefaces.
|
||||
|
||||
The Font Software may be modified, altered, or added to, and in
|
||||
particular the designs of glyphs or characters in the Fonts may be
|
||||
modified and additional glyphs or characters may be added to the
|
||||
Fonts, only if the fonts are renamed to names not containing either
|
||||
the words "Tavmjong Bah" or the word "Arev".
|
||||
|
||||
This License becomes null and void to the extent applicable to Fonts
|
||||
or Font Software that has been modified and is distributed under the
|
||||
"Tavmjong Bah Arev" names.
|
||||
|
||||
The Font Software may be sold as part of a larger software package but
|
||||
no copy of one or more of the Font Software typefaces may be sold by
|
||||
itself.
|
||||
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
|
||||
TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of Tavmjong Bah shall not
|
||||
be used in advertising or otherwise to promote the sale, use or other
|
||||
dealings in this Font Software without prior written authorization
|
||||
from Tavmjong Bah. For further information, contact: tavmjong @ free
|
||||
. fr.
|
||||
|
||||
TeX Gyre DJV Math
|
||||
-----------------
|
||||
Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
|
||||
|
||||
Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski
|
||||
(on behalf of TeX users groups) are in public domain.
|
||||
|
||||
Letters imported from Euler Fraktur from AMSfonts are (c) American
|
||||
Mathematical Society (see below).
|
||||
Bitstream Vera Fonts Copyright
|
||||
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera
|
||||
is a trademark of Bitstream, Inc.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of the fonts accompanying this license (“Fonts”) and associated
|
||||
documentation
|
||||
files (the “Font Software”), to reproduce and distribute the Font Software,
|
||||
including without limitation the rights to use, copy, merge, publish,
|
||||
distribute,
|
||||
and/or sell copies of the Font Software, and to permit persons to whom
|
||||
the Font Software is furnished to do so, subject to the following
|
||||
conditions:
|
||||
|
||||
The above copyright and trademark notices and this permission notice
|
||||
shall be
|
||||
included in all copies of one or more of the Font Software typefaces.
|
||||
|
||||
The Font Software may be modified, altered, or added to, and in particular
|
||||
the designs of glyphs or characters in the Fonts may be modified and
|
||||
additional
|
||||
glyphs or characters may be added to the Fonts, only if the fonts are
|
||||
renamed
|
||||
to names not containing either the words “Bitstream” or the word “Vera”.
|
||||
|
||||
This License becomes null and void to the extent applicable to Fonts or
|
||||
Font Software
|
||||
that has been modified and is distributed under the “Bitstream Vera”
|
||||
names.
|
||||
|
||||
The Font Software may be sold as part of a larger software package but
|
||||
no copy
|
||||
of one or more of the Font Software typefaces may be sold by itself.
|
||||
|
||||
THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
|
||||
TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
|
||||
FOUNDATION
|
||||
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL,
|
||||
SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
|
||||
ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
|
||||
INABILITY TO USE
|
||||
THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
Except as contained in this notice, the names of GNOME, the GNOME
|
||||
Foundation,
|
||||
and Bitstream Inc., shall not be used in advertising or otherwise to promote
|
||||
the sale, use or other dealings in this Font Software without prior written
|
||||
authorization from the GNOME Foundation or Bitstream Inc., respectively.
|
||||
For further information, contact: fonts at gnome dot org.
|
||||
|
||||
AMSFonts (v. 2.2) copyright
|
||||
|
||||
The PostScript Type 1 implementation of the AMSFonts produced by and
|
||||
previously distributed by Blue Sky Research and Y&Y, Inc. are now freely
|
||||
available for general use. This has been accomplished through the
|
||||
cooperation
|
||||
of a consortium of scientific publishers with Blue Sky Research and Y&Y.
|
||||
Members of this consortium include:
|
||||
|
||||
Elsevier Science IBM Corporation Society for Industrial and Applied
|
||||
Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS)
|
||||
|
||||
In order to assure the authenticity of these fonts, copyright will be
|
||||
held by
|
||||
the American Mathematical Society. This is not meant to restrict in any way
|
||||
the legitimate use of the fonts, such as (but not limited to) electronic
|
||||
distribution of documents containing these fonts, inclusion of these fonts
|
||||
into other public domain or commercial font collections or computer
|
||||
applications, use of the outline data to create derivative fonts and/or
|
||||
faces, etc. However, the AMS does require that the AMS copyright notice be
|
||||
removed from any derivative versions of the fonts which have been altered in
|
||||
any way. In addition, to ensure the fidelity of TeX documents using Computer
|
||||
Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces,
|
||||
has requested that any alterations which yield different font metrics be
|
||||
given a different name.
|
||||
|
||||
$Id$
|
||||
@@ -0,0 +1,93 @@
|
||||
Copyright 2015 the Cormorant Project Authors (github.com/CatharsisFonts/Cormorant)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -0,0 +1,93 @@
|
||||
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -0,0 +1,5 @@
|
||||
Fonts of the share preview images (`src/app/s/[slug]/kep`), read at run time.
|
||||
|
||||
- Cormorant Garamond SemiBold, Inter Regular and SemiBold: static instances from
|
||||
Google Fonts, SIL Open Font License (LICENSE-OFL-*.txt).
|
||||
- DejaVu Sans 2.37: the zodiac and planet glyphs (LICENSE-DejaVu.txt).
|
||||
@@ -9,6 +9,7 @@ import { AnalysisLoading } from "./AnalysisLoading";
|
||||
import { RegenerateButton } from "./RegenerateButton";
|
||||
import { RetryNotice } from "./RetryNotice";
|
||||
import { Rich } from "./Rich";
|
||||
import { ShareChart } from "./ShareChart";
|
||||
import { openTab } from "./Tabs";
|
||||
|
||||
const POLL_MS = 3000;
|
||||
@@ -24,6 +25,7 @@ export function ChartSummary({
|
||||
initial,
|
||||
detailedDone = false,
|
||||
isAdmin = false,
|
||||
shareRewardGranted = false,
|
||||
}: {
|
||||
chartId: string;
|
||||
initial: Analysis | null;
|
||||
@@ -31,6 +33,8 @@ export function ChartSummary({
|
||||
detailedDone?: boolean;
|
||||
/** Admins can write the summary again. */
|
||||
isAdmin?: boolean;
|
||||
/** The free analysis for sharing is used up. */
|
||||
shareRewardGranted?: boolean;
|
||||
}) {
|
||||
const [summary, setSummary] = useState<Analysis | null>(initial);
|
||||
const [gaveUp, setGaveUp] = useState(false);
|
||||
@@ -81,6 +85,7 @@ export function ChartSummary({
|
||||
<p className="summary-text" lang={summary?.language}>
|
||||
<Rich text={content.summary ?? ""} />
|
||||
</p>
|
||||
<ShareChart chartId={chartId} rewardGranted={shareRewardGranted} />
|
||||
<a
|
||||
href="#elemzes"
|
||||
className="summary-more"
|
||||
|
||||
@@ -0,0 +1,152 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
|
||||
interface Share {
|
||||
id: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
function ShareIcon() {
|
||||
return (
|
||||
<svg viewBox="0 0 24 24" width="20" height="20" aria-hidden="true" fill="none" stroke="currentColor" strokeWidth="1.8">
|
||||
<circle cx="18" cy="5" r="2.6" />
|
||||
<circle cx="6" cy="12" r="2.6" />
|
||||
<circle cx="18" cy="19" r="2.6" />
|
||||
<path d="M8.3 10.8l7.4-4.4M8.3 13.2l7.4 4.4" strokeLinecap="round" />
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Share link of a chart with its short summary: copy, Facebook, the phone's
|
||||
* share menu, revoke. The first visit by someone else earns one free natal
|
||||
* analysis, once per user (`rewardGranted`: already received).
|
||||
*/
|
||||
export function ShareChart({ chartId, rewardGranted = false }: { chartId: string; rewardGranted?: boolean }) {
|
||||
const [share, setShare] = useState<Share | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [copied, setCopied] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [revoked, setRevoked] = useState(false);
|
||||
|
||||
async function open() {
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
try {
|
||||
setShare(await api<Share>("/shares", { body: { kind: "chart", target_id: chartId } }));
|
||||
setRevoked(false);
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function copy() {
|
||||
if (!share) return;
|
||||
try {
|
||||
await navigator.clipboard.writeText(share.url);
|
||||
setCopied(true);
|
||||
setTimeout(() => setCopied(false), 2000);
|
||||
} catch {
|
||||
setError("Nem sikerült másolni; jelöld ki a linket, és másold kézzel.");
|
||||
}
|
||||
}
|
||||
|
||||
async function nativeShare() {
|
||||
if (!share) return;
|
||||
try {
|
||||
await navigator.share({ url: share.url });
|
||||
} catch {
|
||||
// closed by the user
|
||||
}
|
||||
}
|
||||
|
||||
async function revoke() {
|
||||
if (!share || !window.confirm("Visszavonod a linket? Aki megkapta, többé nem tudja megnyitni.")) return;
|
||||
setBusy(true);
|
||||
try {
|
||||
await api(`/shares/${share.id}`, { method: "DELETE" });
|
||||
setShare(null);
|
||||
setRevoked(true);
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (!share) {
|
||||
return (
|
||||
<div className="share">
|
||||
<button type="button" className="share-button" onClick={open} disabled={busy} aria-busy={busy}>
|
||||
<span className="share-icon">
|
||||
<ShareIcon />
|
||||
</span>
|
||||
<span className="share-button-text">
|
||||
<strong>{busy ? "Link készül…" : "Oszd meg a képleted"}</strong>
|
||||
<small>
|
||||
{rewardGranted
|
||||
? "Küldd el a barátaidnak, vagy tedd ki Facebookra"
|
||||
: "+1 ajándék elemzés jár érte, ha valaki megnézi"}
|
||||
</small>
|
||||
</span>
|
||||
</button>
|
||||
{revoked && <p className="hint">A linket visszavontad.</p>}
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const facebook = `https://www.facebook.com/sharer/sharer.php?u=${encodeURIComponent(share.url)}`;
|
||||
return (
|
||||
<div className="share share-open">
|
||||
<p className="hint">
|
||||
A linken a képleted rajza és ez az összefoglaló látszik, név és születési adatok nélkül. Bárki megnyithatja,
|
||||
akinek elküldöd.
|
||||
</p>
|
||||
<p className="share-fine">
|
||||
{rewardGranted
|
||||
? "Az ajándék elemzést már megkaptad. Köszönjük, hogy megosztottad!"
|
||||
: "Ajándék képletelemzés egyszer jár: amikor valaki más először megnyitja a linkedet. A saját megnyitásod nem számít."}
|
||||
</p>
|
||||
<div className="share-link">
|
||||
<input
|
||||
className="inp"
|
||||
readOnly
|
||||
value={share.url}
|
||||
aria-label="Megosztási link"
|
||||
onFocus={(e) => e.currentTarget.select()}
|
||||
/>
|
||||
<button type="button" className="btn btn-sm" onClick={copy}>
|
||||
{copied ? "Kimásolva" : "Másolás"}
|
||||
</button>
|
||||
</div>
|
||||
<div className="form-actions">
|
||||
<a className="btn btn-sm btn-primary" href={facebook} target="_blank" rel="noopener noreferrer">
|
||||
Megosztás Facebookon
|
||||
</a>
|
||||
{typeof navigator !== "undefined" && "share" in navigator && (
|
||||
<button type="button" className="btn btn-sm" onClick={nativeShare}>
|
||||
Küldés…
|
||||
</button>
|
||||
)}
|
||||
<button type="button" className="btn btn-sm btn-ghost" onClick={revoke} disabled={busy}>
|
||||
Link visszavonása
|
||||
</button>
|
||||
</div>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect } from "react";
|
||||
|
||||
/**
|
||||
* Reports a visit of the share page from the visitor's browser. Link preview
|
||||
* robots do not run scripts, so only people are counted (the backend also
|
||||
* leaves out the sharer).
|
||||
*/
|
||||
export function ShareVisit({ slug }: { slug: string }) {
|
||||
useEffect(() => {
|
||||
const key = `share-visit:${slug}`;
|
||||
try {
|
||||
if (sessionStorage.getItem(key)) return;
|
||||
sessionStorage.setItem(key, "1");
|
||||
} catch {
|
||||
// storage blocked: report anyway
|
||||
}
|
||||
fetch(`/api/v1/public/shares/${slug}/visit`, { method: "POST", credentials: "same-origin" }).catch(() => {});
|
||||
}, [slug]);
|
||||
return null;
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
// Public share links (`/s/<slug>`): loading the shared content and the
|
||||
// texts of the page, its link preview and its preview image.
|
||||
import "server-only";
|
||||
|
||||
import { headers } from "next/headers";
|
||||
import { cache } from "react";
|
||||
|
||||
import { BACKEND_URL } from "./server";
|
||||
import type { ChartResult } from "./types";
|
||||
|
||||
export interface PublicSummary {
|
||||
id: string;
|
||||
language: string;
|
||||
title: string | null;
|
||||
summary: string | null;
|
||||
completed_at: string | null;
|
||||
}
|
||||
|
||||
/** `GET /v1/public/shares/{slug}` of a shared chart. */
|
||||
export interface PublicShare {
|
||||
kind: "chart" | "synastry" | "analysis";
|
||||
title: string | null;
|
||||
created_at: string;
|
||||
chart?: { label: string; chart: ChartResult & { time_known: boolean } };
|
||||
summary?: PublicSummary | null;
|
||||
}
|
||||
|
||||
const SLUG = /^[A-Za-z0-9_-]{8,64}$/;
|
||||
|
||||
/** Cache tag of the shared content; revoking a link clears it (see the /api/v1 proxy). */
|
||||
export const SHARES_TAG = "shares";
|
||||
|
||||
/**
|
||||
* The shared content, or `null` if the link is unknown or revoked. Kept for
|
||||
* five minutes, so robots opening the page again and again do not reach the
|
||||
* backend; one backend call per request at most.
|
||||
*/
|
||||
export const loadShare = cache(async (slug: string): Promise<PublicShare | null> => {
|
||||
if (!SLUG.test(slug)) return null;
|
||||
const res = await fetch(`${BACKEND_URL}/v1/public/shares/${slug}`, {
|
||||
next: { revalidate: 300, tags: [SHARES_TAG] },
|
||||
});
|
||||
if (res.status === 404) return null;
|
||||
if (!res.ok) throw new Error(`share ${slug}: HTTP ${res.status}`);
|
||||
return (await res.json()) as PublicShare;
|
||||
});
|
||||
|
||||
/** The site's own address, for absolute links in the preview tags. */
|
||||
export async function siteUrl(): Promise<string> {
|
||||
const fixed = process.env.PUBLIC_BASE_URL;
|
||||
if (fixed) return fixed.replace(/\/$/, "");
|
||||
const h = await headers();
|
||||
const host = h.get("x-forwarded-host") ?? h.get("host") ?? "localhost:3001";
|
||||
const proto = h.get("x-forwarded-proto") ?? (host.startsWith("localhost") ? "http" : "https");
|
||||
return `${proto}://${host}`;
|
||||
}
|
||||
|
||||
/** Model text without the `**bold**` marks. */
|
||||
export function plain(text: string): string {
|
||||
return text.replace(/\*\*/g, "").replace(/\s+/g, " ").trim();
|
||||
}
|
||||
|
||||
/** At most `max` characters, cut at a word, with an ellipsis. */
|
||||
export function shorten(text: string, max: number): string {
|
||||
if (text.length <= max) return text;
|
||||
const cut = text.slice(0, max - 1);
|
||||
const space = cut.lastIndexOf(" ");
|
||||
return `${(space > max * 0.6 ? cut.slice(0, space) : cut).replace(/[\s,;:–-]+$/, "")}…`;
|
||||
}
|
||||
|
||||
/** Changes whenever the summary is rewritten, so link previews fetch the new image. */
|
||||
export function imageVersion(share: PublicShare): string {
|
||||
const s = share.summary;
|
||||
if (!s) return "kep";
|
||||
const time = s.completed_at ? Date.parse(s.completed_at).toString(36) : "0";
|
||||
return `${s.id.replace(/-/g, "").slice(-8)}${time}`;
|
||||
}
|
||||
|
||||
/** "Nap Nyilas · Hold Bika · Aszcendens Mérleg" (the ascendant only with a known time). */
|
||||
export function bigThree(chart: ChartResult & { time_known: boolean }): { label: string; sign: string }[] {
|
||||
const sign = (id: string) => chart.points.find((p) => p.id === id)?.sign;
|
||||
const asc = chart.angles?.ascendant;
|
||||
const out: { label: string; sign: string }[] = [];
|
||||
const sun = sign("sun");
|
||||
const moon = sign("moon");
|
||||
if (sun) out.push({ label: "Nap", sign: sun });
|
||||
if (moon) out.push({ label: "Hold", sign: moon });
|
||||
if (chart.time_known && typeof asc === "object" && asc) out.push({ label: "Aszcendens", sign: asc.sign });
|
||||
return out;
|
||||
}
|
||||
@@ -21,6 +21,8 @@ export interface Me {
|
||||
persons: PersonSlots;
|
||||
/** The latest main package bought or given (null: none). */
|
||||
package: { id: string; name: string; since: string } | null;
|
||||
/** The free analysis for a shared link is used up (once per user). */
|
||||
share_reward_granted: boolean;
|
||||
}
|
||||
|
||||
/** A package from the catalog (`GET /v1/packages`). */
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
// The chart wheel as a standalone SVG document, for the share preview image.
|
||||
// It reuses the page's <ChartWheel> and turns its element tree into markup
|
||||
// with the colours inlined (no page CSS there).
|
||||
import { Fragment, isValidElement, type ReactElement, type ReactNode } from "react";
|
||||
|
||||
import { ChartWheel, SIZE } from "@/components/ChartWheel";
|
||||
import type { ChartResult } from "@/lib/types";
|
||||
|
||||
// The page's wheel rules (globals.css) with the colour tokens resolved.
|
||||
const STYLE = `
|
||||
.w-ring{fill:none;stroke:#2c3654;stroke-width:1.2}
|
||||
.w-faint{stroke:#1f2740}
|
||||
.w-inner{fill:#0f1426}
|
||||
.w-sign{stroke:#2c3654;stroke-width:1}
|
||||
.w-fire{fill:rgba(227,139,106,.09)}
|
||||
.w-earth{fill:rgba(159,216,176,.07)}
|
||||
.w-air{fill:rgba(217,180,106,.08)}
|
||||
.w-water{fill:rgba(127,176,224,.09)}
|
||||
.w-sign-glyph{fill:#d9b46a;font-family:'DejaVu Sans';font-size:22px}
|
||||
.w-tick,.w-cusp{stroke:#2c3654;stroke-width:1}
|
||||
.w-axis{stroke:#d9b46a;stroke-width:1.8}
|
||||
.w-axis-label{fill:#d9b46a;font-family:Inter;font-weight:600;font-size:14px}
|
||||
.w-house-num{fill:#a3abc0;font-family:Inter;font-size:12px}
|
||||
.w-aspect{stroke-linecap:round}
|
||||
.w-asp-trine{stroke:#7fb0e0}
|
||||
.w-asp-sextile{stroke:#7fb0e0;stroke-dasharray:5 4}
|
||||
.w-asp-square{stroke:#f0a35e}
|
||||
.w-asp-opposition{stroke:#e38b8b}
|
||||
.w-point-tick{stroke:#ece6d8;stroke-width:1.6}
|
||||
.w-leader{stroke:#a3abc0;stroke-width:.7;stroke-opacity:.6}
|
||||
.w-point-glyph{fill:#ece6d8;font-family:'DejaVu Sans';font-size:22px}
|
||||
.w-point-deg{fill:#a3abc0;font-family:Inter;font-size:10.5px}
|
||||
.w-end{fill:#c9cfdc}
|
||||
.w-point-glyph,.w-point-deg,.w-house-num,.w-axis-label{paint-order:stroke;stroke:#111729;stroke-width:4px;stroke-linejoin:round}
|
||||
`;
|
||||
|
||||
// React prop names that are not SVG attributes (or not wanted in the image).
|
||||
const SKIP = new Set(["children", "key", "role", "id"]);
|
||||
|
||||
const escape = (s: string) =>
|
||||
s.replace(/︎/g, "").replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">").replace(/"/g, """);
|
||||
|
||||
function attribute(name: string): string {
|
||||
if (name === "className") return "class";
|
||||
if (name === "viewBox") return name;
|
||||
return name.replace(/[A-Z]/g, (c) => `-${c.toLowerCase()}`);
|
||||
}
|
||||
|
||||
function markup(node: ReactNode): string {
|
||||
if (node === null || node === undefined || typeof node === "boolean") return "";
|
||||
if (typeof node === "string" || typeof node === "number") return escape(String(node));
|
||||
if (Array.isArray(node)) return node.map(markup).join("");
|
||||
if (!isValidElement(node)) return "";
|
||||
const { type, props } = node as ReactElement<Record<string, unknown>>;
|
||||
if (type === Fragment) return markup(props.children as ReactNode);
|
||||
if (typeof type === "function") return markup((type as (p: unknown) => ReactNode)(props));
|
||||
if (typeof type !== "string" || type === "title" || type === "desc") return "";
|
||||
const attrs = Object.entries(props)
|
||||
.filter(([k, v]) => !SKIP.has(k) && !k.startsWith("aria-") && v !== undefined && v !== null && v !== false)
|
||||
.map(([k, v]) => ` ${attribute(k)}="${escape(String(v))}"`)
|
||||
.join("");
|
||||
return `<${type}${attrs}>${markup(props.children as ReactNode)}</${type}>`;
|
||||
}
|
||||
|
||||
/** The wheel as an SVG document of `size` pixels. */
|
||||
export function wheelSvg(chart: ChartResult, timeKnown: boolean, size = SIZE): string {
|
||||
const body = markup(ChartWheel({ chart, timeKnown }))
|
||||
.replace(/^<svg[^>]*>/, "")
|
||||
.replace(/<\/svg>$/, "");
|
||||
return (
|
||||
`<svg xmlns="http://www.w3.org/2000/svg" width="${size}" height="${size}" viewBox="0 0 ${SIZE} ${SIZE}">` +
|
||||
`<style>${STYLE}</style>${body}</svg>`
|
||||
);
|
||||
}
|
||||
@@ -21,6 +21,11 @@ Háttérmunkák a közös PostgreSQL-adatbázis fölött: e-mail-küldés, szöv
|
||||
|
||||
**Szöveges elemzések** (`analyses`, `pending` → `running` → `done`/`failed`)
|
||||
- A backend létrehozza a `pending` sort, és levon egy elemzési egységet. Egy trigger (`NOTIFY analyses`) felébreszti a workert; egyszerre `ANALYSIS_CONCURRENCY` elemzés készül.
|
||||
- **Két sáv**, saját helyekkel, hogy egy rövid szöveg ne várjon a hosszúak mögött:
|
||||
- *gyors sáv* (`QUICK_CONCURRENCY`, alapból 2): előbb a kérdések, aztán a rövid összefoglalók;
|
||||
- *lassú sáv* (`ANALYSIS_CONCURRENCY`, alapból 4): a részletes elemzések és az előrejelzések. Ha nincs ilyen, a szabad hely gyors munkát vesz fel, végül az admin próbafuttatásait.
|
||||
- A 0 kikapcsolja a sávot, így a két sáv külön telepítésként is futhat (például Kubernetesen: egy gyors és egy lassú deployment).
|
||||
- **Több worker** is dolgozhat ugyanabból a sorból: a sorokat `FOR UPDATE SKIP LOCKED` foglalja, egy munkát csak egy worker kap meg. Leálláskor mindegyik csak a saját félbehagyott munkáit adja vissza a sorba, az elakadt (15 percnél régebben futó) munkákat bármelyik visszateszi. Az e-mail-küldés és a takarítás is biztonságos több példányban.
|
||||
- A prompt a tárolt képletből készül (`src/analysis/compact.rs`). Ez egy tömör szöveg, amely csak a pozíciókat tartalmazza: jegyek, fokok, házak, fényszögek, elemek. **Név, születési dátum, idő, hely és koordináta nem megy ki.** Ismeretlen születési időnél nincsenek házak, Aszcendens és MC.
|
||||
- **5 fokos szabály:** ha egy pont legfeljebb 5°-kal (`CUSP_ORB`) a következő ház csúcsa előtt áll, a szöveg már abban a házban adja meg, és odaírja, hogy formálisan az előzőben van („house 11 (on the cusp: 2°00' before it, formally house 10)”). Így olvassák az asztrológusok. A számított ház, a képlet rajza és a táblázatok nem változnak. Ugyanez érvényes az összevetés házátfedéseire, a szolár Aszcendensre, az év urára és a fogyatkozásokra.
|
||||
- A modell OpenRouteren keresztül válaszol, azzal a modellel, amely a sor `model` mezőjében áll. A válasznak kötött JSON-sémát kell követnie (`crates/analysis-prompt`, `PROMPT_VERSION = v3`; ha a sor `prompt_version`-je `v3-r<id>`, a system prompt az admin által szerkesztett `prompt_revisions` sorból jön):
|
||||
@@ -72,7 +77,9 @@ Ugyanazt a radix-elemzést több modellel is megírja, véletlenszerű betűkkel
|
||||
| `OPENROUTER_API_KEY` | – | OpenRouter-kulcs (compose-ban a `.env.secrets` fájlból); nélküle az elemzések várnak |
|
||||
| `OPENROUTER_BASE_URL` | `https://openrouter.ai/api/v1` | |
|
||||
| `PUBLIC_BASE_URL` | – | `HTTP-Referer` fejléc az OpenRouter felé |
|
||||
| `ANALYSIS_CONCURRENCY` | `4` | egyszerre írt elemzések |
|
||||
| `WORKER_TASKS` | `email,cleanup,analyses` | a folyamat feladatai; élesben `worker`: `email,cleanup`, `worker-ai`: `analyses` |
|
||||
| `ANALYSIS_CONCURRENCY` | `4` | lassú sáv: egyszerre írt részletes elemzések és előrejelzések (0: kikapcsolva) |
|
||||
| `QUICK_CONCURRENCY` | `2` | gyors sáv: egyszerre írt rövid összefoglalók és válaszok (0: kikapcsolva) |
|
||||
| `MAX_ANALYSIS_ATTEMPTS` | `3` | ennyi próbálkozás után sikertelen az elemzés (az egység visszajár) |
|
||||
| `BIND_ADDR`, `LOG_FORMAT`, `RUST_LOG` | `0.0.0.0:8082`, `text`, `info` | |
|
||||
|
||||
|
||||
@@ -9,6 +9,13 @@
|
||||
//! Admin test runs of an edited prompt (`prompt_previews`) go through the
|
||||
//! same loop when no analysis is due: one attempt, no credits, no retries.
|
||||
//!
|
||||
//! Two lanes, each with its own slots, so a short text never waits behind
|
||||
//! the long ones: the quick lane writes summaries and answers questions, the
|
||||
//! slow lane writes the detailed analyses and forecasts (and the test runs).
|
||||
//! A free slow slot also takes quick work. A lane of size 0 is off, so the
|
||||
//! lanes can run as separate deployments; several workers may share the
|
||||
//! queue, rows are claimed with `FOR UPDATE SKIP LOCKED`.
|
||||
//!
|
||||
//! Fallback: when the model chosen on the admin page fails twice (or once with
|
||||
//! a permanent error), the default model (`fallback_model`) takes over with a
|
||||
//! fresh set of attempts; only when that fails too is the unit refunded.
|
||||
@@ -29,6 +36,7 @@ use uuid::Uuid;
|
||||
|
||||
use self::openrouter::{Completion, LlmError, OpenRouter};
|
||||
use self::prompt::{Kind, PROMPT_VERSION, Prompt};
|
||||
use self::questions::QuestionJob;
|
||||
|
||||
/// A `running` analysis older than this was left behind by a stopped worker.
|
||||
const STUCK_AFTER_MINUTES: i32 = 15;
|
||||
@@ -101,11 +109,36 @@ pub struct PreviewJob {
|
||||
pub system: String,
|
||||
}
|
||||
|
||||
/// Which analyses a claim may take.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Lane {
|
||||
/// The short summary of a chart (questions are claimed separately).
|
||||
Quick,
|
||||
/// The detailed analyses and the yearly forecast.
|
||||
Slow,
|
||||
}
|
||||
|
||||
impl Lane {
|
||||
fn kinds(self) -> &'static [&'static str] {
|
||||
match self {
|
||||
Lane::Quick => &["summary"],
|
||||
Lane::Slow => &["natal", "synastry", "forecast"],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Slots per lane; 0 turns a lane off.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct Lanes {
|
||||
pub quick: usize,
|
||||
pub slow: usize,
|
||||
}
|
||||
|
||||
pub struct Analyzer {
|
||||
pub db: PgPool,
|
||||
pub llm: OpenRouter,
|
||||
pub max_attempts: i32,
|
||||
pub concurrency: usize,
|
||||
pub lanes: Lanes,
|
||||
/// Analyses and previews being written right now (released on shutdown).
|
||||
running: Mutex<HashSet<Uuid>>,
|
||||
}
|
||||
@@ -117,19 +150,21 @@ pub fn backoff(attempts: i32) -> Duration {
|
||||
}
|
||||
|
||||
impl Analyzer {
|
||||
pub fn new(db: PgPool, llm: OpenRouter, max_attempts: i32, concurrency: usize) -> Self {
|
||||
Self { db, llm, max_attempts, concurrency: concurrency.max(1), running: Mutex::default() }
|
||||
pub fn new(db: PgPool, llm: OpenRouter, max_attempts: i32, lanes: Lanes) -> Self {
|
||||
Self { db, llm, max_attempts, lanes, running: Mutex::default() }
|
||||
}
|
||||
|
||||
/// Takes the next due analysis, if any.
|
||||
pub async fn claim(&self) -> Result<Option<Job>, sqlx::Error> {
|
||||
/// Takes the next due analysis of the lane, if any.
|
||||
pub async fn claim(&self, lane: Lane) -> Result<Option<Job>, sqlx::Error> {
|
||||
let job: Option<Job> = sqlx::query_as(
|
||||
"UPDATE analyses SET status = 'running', started_at = now(), attempts = attempts + 1 \
|
||||
WHERE id = (SELECT id FROM analyses WHERE status = 'pending' AND next_attempt_at <= now() \
|
||||
AND kind = ANY($1) \
|
||||
ORDER BY next_attempt_at LIMIT 1 FOR UPDATE SKIP LOCKED) \
|
||||
RETURNING id, kind, chart_id, synastry_id, forecast_id, language, model, prompt_version, attempts, \
|
||||
fallback_model, on_fallback, started_at",
|
||||
)
|
||||
.bind(lane.kinds())
|
||||
.fetch_optional(&self.db)
|
||||
.await?;
|
||||
if let Some(job) = &job {
|
||||
@@ -530,8 +565,46 @@ impl Analyzer {
|
||||
}
|
||||
}
|
||||
|
||||
/// Work a free slot can take, in order of preference.
|
||||
pub(crate) enum Work {
|
||||
Analysis(Job),
|
||||
Question(QuestionJob),
|
||||
Preview(PreviewJob),
|
||||
}
|
||||
|
||||
impl Analyzer {
|
||||
/// Quick work: a question first (someone is waiting for a short answer),
|
||||
/// then a summary.
|
||||
pub(crate) async fn claim_quick(&self) -> Result<Option<Work>, sqlx::Error> {
|
||||
if let Some(job) = self.claim_question().await? {
|
||||
return Ok(Some(Work::Question(job)));
|
||||
}
|
||||
Ok(self.claim(Lane::Quick).await?.map(Work::Analysis))
|
||||
}
|
||||
|
||||
/// Slow work: a detailed analysis, else quick work, else a test run.
|
||||
pub(crate) async fn claim_slow(&self) -> Result<Option<Work>, sqlx::Error> {
|
||||
if let Some(job) = self.claim(Lane::Slow).await? {
|
||||
return Ok(Some(Work::Analysis(job)));
|
||||
}
|
||||
if let Some(work) = self.claim_quick().await? {
|
||||
return Ok(Some(work));
|
||||
}
|
||||
Ok(self.claim_preview().await?.map(Work::Preview))
|
||||
}
|
||||
|
||||
async fn work(&self, work: Work) {
|
||||
match work {
|
||||
Work::Analysis(job) => self.handle(job).await,
|
||||
Work::Question(job) => self.handle_question(job).await,
|
||||
Work::Preview(job) => self.handle_preview(job).await,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn run(analyzer: Arc<Analyzer>, poll: Duration, stop: watch::Receiver<bool>) {
|
||||
let slots = Arc::new(Semaphore::new(analyzer.concurrency));
|
||||
let quick = Arc::new(Semaphore::new(analyzer.lanes.quick));
|
||||
let slow = Arc::new(Semaphore::new(analyzer.lanes.slow));
|
||||
let mut tasks = tokio::task::JoinSet::new();
|
||||
let mut listener = crate::listen(&analyzer.db, "analyses").await;
|
||||
let mut last_requeue: Option<Instant> = None;
|
||||
@@ -547,50 +620,27 @@ pub async fn run(analyzer: Arc<Analyzer>, poll: Duration, stop: watch::Receiver<
|
||||
Err(e) => tracing::error!(error = %e, "requeueing analyses"),
|
||||
}
|
||||
}
|
||||
// Fill the free slots.
|
||||
while let Ok(permit) = slots.clone().try_acquire_owned() {
|
||||
// Questions first: someone is waiting for a short answer.
|
||||
match analyzer.claim_question().await {
|
||||
Ok(Some(job)) => {
|
||||
let analyzer = analyzer.clone();
|
||||
tasks.spawn(async move {
|
||||
analyzer.handle_question(job).await;
|
||||
drop(permit);
|
||||
});
|
||||
continue;
|
||||
}
|
||||
Ok(None) => {}
|
||||
Err(e) => {
|
||||
tracing::error!(error = %e, "claiming a question");
|
||||
break;
|
||||
}
|
||||
}
|
||||
match analyzer.claim().await {
|
||||
Ok(Some(job)) => {
|
||||
let analyzer = analyzer.clone();
|
||||
tasks.spawn(async move {
|
||||
analyzer.handle(job).await;
|
||||
drop(permit);
|
||||
});
|
||||
}
|
||||
// No analysis is due: a prompt test run, if one waits.
|
||||
Ok(None) => match analyzer.claim_preview().await {
|
||||
Ok(Some(job)) => {
|
||||
// Fill the free slots: the quick lane first, then the slow one.
|
||||
for lane in [Lane::Quick, Lane::Slow] {
|
||||
let slots = if lane == Lane::Quick { &quick } else { &slow };
|
||||
while let Ok(permit) = slots.clone().try_acquire_owned() {
|
||||
let claimed = match lane {
|
||||
Lane::Quick => analyzer.claim_quick().await,
|
||||
Lane::Slow => analyzer.claim_slow().await,
|
||||
};
|
||||
match claimed {
|
||||
Ok(Some(work)) => {
|
||||
let analyzer = analyzer.clone();
|
||||
tasks.spawn(async move {
|
||||
analyzer.handle_preview(job).await;
|
||||
analyzer.work(work).await;
|
||||
drop(permit);
|
||||
});
|
||||
}
|
||||
Ok(None) => break,
|
||||
Err(e) => {
|
||||
tracing::error!(error = %e, "claiming a prompt preview");
|
||||
tracing::error!(error = %e, ?lane, "claiming work");
|
||||
break;
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
tracing::error!(error = %e, "claiming an analysis");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,38 @@ use std::time::Duration;
|
||||
use anyhow::Context;
|
||||
use lettre::message::Mailbox;
|
||||
|
||||
/// The jobs a worker process runs (`WORKER_TASKS`, comma-separated).
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub struct Tasks {
|
||||
/// Sending the e-mails of `email_outbox`.
|
||||
pub email: bool,
|
||||
/// The hourly removal of expired data.
|
||||
pub cleanup: bool,
|
||||
/// Writing the analyses and answers with the LLM (both lanes).
|
||||
pub analyses: bool,
|
||||
}
|
||||
|
||||
impl Tasks {
|
||||
pub const ALL: Tasks = Tasks { email: true, cleanup: true, analyses: true };
|
||||
|
||||
pub fn parse(raw: &str) -> anyhow::Result<Self> {
|
||||
let mut tasks = Tasks { email: false, cleanup: false, analyses: false };
|
||||
for name in raw.split(',').map(str::trim).filter(|n| !n.is_empty()) {
|
||||
match name {
|
||||
"email" => tasks.email = true,
|
||||
"cleanup" => tasks.cleanup = true,
|
||||
"analyses" => tasks.analyses = true,
|
||||
other => anyhow::bail!("unknown task '{other}' in WORKER_TASKS (email, cleanup, analyses)"),
|
||||
}
|
||||
}
|
||||
anyhow::ensure!(tasks != Tasks { email: false, cleanup: false, analyses: false }, "WORKER_TASKS names no task");
|
||||
Ok(tasks)
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Config {
|
||||
/// What this process does; all of it by default.
|
||||
pub tasks: Tasks,
|
||||
pub database_url: String,
|
||||
/// `smtp://host:port` (plain, e.g. Mailpit), `smtp://user:pass@host:587?tls=required`
|
||||
/// (STARTTLS) or `smtps://...` (TLS). Without it, Amazon SES from the AWS
|
||||
@@ -24,8 +55,10 @@ pub struct Config {
|
||||
pub openrouter_base_url: String,
|
||||
/// Frontend address, sent to OpenRouter as `HTTP-Referer`.
|
||||
pub public_base_url: Option<String>,
|
||||
/// Analyses written at the same time.
|
||||
/// Detailed analyses and forecasts written at the same time (0: none).
|
||||
pub analysis_concurrency: usize,
|
||||
/// Summaries and answers written at the same time (0: none).
|
||||
pub quick_concurrency: usize,
|
||||
/// After this many failed attempts an analysis fails and is refunded.
|
||||
pub max_analysis_attempts: i32,
|
||||
}
|
||||
@@ -55,6 +88,7 @@ impl Config {
|
||||
},
|
||||
};
|
||||
Ok(Self {
|
||||
tasks: var("WORKER_TASKS").map(|raw| Tasks::parse(&raw)).transpose()?.unwrap_or(Tasks::ALL),
|
||||
database_url: var("DATABASE_URL").context("DATABASE_URL is required")?,
|
||||
smtp_url,
|
||||
smtp_about,
|
||||
@@ -67,6 +101,7 @@ impl Config {
|
||||
.unwrap_or_else(|| crate::analysis::openrouter::DEFAULT_BASE_URL.into()),
|
||||
public_base_url: var("PUBLIC_BASE_URL"),
|
||||
analysis_concurrency: parsed("ANALYSIS_CONCURRENCY", 4)?,
|
||||
quick_concurrency: parsed("QUICK_CONCURRENCY", 2)?,
|
||||
max_analysis_attempts: parsed("MAX_ANALYSIS_ATTEMPTS", 3)?,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
//! * hourly cleanup of expired sessions, tokens, invites and old e-mails
|
||||
//! * writing the requested text analyses with an LLM (OpenRouter)
|
||||
//!
|
||||
//! `WORKER_TASKS` (e.g. `email,cleanup` or `analyses`) picks the jobs of one
|
||||
//! process, so they can run in separate containers; all of them by default.
|
||||
//!
|
||||
//! Configuration: see [`config::Config`]; plus `BIND_ADDR` (default
|
||||
//! `0.0.0.0:8082`, only `/healthz`), `LOG_FORMAT` and `RUST_LOG`.
|
||||
//! `worker healthcheck` performs a local health check (for Docker);
|
||||
@@ -91,7 +94,10 @@ async fn main() -> anyhow::Result<()> {
|
||||
|
||||
let (stop_tx, stop) = watch::channel(false);
|
||||
let mut jobs = tokio::task::JoinSet::new();
|
||||
let tasks = config.tasks;
|
||||
tracing::info!(email = tasks.email, cleanup = tasks.cleanup, analyses = tasks.analyses, "worker tasks");
|
||||
match &config.smtp_url {
|
||||
_ if !tasks.email => {}
|
||||
Some(url) => {
|
||||
let delivery = email::Delivery::new(pool.clone(), email::Mailer::smtp(url)?, &config);
|
||||
let via = config.smtp_about.clone().unwrap_or_else(|| "SMTP_URL".into());
|
||||
@@ -101,17 +107,24 @@ async fn main() -> anyhow::Result<()> {
|
||||
None => tracing::warn!("neither SMTP_URL nor SES credentials are set: e-mails stay in the outbox"),
|
||||
}
|
||||
match &config.openrouter_api_key {
|
||||
_ if !tasks.analyses => {}
|
||||
Some(key) => {
|
||||
let llm =
|
||||
analysis::openrouter::OpenRouter::new(&config.openrouter_base_url, key, config.public_base_url.clone());
|
||||
let analyzer =
|
||||
analysis::Analyzer::new(pool.clone(), llm, config.max_analysis_attempts, config.analysis_concurrency);
|
||||
tracing::info!(concurrency = analyzer.concurrency, "analyses enabled");
|
||||
jobs.spawn(analysis::run(Arc::new(analyzer), config.poll_interval, stop.clone()));
|
||||
let lanes = analysis::Lanes { quick: config.quick_concurrency, slow: config.analysis_concurrency };
|
||||
if lanes.quick + lanes.slow == 0 {
|
||||
tracing::warn!("QUICK_CONCURRENCY and ANALYSIS_CONCURRENCY are both 0: this worker writes no analyses");
|
||||
} else {
|
||||
let analyzer = analysis::Analyzer::new(pool.clone(), llm, config.max_analysis_attempts, lanes);
|
||||
tracing::info!(quick = lanes.quick, slow = lanes.slow, "analyses enabled");
|
||||
jobs.spawn(analysis::run(Arc::new(analyzer), config.poll_interval, stop.clone()));
|
||||
}
|
||||
}
|
||||
None => tracing::warn!("OPENROUTER_API_KEY is not set: analyses stay pending"),
|
||||
}
|
||||
jobs.spawn(cleanup::run(pool.clone(), stop.clone()));
|
||||
if tasks.cleanup {
|
||||
jobs.spawn(cleanup::run(pool.clone(), stop.clone()));
|
||||
}
|
||||
|
||||
let app = Router::new().route("/healthz", get(healthz)).with_state(pool);
|
||||
let listener = tokio::net::TcpListener::bind(addr).await.with_context(|| format!("binding {addr}"))?;
|
||||
|
||||
@@ -223,6 +223,16 @@ async fn cleanup_removes_only_expired_data(db: PgPool) {
|
||||
|
||||
// --- analyses ----------------------------------------------------------------------------
|
||||
|
||||
#[test]
|
||||
fn worker_tasks_are_chosen_by_name() {
|
||||
use crate::config::Tasks;
|
||||
let mail = Tasks::parse("email, cleanup").unwrap();
|
||||
assert_eq!(mail, Tasks { email: true, cleanup: true, analyses: false });
|
||||
assert_eq!(Tasks::parse("analyses").unwrap(), Tasks { email: false, cleanup: false, analyses: true });
|
||||
assert!(Tasks::parse("emails").is_err());
|
||||
assert!(Tasks::parse(" , ").is_err());
|
||||
}
|
||||
|
||||
mod analyses {
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
@@ -235,7 +245,7 @@ mod analyses {
|
||||
|
||||
use crate::analysis::openrouter::OpenRouter;
|
||||
use crate::analysis::prompt::{Kind, schema, validate};
|
||||
use crate::analysis::{Analyzer, backoff};
|
||||
use crate::analysis::{Analyzer, Lane, Lanes, backoff};
|
||||
|
||||
/// Scripted replies (then the last one forever) and the requests received.
|
||||
#[derive(Clone, Default)]
|
||||
@@ -337,11 +347,11 @@ mod analyses {
|
||||
}
|
||||
|
||||
fn analyzer(db: &PgPool, base_url: &str) -> Analyzer {
|
||||
Analyzer::new(db.clone(), OpenRouter::new(base_url, "test-key", None), 3, 2)
|
||||
Analyzer::new(db.clone(), OpenRouter::new(base_url, "test-key", None), 3, Lanes { quick: 1, slow: 2 })
|
||||
}
|
||||
|
||||
async fn run_once(a: &Analyzer) -> bool {
|
||||
match a.claim().await.unwrap() {
|
||||
match a.claim(Lane::Slow).await.unwrap() {
|
||||
Some(job) => {
|
||||
a.handle(job).await;
|
||||
true
|
||||
@@ -464,10 +474,10 @@ mod analyses {
|
||||
let a = analyzer(&db, &url);
|
||||
|
||||
// the analysis goes first; the preview only when nothing else is due
|
||||
let job = a.claim().await.unwrap().expect("the analysis");
|
||||
let job = a.claim(Lane::Slow).await.unwrap().expect("the analysis");
|
||||
assert_eq!(job.id, analysis);
|
||||
a.handle(job).await;
|
||||
assert!(a.claim().await.unwrap().is_none());
|
||||
assert!(a.claim(Lane::Slow).await.unwrap().is_none());
|
||||
let job = a.claim_preview().await.unwrap().expect("the preview");
|
||||
a.handle_preview(job).await;
|
||||
let (status, title, model, credits): (String, Option<String>, Option<String>, i64) = sqlx::query_as(
|
||||
@@ -811,7 +821,7 @@ mod analyses {
|
||||
let id = request_analysis(&db, &s).await;
|
||||
let (_, url) = fake_openrouter(vec![reply(&content(Kind::Natal))]).await;
|
||||
let a = analyzer(&db, &url);
|
||||
let job = a.claim().await.unwrap().expect("a job");
|
||||
let job = a.claim(Lane::Slow).await.unwrap().expect("a job");
|
||||
// an admin restarts it while the worker is still writing it
|
||||
sqlx::query("UPDATE analyses SET status = 'pending', started_at = NULL, attempts = 0 WHERE id = $1")
|
||||
.bind(id)
|
||||
@@ -829,6 +839,40 @@ mod analyses {
|
||||
assert_eq!(status, "done");
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn summaries_have_their_own_lane(db: PgPool) {
|
||||
let s = setup(&db).await;
|
||||
let natal = request_analysis(&db, &s).await;
|
||||
let summary = |id: Uuid| {
|
||||
sqlx::query(
|
||||
"INSERT INTO analyses (id, kind, chart_id, requested_by, language, model, prompt_version, cache_key, \
|
||||
credits_charged) \
|
||||
VALUES ($1, 'summary', $2, $3, 'hu', 'test/model', 'v1', 'key', 0)",
|
||||
)
|
||||
.bind(id)
|
||||
.bind(s.chart)
|
||||
.bind(s.user)
|
||||
};
|
||||
let first = Uuid::now_v7();
|
||||
summary(first).execute(&db).await.unwrap();
|
||||
let a = analyzer(&db, "http://127.0.0.1:9");
|
||||
|
||||
// the quick lane takes the summary, never the detailed analysis
|
||||
let id_of = |work: Option<crate::analysis::Work>| match work {
|
||||
Some(crate::analysis::Work::Analysis(job)) => Some(job.id),
|
||||
Some(_) => panic!("not an analysis"),
|
||||
None => None,
|
||||
};
|
||||
assert_eq!(id_of(a.claim_quick().await.unwrap()), Some(first));
|
||||
assert_eq!(id_of(a.claim_quick().await.unwrap()), None);
|
||||
// the slow lane prefers the detailed analysis, then helps with quick work
|
||||
let second = Uuid::now_v7();
|
||||
summary(second).execute(&db).await.unwrap();
|
||||
assert_eq!(id_of(a.claim_slow().await.unwrap()), Some(natal));
|
||||
assert_eq!(id_of(a.claim_slow().await.unwrap()), Some(second));
|
||||
assert_eq!(id_of(a.claim_slow().await.unwrap()), None);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn answers_a_question_about_a_relationship_with_both_charts(db: PgPool) {
|
||||
let s = setup(&db).await;
|
||||
|
||||
Reference in New Issue
Block a user