From 82df0bd6a0a3a1cb102eb2941b50a883364ffc0a Mon Sep 17 00:00:00 2001 From: Sean Dean <254259913+distronode-com@users.noreply.github.com> Date: Wed, 9 Sep 2026 18:09:22 -0400 Subject: [PATCH 001/250] i18n: ship Canadian French as its own locale, not as a fallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `fr-CA` currently resolves to the France copy, and the differences are not stylistic. `courriel` rather than `e-mail`, `reporter`/`report` rather than `reprogrammer`/`reprogrammation`, `renseignements personnels` rather than `données personnelles` (the Quebec statutory term, so the wrong one is wrong in a legal sense rather than a register one), and no space before `!` `?` `;` where France puts one. CLDR itself disagrees on an abbreviation: July is `juill.` in fr-CA against `juil.` in fr. It is the first REGIONAL locale, which is the only structural thing here: the matcher already prefers an exact tag, so `fr-FR` and plain `fr` are untouched by this file existing. TestResolve now pins that in both directions rather than only the new one, since the half that would break silently is the French visitor who never asked for any of this. The three guards the other eight locales already pass apply unchanged — same key set as English, matching printf verbs, and date tables cross-checked against CLDR — so the structure is verified even though the wording is not. ⚠️ The copy is an unreviewed draft, like every non-English locale here. Nobody who speaks Canadian French has read it. That is said plainly in the CHANGELOG so a correction arrives as an ordinary pull request rather than as a bug report. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 13 +++ CLAUDE.md | 2 +- CONTRIBUTING.md | 2 +- docs/ARCHITECTURE.md | 13 ++- internal/i18n/i18n_test.go | 7 ++ internal/i18n/locales/fr-CA.json | 160 +++++++++++++++++++++++++++++++ 6 files changed, 194 insertions(+), 3 deletions(-) create mode 100644 internal/i18n/locales/fr-CA.json diff --git a/CHANGELOG.md b/CHANGELOG.md index b496eae2..bbf15343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,19 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad `-copy-2`, `-copy-3`, …) slug, and keeps `price_cents`/`currency` verbatim: zeroing a copied price is how a paid meeting quietly starts selling for nothing. Bookings are not copied. +- **Canadian French (`fr-CA`) on the booker-facing surfaces.** A visitor whose browser asks + for `fr-CA` now gets Canadian French rather than the France copy; `fr` and `fr-FR` are + unaffected. It is the first regional locale, and a separate file rather than a fallback + because the differences are real: `courriel` rather than `e-mail`, `reporter`/`report` + rather than `reprogrammer`, `renseignements personnels` (the Quebec statutory term) rather + than `données personnelles`, no space before `!` `?` `;` where France puts one, and CLDR + itself spells July `juill.` here against `juil.` in France. + + ⚠️ **The wording is an unreviewed draft**, like every non-English locale in this + repository: the structure is verified by the same three guards (same keys, printf-verb + parity, date tables cross-checked against CLDR), but no native Canadian French speaker has + read the copy. Corrections are welcome and easy to merge — see CONTRIBUTING. + - **Empty days and minimum-notice gaps now explain themselves** on all three booking surfaces (booking page, manage/reschedule page, embed widget). Closes [#20](https://github.com/Calnode/calnode/issues/20). diff --git a/CLAUDE.md b/CLAUDE.md index 91ab5126..c788374e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -140,7 +140,7 @@ no string plumbing with the Go templates), and admin-authored content (event nam descriptions, questions, custom email copy). Locale is resolved per request from `Accept-Language` + a `?lang=` override + the operator's fallback setting (`internal/handler/i18n.go`), and the booker's locale is stored on the booking so later -reminders match. Ships `en es fr de it pt nl sv`. Full detail: ARCHITECTURE §23. +reminders match. Ships `en es fr fr-CA de it pt nl sv`. Full detail: ARCHITECTURE §23. **Adding a locale = adding `internal/i18n/locales/.json`.** Nothing else. `init()` globs the directory; the switcher, the fallback dropdown and the public API payload all read diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 148c9d24..76870aa3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -74,7 +74,7 @@ prefer additive, nullable/defaulted columns. ## Translations -Calnode ships 8 locales (`en es fr de it pt nl sv`) across the booker-facing surfaces: +Calnode ships 9 locales (`en es fr fr-CA de it pt nl sv`) across the booker-facing surfaces: booking page, manage/reschedule page, embed widget, the four emails, and the calendar invite. The admin UI and the built-in video room are English-only. diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index e91d5db6..d401a8eb 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -1048,7 +1048,18 @@ LLM summary) — the next build; consent-gated (§8.11/§15 of the PRD). ## 23. Languages (i18n) -Calnode ships **8 locales**: `en` (source) · `es` · `fr` · `de` · `it` · `pt` · `nl` · `sv`. +Calnode ships **9 locales**: `en` (source) · `es` · `fr` · `fr-CA` · `de` · `it` · `pt` · `nl` · `sv`. + +`fr-CA` is the first **regional** locale, and it is a separate file rather than a fallback +because the differences are real: `courriel` not `e-mail`, `reporter`/`report` not +`reprogrammer`/`reprogrammation`, `renseignements personnels` never `données personnelles` +(the Quebec statutory term), no space before `!` `?` `;` where France puts one, and CLDR +itself disagrees on one abbreviation — `month_short_jul` is `juill.` in fr-CA and `juil.` in +fr, which is exactly what `TestDateTablesMatchCLDR` exists to catch. Both keep the 24-hour +clock and the day-month `date_format`. Currency and percent take a non-breaking space before +`$` and `%` in Canadian French; no key carries either today, so the rule is recorded here +rather than applied. A visitor sending `fr-FR` or plain `fr` is unaffected — the matcher +picks the exact tag first (pinned in `TestResolve`). ### What is translated, and what is not diff --git a/internal/i18n/i18n_test.go b/internal/i18n/i18n_test.go index 0d0d9ca8..e3afc581 100644 --- a/internal/i18n/i18n_test.go +++ b/internal/i18n/i18n_test.go @@ -37,6 +37,13 @@ func TestResolve(t *testing.T) { {"exact es", "es", "", "es"}, {"exact en", "en-US,en;q=0.9", "", "en"}, {"regional subtag falls back to primary", "es-MX,es;q=0.9", "", "es"}, + // fr-CA is shipped as its own file, so a Canadian browser gets Canadian French + // rather than the France copy — and a French browser is unaffected by its + // existence, which is the half that would break silently. + {"Canadian French resolves to its own locale", "fr-CA,fr;q=0.9", "", "fr-CA"}, + {"European French is unaffected by fr-CA", "fr-FR,fr;q=0.9", "", "fr"}, + {"plain fr is unaffected by fr-CA", "fr", "", "fr"}, + {"fr-CA can be selected by the ?lang override", "en", "fr-CA", "fr-CA"}, {"unsupported language falls back to English", "ja-JP,ja;q=0.9", "", "en"}, {"empty header falls back to English", "", "", "en"}, {"garbage header falls back to English", "not a real header ;;;", "", "en"}, diff --git a/internal/i18n/locales/fr-CA.json b/internal/i18n/locales/fr-CA.json new file mode 100644 index 00000000..d7725081 --- /dev/null +++ b/internal/i18n/locales/fr-CA.json @@ -0,0 +1,160 @@ +{ + "book_by_chat": "Réserver par chat", + "close": "Fermer", + "assistant_greeting": "Bonjour! Dites-moi approximativement quand vous souhaitez nous rencontrer, par exemple « mardi après-midi » ou « la semaine prochaine », et je trouverai un créneau. Vous pouvez aussi utiliser le calendrier.", + "assistant_input_placeholder": "Indiquez vos disponibilités…", + "assistant_input_aria": "Envoyer un message à l'assistant de réservation", + "send": "Envoyer", + "show_more": "Afficher plus", + "show_less": "Afficher moins", + "date_picker_aria": "Sélecteur de date", + "timezone_aria": "Fuseau horaire", + "select_day_hint": "Sélectionnez un jour pour voir les créneaux disponibles.", + "back": "Retour", + "name_label": "Nom", + "name_placeholder": "Votre nom complet", + "email_label": "Courriel", + "email_placeholder": "vous@exemple.com", + "choose_option": "Choisissez une option", + "confirm_booking": "Confirmer la réservation", + "confirming": "Confirmation…", + "booking_confirmed": "Réservation confirmée", + "confirmation_email_sent": "Un courriel de confirmation vous a été envoyé.", + "required_fields_error": "Veuillez remplir tous les champs obligatoires.", + "slot_taken_error": "Ce créneau vient d'être réservé. Veuillez en choisir un autre.", + "booking_failed_error": "La réservation a échoué. Veuillez réessayer.", + "network_error": "Erreur de connexion. Vérifiez votre connexion internet.", + "loading": "Chargement…", + "no_available_times": "Aucun créneau disponible le %s.", + "no_available_times_host": "%[1]s n'a aucun créneau disponible le %[2]s.", + "slot_taken": "déjà réservé", + "all_times_taken": "Tous les horaires de cette journée sont réservés.", + "min_notice_hint": "Les réservations doivent être effectuées au moins %s à l'avance.", + "could_not_load_times": "Impossible de charger les créneaux. Veuillez réessayer.", + "times_shown_in": "Horaires affichés en ", + "payment_received": "Paiement reçu", + "payment_confirmed_sub": "Votre réservation est confirmée; un courriel de confirmation va vous parvenir.", + "assistant_error": "Désolé, une erreur est survenue. Veuillez utiliser le calendrier ci-dessous.", + "assistant_disclosure": "Vous discutez avec un assistant automatisé, pas avec une personne.", + "other": "autre", + "others": "autres", + "list_separator": ", ", + "list_conjunction": " et ", + "language_switcher_aria": "Langue", + "cookie_consent_aria": "Consentement aux cookies", + "cookie_text": "Nous utilisons des cookies analytiques pour comprendre l'utilisation de cette page de réservation; ils ne sont activés qu'avec votre accord.", + "privacy_policy": "Politique de confidentialité", + "decline": "Refuser", + "accept": "Accepter", + "privacy": "Confidentialité", + "terms": "Conditions", + "cookie_settings": "Paramètres des cookies", + "prev_month_aria": "Mois précédent", + "next_month_aria": "Mois suivant", + "demo_public_label": "Démo publique", + "demo_public_text": "les renseignements saisis ici sont visibles par tous et sont réinitialisés automatiquement. N'y saisissez aucun renseignement personnel.", + "demo_view_source": "Voir le code source", + "powered_by": "Propulsé par", + "duration_min": "%d min", + "duration_hour_one": "1 heure", + "duration_hours": "%d heures", + "duration_hr_min": "%d h %d min", + "location_video_meeting": "Visioconférence", + "location_phone": "Appel téléphonique", + "location_in_person": "En personne", + "location_video_call": "Visioconférence", + "manage_booking_title": "Gérer la réservation", + "link_expired_title": "Lien expiré ou invalide", + "link_expired_text": "Ce lien de gestion a expiré ou n'est plus valide. Consultez votre courriel de confirmation pour un lien valide, ou contactez l'organisateur pour en obtenir un nouveau.", + "booking_already_cancelled_title": "Réservation déjà annulée", + "booking_already_cancelled_text": "Cette réservation a été annulée. Pour réserver un nouveau créneau, rendez-vous sur la page de l'événement.", + "scheduled_for": "Prévu le", + "reschedule": "Reporter", + "cancel_booking": "Annuler la réservation", + "select_a_date": "Sélectionnez une date", + "pick_day_hint": "Choisissez un jour dans le calendrier.", + "confirm_reschedule_question": "Confirmer le report?", + "was_label": "Avant", + "now_label": "Maintenant", + "confirm_reschedule": "Confirmer le report", + "rescheduling": "Report en cours…", + "cancel_this_booking_question": "Annuler cette réservation?", + "cancel_booking_notice": "Cette action est irréversible. Un courriel d'annulation vous sera envoyé, ainsi qu'à l'organisateur.", + "reason_optional_label": "Motif (facultatif)", + "reason_placeholder": "ex. conflit d'horaire", + "yes_cancel_booking": "Oui, annuler la réservation", + "cancelling": "Annulation…", + "booking_rescheduled_title": "Réservation reportée", + "booking_rescheduled_prefix": "Votre réservation a été déplacée au ", + "booking_cancelled_title": "Réservation annulée", + "booking_cancelled_text": "Votre réservation a été annulée.", + "slot_no_longer_available_error": "Ce créneau n'est plus disponible. Veuillez en choisir un autre.", + "reschedule_failed_error": "Le report a échoué. Veuillez réessayer.", + "already_cancelled_error": "Cette réservation est déjà annulée.", + "cancellation_failed_error": "L'annulation a échoué. Veuillez réessayer.", + "dow_short_sun": "dim.", + "dow_short_mon": "lun.", + "dow_short_tue": "mar.", + "dow_short_wed": "mer.", + "dow_short_thu": "jeu.", + "dow_short_fri": "ven.", + "dow_short_sat": "sam.", + "month_short_jan": "janv.", + "month_short_feb": "févr.", + "month_short_mar": "mars", + "month_short_apr": "avr.", + "month_short_may": "mai", + "month_short_jun": "juin", + "month_short_jul": "juill.", + "month_short_aug": "août", + "month_short_sep": "sept.", + "month_short_oct": "oct.", + "month_short_nov": "nov.", + "month_short_dec": "déc.", + "clock_format": "24h", + "date_format": "%[1]s %[2]d %[3]s %[4]d", + "email_greeting": "Bonjour %s,", + "email_confirmed_lead": "Votre réservation est confirmée.", + "email_cancelled_lead": "Votre réservation a été annulée.", + "email_rescheduled_lead": "Votre réservation a été reportée.", + "email_reminder_lead": "Ceci est un rappel : votre rendez-vous approche.", + "email_label_event": "Événement", + "email_label_with": "Avec", + "email_label_start": "Début", + "email_label_end": "Fin", + "email_label_when": "Quand", + "email_label_location": "Lieu", + "email_label_reason": "Motif", + "email_label_was": "Avant", + "email_label_now": "Maintenant", + "email_add_to_calendar": "Ajoutez à votre calendrier :", + "email_add_to_calendar_updated": "Ajoutez à votre calendrier (horaire mis à jour) :", + "email_calendar_google": "Google Calendar", + "email_calendar_outlook": "Outlook", + "email_booking_reference": "Référence de la réservation : %s", + "email_manage_link_intro": "Pour reporter ou annuler, rendez-vous sur :", + "email_manage_link_intro_reschedule": "Pour reporter ou annuler à nouveau, rendez-vous sur :", + "email_cancel_link_intro": "Pour annuler, rendez-vous sur :", + "email_rebook_intro": "Pour réserver à nouveau, rendez-vous sur :", + "email_manage_button": "Gérer la réservation", + "email_rebook_button": "Réserver à nouveau", + "email_subject_confirmed": "Réservation confirmée : %s", + "email_subject_cancelled": "Réservation annulée : %s", + "email_subject_rescheduled": "Réservation reportée : %s", + "email_subject_reminder": "Rappel : %s approche", + "email_booking_with": "Réservation avec %s", + "email_manage_this_booking": "Gérer cette réservation :", + "calendar_event_summary": "%s avec %s", + "calendar_event_booking_id": "Référence de la réservation : %s", + "err_booking_limit": "Vous avez déjà atteint le nombre maximum de réservations à venir pour cet événement. Annulez une réservation existante ou attendez qu'elle soit passée avant d'en créer une nouvelle.", + "err_email_throttled": "Trop de réservations récentes depuis cette adresse courriel. Veuillez réessayer plus tard.", + "err_required_field": "le champ obligatoire %q est manquant", + "err_required_checkbox": "%q doit être coché", + "err_invalid_option": "option non valide pour %[1]q : %[2]q n'est pas un choix autorisé", + "assistant_unavailable": "L'assistant de réservation n'est pas disponible pour le moment. Choisissez un créneau dans le calendrier ci-dessous.", + "assistant_trouble": "Désolé, nous rencontrons un problème. Choisissez un créneau dans le calendrier ci-dessous.", + "assistant_iteration_cap": "Simplifions les choses : choisissez un créneau dans le calendrier ci-dessous.", + "assistant_status_slots": "Vérification des disponibilités…", + "assistant_status_book": "Réservation…", + "assistant_status_working": "En cours…" +} From be053706d3130bb512284e9adcd755771df922a5 Mon Sep 17 00:00:00 2001 From: Sean Dean <254259913+distronode-com@users.noreply.github.com> Date: Wed, 9 Sep 2026 18:32:51 -0400 Subject: [PATCH 002/250] auth: sign out everywhere, including the MCP connectors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Third of the features split out of #30. POST /v1/auth/sessions/revoke-all. With no body it drops all of the caller's sessions EXCEPT the one that made the request — "sign out my other devices", as distinct from POST /v1/auth/logout, which ends the current one. An API-key caller has no current session, so for them every session goes. Losing a laptop no longer means waiting out a 30-day cookie. With {"user_id": "..."} it is an offboarding tool, gated on the same tiers roles.go already uses: an admin may revoke a member, only the owner may revoke another admin, and the owner's sessions are reachable only by the owner. ⛔ The actor's tier is checked BEFORE the target is loaded. Otherwise the 404 for an unknown id and the 403 for a protected one are distinguishable, and the endpoint becomes a way for a member to enumerate user ids. ⛔ It also deletes the target's rows in oauth_access_tokens, and that is the part that makes this an offboarding tool rather than a convenience. An MCP connector authenticates with a bearer token, not the session cookie, so ending the sessions alone would leave a connected agent holding exactly the access that was just withdrawn. Both deletes are in one transaction, so "revoked" is never half-true. TestRevokeAllSessions_memberCannotProbeForUserIDs holds the ordering, and it had to be written for this: the neighbouring member-cannot-target test names a REAL user, so it passes with the two checks in either order. The new one asks for an existing id and a made-up one and requires the same status AND the same body, since a differing message is the same oracle in prose. Moving the tier check below the target load fails it, and fails nothing else in the package. ⛔ Self-mode spares the session the caller AUTHENTICATED WITH, which is not the same as the one it happened to send. The cookie is read only when no API key is present, mirroring RequireAuth's own precedence — it tries the key first, so a request carrying both is an API-key request and its cookie authenticated nothing. Without that test a script holding a key and a stale cookie would ask to end all its sessions, be told it had, and leave one alive; the response counts what was deleted, not what was kept, so nothing would say so. The existing API-key test sends no cookie, so it passes either way. Mutation-checked rather than assumed: with the oauth_access_tokens delete replaced by a no-op, TestRevokeAllSessions_cutsMCPTokensToo and TestRevokeAllSessions_adminRevokesAMember both fail. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 11 ++ docs/ARCHITECTURE.md | 12 ++ internal/handler/session.go | 142 ++++++++++++++ internal/handler/session_test.go | 311 +++++++++++++++++++++++++++++++ internal/server/server.go | 3 + 5 files changed, 479 insertions(+) create mode 100644 internal/handler/session_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index b496eae2..948dff31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,17 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad `-copy-2`, `-copy-3`, …) slug, and keeps `price_cents`/`currency` verbatim: zeroing a copied price is how a paid meeting quietly starts selling for nothing. Bookings are not copied. +- **Sign out everywhere.** `POST /v1/auth/sessions/revoke-all` ends every session you + have except the one you asked from, so losing a laptop no longer means waiting out a + 30-day cookie. Pass `{"user_id": "..."}` and an admin can do the same for someone + else: an admin may revoke a member, only the owner may revoke another admin, and the + owner's own sessions can only be ended by the owner. + + It also revokes that person's MCP OAuth tokens, which is the part that makes it an + offboarding tool rather than a convenience. A connected agent authenticates with a + bearer token and not the session cookie, so ending the sessions alone would have left + it holding exactly the access that was just withdrawn. + - **Empty days and minimum-notice gaps now explain themselves** on all three booking surfaces (booking page, manage/reschedule page, embed widget). Closes [#20](https://github.com/Calnode/calnode/issues/20). diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index e91d5db6..e6be5e32 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -186,6 +186,18 @@ the platform/recovery secret doesn't expose secrets. Owner-gated actions: grant/revoke admin, transfer ownership. Admins can cancel any booking, see all bookings, manage teams/members. Safe-removal + archive guards prevent orphaning. +- **Sign out everywhere** (`POST /v1/auth/sessions/revoke-all`, `session.go`). With no + body it drops all of the caller's sessions **except the one that made the request** — + "sign out my other devices", as distinct from `POST /v1/auth/logout`, which ends the + current one. (An API-key caller has no current session, so for them every session + goes.) With `{"user_id": "..."}` it is an offboarding tool, gated on the same tiers as + `roles.go`: an admin may revoke a member, only the owner may revoke another admin, and + the owner's sessions are reachable only by the owner. The actor's tier is checked + *before* the target is loaded, so the 404 cannot be used to enumerate user ids. + ⛔ It also deletes the target's rows in **`oauth_access_tokens`**, cutting off any MCP + connector (§19) — those authenticate with a bearer token, not the session cookie, so + revoking sessions alone would leave an agent holding the authority just withdrawn. + Both deletes run in one transaction, so "revoked" is never half-true. - **Offboarding = archive** (`users.archived_at`), never hard-delete — preserves bookings, event-type ownership, team links. Archived ⇒ no login, hidden from lists, skipped in routing/slots, event types deactivated. Reversible (restore). diff --git a/internal/handler/session.go b/internal/handler/session.go index 5f54cff1..e68c6393 100644 --- a/internal/handler/session.go +++ b/internal/handler/session.go @@ -3,7 +3,11 @@ package handler import ( "context" "crypto/rand" + "database/sql" "encoding/hex" + "encoding/json" + "errors" + "io" "net/http" "time" ) @@ -32,3 +36,141 @@ func (h *Handler) createSession(ctx context.Context, w http.ResponseWriter, user }) return nil } + +// RevokeAllSessions handles POST /v1/auth/sessions/revoke-all. +// +// Body: `{"user_id": "..."}`, optional. +// +// - Omitted (or naming the caller): signs the caller out everywhere **except the +// session that made the request**. "Sign out my other devices" is the action people +// actually want; dropping the current session too would log the operator out of the +// page they clicked it on, which is what Logout is for. A caller authenticating with +// an API key has no current session, so for them every session goes. +// - Naming someone else: an offboarding tool. Admin-only, and mirroring roles.go's +// tiers — an admin may revoke a member, only the owner may revoke another admin, and +// nobody may revoke the owner's sessions but the owner (there is exactly one owner, +// so that case is the self branch). +// +// It also deletes the target's MCP OAuth access tokens. An MCP connector authenticates +// with a bearer token rather than the session cookie (§19), so revoking sessions alone +// would leave an agent connected with exactly the authority that was just taken away — +// the failure mode being cut off from is a laptop that walked out of the building with a +// signed-in browser AND a connected agent on it. +func (h *Handler) RevokeAllSessions(w http.ResponseWriter, r *http.Request) { + actor, ok := userFromContext(r.Context()) + if !ok { + h.writeError(w, http.StatusUnauthorized, "authentication required") + return + } + + r.Body = http.MaxBytesReader(w, r.Body, 1<<10) + var req struct { + UserID string `json:"user_id"` + } + // An empty body is the common case (revoke my own), so EOF is not an error here. + if err := json.NewDecoder(r.Body).Decode(&req); err != nil && !errors.Is(err, io.EOF) { + h.writeError(w, http.StatusBadRequest, "invalid JSON") + return + } + + targetID := req.UserID + self := targetID == "" || targetID == actor.ID + if self { + targetID = actor.ID + } else { + // The actor's capability class is checked before the target is looked up, so a + // member cannot use this endpoint's 404 to probe which user ids exist. + if !actor.IsAdmin { + h.writeError(w, http.StatusForbidden, "admin access required") + return + } + var targetIsAdmin, targetIsOwner int + err := h.db.QueryRowContext(r.Context(), + `SELECT is_admin, is_owner FROM users WHERE id = ?`, targetID). + Scan(&targetIsAdmin, &targetIsOwner) + if err == sql.ErrNoRows { + h.writeError(w, http.StatusNotFound, "user not found") + return + } + if err != nil { + h.logger.ErrorContext(r.Context(), "revoke sessions: load target", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if targetIsOwner != 0 { + h.writeError(w, http.StatusForbidden, "the owner's sessions can only be revoked by the owner") + return + } + if targetIsAdmin != 0 && !actor.IsOwner { + h.writeError(w, http.StatusForbidden, "only the workspace owner can revoke another admin's sessions") + return + } + } + + // One transaction: a caller told "revoked" must not have kept an MCP token because + // the second statement failed after the first committed. + tx, err := h.db.BeginTx(r.Context(), nil) + if err != nil { + h.logger.ErrorContext(r.Context(), "revoke sessions: begin tx", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + defer tx.Rollback() //nolint:errcheck + + var sessionRes sql.Result + if self { + // The session spared is the one the caller AUTHENTICATED WITH, which is not the + // same thing as the one it happened to send. + // + // ⛔ The API-key test mirrors RequireAuth's own precedence: it tries the key + // first, so a request carrying both is an API-key request and its cookie played + // no part in authenticating it. Reading the cookie unconditionally would spare a + // session on the strength of a header the caller was not authenticated by — so a + // script holding an API key and a stale cookie would ask to end all its sessions, + // be told it had, and leave one alive. Silently, because the response counts what + // was deleted and not what was kept. + current := "" + if extractAPIKey(r) == "" { + if c, cerr := r.Cookie(sessionCookieName); cerr == nil { + current = c.Value + } + } + sessionRes, err = tx.ExecContext(r.Context(), + `DELETE FROM sessions WHERE user_id = ? AND id <> ?`, targetID, current) + } else { + sessionRes, err = tx.ExecContext(r.Context(), + `DELETE FROM sessions WHERE user_id = ?`, targetID) + } + if err != nil { + h.logger.ErrorContext(r.Context(), "revoke sessions: delete sessions", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + + tokenRes, err := tx.ExecContext(r.Context(), + `DELETE FROM oauth_access_tokens WHERE user_id = ?`, targetID) + if err != nil { + h.logger.ErrorContext(r.Context(), "revoke sessions: delete oauth tokens", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + + if err := tx.Commit(); err != nil { + h.logger.ErrorContext(r.Context(), "revoke sessions: commit", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + + sessions, _ := sessionRes.RowsAffected() + tokens, _ := tokenRes.RowsAffected() + h.logger.InfoContext(r.Context(), "sessions revoked", + "actor_id", actor.ID, "user_id", targetID, "self", self, + "sessions", sessions, "oauth_tokens", tokens) + + h.writeJSON(w, http.StatusOK, map[string]any{ + "ok": true, + "user_id": targetID, + "sessions_revoked": sessions, + "oauth_tokens_revoked": tokens, + }) +} diff --git a/internal/handler/session_test.go b/internal/handler/session_test.go new file mode 100644 index 00000000..69209cd0 --- /dev/null +++ b/internal/handler/session_test.go @@ -0,0 +1,311 @@ +package handler_test + +import ( + "database/sql" + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" + + "github.com/calnode/calnode/internal/handler" +) + +// seedSessionID inserts a live session row under a caller-chosen id (the cookie value), +// so one user can be given several and a test can name the one it presents. +func seedSessionID(t *testing.T, database *sql.DB, id, userID string) string { + t.Helper() + if _, err := database.Exec(`INSERT INTO sessions (id, user_id, expires_at) VALUES (?, ?, ?)`, + id, userID, time.Now().UTC().Add(24*time.Hour).Format(time.RFC3339)); err != nil { + t.Fatalf("seed session %s: %v", id, err) + } + return id +} + +// seedMCPToken inserts an MCP OAuth access token for userID. +func seedMCPToken(t *testing.T, database *sql.DB, id, userID string) { + t.Helper() + if _, err := database.Exec(` + INSERT INTO oauth_access_tokens (id, token_hash, client_id, user_id, expires_at, created_at) + VALUES (?, ?, 'client-1', ?, ?, ?)`, + id, "hash-"+id, userID, + time.Now().UTC().Add(time.Hour).Format(time.RFC3339), + time.Now().UTC().Format(time.RFC3339)); err != nil { + t.Fatalf("seed mcp token %s: %v", id, err) + } +} + +func countSessions(t *testing.T, database *sql.DB, userID string) int { + t.Helper() + var n int + if err := database.QueryRow(`SELECT COUNT(*) FROM sessions WHERE user_id = ?`, userID).Scan(&n); err != nil { + t.Fatalf("count sessions: %v", err) + } + return n +} + +func countMCPTokens(t *testing.T, database *sql.DB, userID string) int { + t.Helper() + var n int + if err := database.QueryRow(`SELECT COUNT(*) FROM oauth_access_tokens WHERE user_id = ?`, userID).Scan(&n); err != nil { + t.Fatalf("count mcp tokens: %v", err) + } + return n +} + +// revokeAll drives the handler through RequireAuth. cookie is the session cookie value +// to present (empty for none); apiKey authenticates when no cookie is given. +func revokeAll(h *handler.Handler, body, apiKey, cookie string) *httptest.ResponseRecorder { + var r *http.Request + if body != "" { + r = httptest.NewRequest(http.MethodPost, "/v1/auth/sessions/revoke-all", strings.NewReader(body)) + r.Header.Set("Content-Type", "application/json") + } else { + r = httptest.NewRequest(http.MethodPost, "/v1/auth/sessions/revoke-all", nil) + } + if apiKey != "" { + r.Header.Set("X-API-Key", apiKey) + } + if cookie != "" { + r.AddCookie(&http.Cookie{Name: "calnode_session", Value: cookie}) + } + rec := httptest.NewRecorder() + h.RequireAuth(h.RevokeAllSessions)(rec, r) + return rec +} + +// Revoking your own keeps the session that asked. That is the difference between this +// endpoint and Logout, and the reason it is the default with no body. +func TestRevokeAllSessions_selfKeepsTheCallingSession(t *testing.T) { + h, database, _, ownerID := setupWorkspaceWithDB(t) + current := seedSessionID(t, database, "sess-current", ownerID) + seedSessionID(t, database, "sess-laptop", ownerID) + seedSessionID(t, database, "sess-phone", ownerID) + + rec := revokeAll(h, "", "", current) + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + var resp struct { + SessionsRevoked int `json:"sessions_revoked"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { + t.Fatalf("decode: %v", err) + } + if resp.SessionsRevoked != 2 { + t.Errorf("sessions_revoked = %d; want 2", resp.SessionsRevoked) + } + if n := countSessions(t, database, ownerID); n != 1 { + t.Fatalf("sessions left = %d; want 1 (the calling one)", n) + } + var left string + if err := database.QueryRow(`SELECT id FROM sessions WHERE user_id = ?`, ownerID).Scan(&left); err != nil { + t.Fatalf("read surviving session: %v", err) + } + if left != current { + t.Errorf("surviving session = %q; want %q", left, current) + } +} + +// An API-key caller has no current session, so there is none to spare. +func TestRevokeAllSessions_apiKeyCallerRevokesEveryone(t *testing.T) { + h, database, ownerKey, ownerID := setupWorkspaceWithDB(t) + seedSessionID(t, database, "sess-a", ownerID) + seedSessionID(t, database, "sess-b", ownerID) + + rec := revokeAll(h, "", ownerKey, "") + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, ownerID); n != 0 { + t.Errorf("sessions left = %d; want 0", n) + } +} + +// ⛔ An API-key request that ALSO carries a cookie is still an API-key request — +// RequireAuth tries the key first, so the cookie played no part in authenticating it and +// there is no current session to spare. The test above sends a key and no cookie, so it +// passes whether the handler reads the cookie or not; this is the case that separates +// them. Sparing a session on the strength of a header the caller was not authenticated by +// would leave a script that asked to end all its sessions with one alive, and the response +// counts what was deleted, not what was kept, so nothing would say so. +func TestRevokeAllSessions_apiKeyCallerWithAStaleCookieStillRevokesEveryone(t *testing.T) { + h, database, ownerKey, ownerID := setupWorkspaceWithDB(t) + seedSessionID(t, database, "sess-stale", ownerID) + seedSessionID(t, database, "sess-other", ownerID) + + rec := revokeAll(h, "", ownerKey, "sess-stale") + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, ownerID); n != 0 { + t.Errorf("sessions left = %d; want 0 — the cookie is not what authenticated this "+ + "caller, so no session is the \"current\" one", n) + } +} + +// An MCP connector holds a bearer token, not a cookie. Revoking sessions and leaving it +// would hand back exactly the access that was just withdrawn. +func TestRevokeAllSessions_cutsMCPTokensToo(t *testing.T) { + h, database, ownerKey, ownerID := setupWorkspaceWithDB(t) + seedMCPToken(t, database, "tok-1", ownerID) + seedMCPToken(t, database, "tok-2", ownerID) + + rec := revokeAll(h, "", ownerKey, "") + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + var resp struct { + OAuthTokensRevoked int `json:"oauth_tokens_revoked"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { + t.Fatalf("decode: %v", err) + } + if resp.OAuthTokensRevoked != 2 { + t.Errorf("oauth_tokens_revoked = %d; want 2", resp.OAuthTokensRevoked) + } + if n := countMCPTokens(t, database, ownerID); n != 0 { + t.Errorf("mcp tokens left = %d; want 0", n) + } +} + +// seedRoleUser inserts a user with the given flags plus an API key for them. +func seedRoleUser(t *testing.T, database *sql.DB, id, email string, isAdmin, isOwner int, apiKey string) { + t.Helper() + if _, err := database.Exec( + `INSERT INTO users (id,email,name,iana_timezone,is_admin,is_owner) VALUES (?,?,?,'UTC',?,?)`, + id, email, id, isAdmin, isOwner); err != nil { + t.Fatalf("seed user %s: %v", id, err) + } + if apiKey != "" { + if _, err := database.Exec( + `INSERT INTO api_keys (id,user_id,name,key_hash,created_at) VALUES (?,?,'t',?,'2024-01-01')`, + "key-"+id, id, sha256HexForTest(apiKey)); err != nil { + t.Fatalf("seed api key for %s: %v", id, err) + } + } +} + +func TestRevokeAllSessions_memberCannotTargetAnotherUser(t *testing.T) { + h, database, _, _ := setupWorkspaceWithDB(t) + seedRoleUser(t, database, "member-1", "m1@example.com", 0, 0, "member-1-key") + seedRoleUser(t, database, "member-2", "m2@example.com", 0, 0, "") + seedSessionID(t, database, "sess-victim", "member-2") + + rec := revokeAll(h, `{"user_id":"member-2"}`, "member-1-key", "") + if rec.Code != http.StatusForbidden { + t.Fatalf("status = %d; want 403 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, "member-2"); n != 1 { + t.Errorf("victim sessions = %d; want 1 (untouched)", n) + } +} + +// ⛔ A member gets the SAME answer for a user that exists and one that does not, which is +// what stops this endpoint being a user-id oracle. The handler checks the actor's tier +// before it loads the target for exactly this reason, and the test above cannot see that +// — it names a real user, so it would pass just as well with the checks in either order. +func TestRevokeAllSessions_memberCannotProbeForUserIDs(t *testing.T) { + h, database, _, _ := setupWorkspaceWithDB(t) + seedRoleUser(t, database, "member-1", "m1@example.com", 0, 0, "member-1-key") + seedRoleUser(t, database, "member-2", "m2@example.com", 0, 0, "") + + real := revokeAll(h, `{"user_id":"member-2"}`, "member-1-key", "") + fake := revokeAll(h, `{"user_id":"no-such-user-at-all"}`, "member-1-key", "") + + if real.Code != http.StatusForbidden || fake.Code != http.StatusForbidden { + t.Fatalf("existing user = %d, unknown user = %d; want 403 for both, or the status "+ + "code tells a member which ids exist", real.Code, fake.Code) + } + // The body has to match too: a differing message is the same oracle in prose. + if real.Body.String() != fake.Body.String() { + t.Errorf("bodies differ between an existing and an unknown user:\n existing: %s\n unknown: %s", + real.Body.String(), fake.Body.String()) + } +} + +func TestRevokeAllSessions_adminRevokesAMember(t *testing.T) { + h, database, _, _ := setupWorkspaceWithDB(t) + seedRoleUser(t, database, "admin-1", "a1@example.com", 1, 0, "admin-1-key") + seedRoleUser(t, database, "member-1", "m1@example.com", 0, 0, "") + seedSessionID(t, database, "sess-m1a", "member-1") + seedSessionID(t, database, "sess-m1b", "member-1") + seedMCPToken(t, database, "tok-m1", "member-1") + + rec := revokeAll(h, `{"user_id":"member-1"}`, "admin-1-key", "") + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, "member-1"); n != 0 { + t.Errorf("member sessions = %d; want 0", n) + } + if n := countMCPTokens(t, database, "member-1"); n != 0 { + t.Errorf("member mcp tokens = %d; want 0", n) + } +} + +func TestRevokeAllSessions_onlyTheOwnerRevokesAnAdmin(t *testing.T) { + h, database, ownerKey, _ := setupWorkspaceWithDB(t) + seedRoleUser(t, database, "admin-1", "a1@example.com", 1, 0, "admin-1-key") + seedRoleUser(t, database, "admin-2", "a2@example.com", 1, 0, "") + seedSessionID(t, database, "sess-a2", "admin-2") + + // Admin → admin is refused. + rec := revokeAll(h, `{"user_id":"admin-2"}`, "admin-1-key", "") + if rec.Code != http.StatusForbidden { + t.Fatalf("admin targeting admin: status = %d; want 403 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, "admin-2"); n != 1 { + t.Fatalf("admin-2 sessions = %d; want 1 (untouched)", n) + } + + // Owner → admin is allowed. + rec = revokeAll(h, `{"user_id":"admin-2"}`, ownerKey, "") + if rec.Code != http.StatusOK { + t.Fatalf("owner targeting admin: status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, "admin-2"); n != 0 { + t.Errorf("admin-2 sessions = %d; want 0", n) + } +} + +// Nobody signs the owner out but the owner, mirroring roles.go refusing to change the +// owner's role. +func TestRevokeAllSessions_ownerIsOffLimitsToAdmins(t *testing.T) { + h, database, _, ownerID := setupWorkspaceWithDB(t) + seedRoleUser(t, database, "admin-1", "a1@example.com", 1, 0, "admin-1-key") + seedSessionID(t, database, "sess-owner", ownerID) + + rec := revokeAll(h, `{"user_id":"`+ownerID+`"}`, "admin-1-key", "") + if rec.Code != http.StatusForbidden { + t.Fatalf("status = %d; want 403 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, ownerID); n != 1 { + t.Errorf("owner sessions = %d; want 1 (untouched)", n) + } +} + +func TestRevokeAllSessions_unknownUserIs404(t *testing.T) { + h, _, ownerKey, _ := setupWorkspaceWithDB(t) + + rec := revokeAll(h, `{"user_id":"nobody"}`, ownerKey, "") + if rec.Code != http.StatusNotFound { + t.Fatalf("status = %d; want 404 — %s", rec.Code, rec.Body.String()) + } +} + +// Naming yourself is the self branch, not the admin branch: a member may do it. +func TestRevokeAllSessions_namingYourselfIsSelf(t *testing.T) { + h, database, _, _ := setupWorkspaceWithDB(t) + seedRoleUser(t, database, "member-1", "m1@example.com", 0, 0, "member-1-key") + seedSessionID(t, database, "sess-m1", "member-1") + + rec := revokeAll(h, `{"user_id":"member-1"}`, "member-1-key", "") + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + if n := countSessions(t, database, "member-1"); n != 0 { + t.Errorf("sessions left = %d; want 0 (api-key caller has no current session)", n) + } +} diff --git a/internal/server/server.go b/internal/server/server.go index 460b46f7..81356789 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -287,6 +287,9 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge mux.HandleFunc("GET /v1/auth/microsoft/login", authRL(h.LoginMicrosoft)) mux.HandleFunc("GET /v1/auth/microsoft/callback", authRL(h.CallbackMicrosoft)) mux.HandleFunc("POST /v1/auth/logout", h.Logout) + // Sign out everywhere. Own sessions for anyone; someone else's for an admin, which + // is the offboarding half. Also cuts that user's MCP OAuth tokens. + mux.HandleFunc("POST /v1/auth/sessions/revoke-all", h.RequireAuth(h.RevokeAllSessions)) // MCP server (Model Context Protocol) — Streamable HTTP transport for remote // agents. One server instance reused across requests. Guarded by a bearer token: From 568e6d3d4f2d8ebd61707f2aec14e4e0dabf1e3a Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Fri, 11 Sep 2026 02:07:24 -0400 Subject: [PATCH 003/250] security: a disclosure policy, and Dependabot for the four dependency surfaces There was no SECURITY.md, so someone who found a vulnerability had nowhere obvious to send it and no idea what would happen to it. The one added here points at GitHub's private vulnerability reporting rather than an email address - it is already available on this repository, it does not need a mailbox anyone has to remember to watch, and it gives the reporter a private thread instead of an issue that discloses the bug the moment it is filed. It also says what a report should contain, what response to expect and by roughly when, and that credit is offered if the reporter wants it. Supported versions are stated as what is actually true pre-1.0: fixes land on the latest release line and are not backported. The Dependabot config covers the four places this repository takes a dependency, each on a weekly schedule: Go modules at the root, the SvelteKit admin app under /frontend (pnpm is handled by the npm ecosystem), the actions pinned in .github/workflows, and the base images in the root Dockerfile. No groups and no ignores - the point is to see the updates rather than to shape them, and a config with rules in it that nobody revisits is how a surface quietly stops being watched. The commit before this one closed fourteen advisories by hand; this is the part that means the next fourteen do not have to be found by hand. Co-Authored-By: Claude Opus 5 (1M context) --- .github/dependabot.yml | 26 +++++++++++++++++++++ SECURITY.md | 51 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 SECURITY.md diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..8fe4c58a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,26 @@ +version: 2 + +updates: + # Go modules (go.mod / go.sum at the repository root). + - package-ecosystem: gomod + directory: / + schedule: + interval: weekly + + # The SvelteKit admin app. pnpm is handled by the npm ecosystem. + - package-ecosystem: npm + directory: /frontend + schedule: + interval: weekly + + # Actions pinned in .github/workflows/. + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + + # Base images in the root Dockerfile. + - package-ecosystem: docker + directory: / + schedule: + interval: weekly diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..e3b7badf --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,51 @@ +# Security policy + +## Supported versions + +Calnode is pre-1.0, and fixes go onto the latest release line only. There are no +backports to earlier `0.x` minors. + +| Version | Supported | +| ------- | --------- | +| 0.9.x | Yes | +| < 0.9 | No | + +If you are running an older tag, the fix for a reported issue will be an upgrade. + +## Reporting a vulnerability + +Please report privately, through GitHub's private vulnerability reporting: open the +repository's **Security** tab and use **Report a vulnerability**. That opens a private +thread visible only to you and the maintainers. + +Please do not open a public issue, a pull request, or a discussion for a security +report. A public issue is a disclosure, and it is one made before there is anything for +people to upgrade to. + +## What to include + +Enough to reproduce it. Usually that is: + +- what the problem is, and what an attacker gets out of it; +- the version, tag, or commit you tested; +- how you are running it (Docker image, `go build`, behind which proxy) and anything + non-default in your configuration; +- the steps, request, or proof-of-concept that triggers it; +- what you expected to happen instead. + +If you are not sure whether something is a vulnerability, report it anyway and say so. +An unclear report is easier to deal with than one that never arrives. + +## What to expect + +- **An acknowledgement within a few days.** If you have not heard anything after a week, + please post a follow-up on the same private thread in case it was missed. +- **Then either a fix or an explanation.** If we agree it is a vulnerability, we will + tell you roughly when a fix will land and let you know when it ships. If we do not + think it is one, we will say why rather than leaving the report open. +- **A public advisory when the fix is released**, through GitHub Security Advisories, so + people running Calnode know what they are upgrading for. +- **Credit, if you want it.** Tell us the name or handle to use, or tell us you would + rather stay anonymous. Either is fine. + +Please give us a reasonable chance to ship a fix before publishing the details. From 53c345219112c445e171d081671c9d83189f5f87 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Fri, 11 Sep 2026 02:19:49 -0400 Subject: [PATCH 004/250] mailer: a booker's address is validated at intake, and never written into a header unparsed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The To: header is the one header field assembled from caller-supplied input with nothing encoding it. buildRaw parsed each recipient with mail.ParseAddress and, when that failed, appended the raw string anyway, so a CR/LF inside an address would have closed the To: line and started a header of the sender's choosing. Every other field was already safe: Subject and the From display name go through mime.QEncoding, which renders CR and LF as =0D and =0A; attachment filenames are written with %q; bodies sit below the blank line inside random-boundary MIME parts. The value reaching it is public and unauthenticated. POST /v1/bookings takes `email` straight from the request body, checks only that it is non-empty, and carries it to mailer.Message.To through dispatchBookingConfirmation. The conversational booking assistant's `book` tool is the same hole with a looser source: the address is whatever the model extracted from booker chat. Neither path called mail.ParseAddress anywhere. It is not exploitable as it stands, and the reason is worth stating precisely rather than relying on. Send issues c.Rcpt(to) for every recipient before it opens DATA, and net/smtp runs validateLine inside Rcpt, which refuses any string containing CR or LF. A CRLF-bearing address therefore aborts the exchange at RCPT TO and never reaches the body. That is incidental protection: it lives one call away in the standard library, it is not a property of this file, and it does nothing for a future transport that reuses buildRaw to assemble a message. The guarantee should be local to where the header is built. Two layers, because the two answer different questions. Intake decides what is stored. normalizeBookerEmail trims, parses with mail.ParseAddress, and returns a.Address — the bare address, not the input. CreateBooking calls it immediately after the emptiness check, before anything reads req.Email, and answers 400 "email must be a valid email address" in the same {"error": …} shape as its neighbours. createBookingForSlug — the shared core behind the assistant's `book` tool and the MCP create_booking tool — calls it before it persists anything; the REST handler does not route through that core, which is why both are touched. mail.ParseAddress is the whole rule: no length or domain heuristics, since the property that matters is parseability, not plausibility. The mailer decides what can be written. buildRaw returns ([]byte, error) and refuses an address it cannot parse, and an empty recipient list, with ErrInvalidRecipient. Send already built the message before dialing, so the refusal costs no connection — a test drives Send at a listener that counts accepts and asserts zero. The rejected value is deliberately kept out of the error, which is logged and may carry CR/LF; the error names the index instead. Storing a.Address rather than the input is a small deliberate behaviour change: a pasted `Bob ` is now recorded as bob@example.com. That is what the rest of the system already assumes it holds — the hourly per-email throttle, the per-invitee active-booking cap and the To: header all compare or emit the stored value as a plain address. resend.go, the HTTPS transport, posts msg.To as JSON and so has no header to inject into. It does accept unparsed recipients and is left alone; its callers now come through the same validated intake. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 25 +++++ internal/handler/booking_assistant.go | 4 + internal/handler/booking_email_test.go | 122 +++++++++++++++++++++++++ internal/handler/booking_handler.go | 45 +++++++++ internal/mailer/ics_test.go | 2 +- internal/mailer/mailer_test.go | 77 +++++++++++++++- internal/mailer/smtp.go | 42 ++++++--- internal/mailer/smtp_test.go | 48 ++++++++++ 8 files changed, 347 insertions(+), 18 deletions(-) create mode 100644 internal/handler/booking_email_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index f45a54ce..375ea1c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,31 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Security +- **A booker's email address is validated where it enters, and is never written into an + email header unparsed.** The `To:` header was the one header field assembled from + caller-supplied input with no encoder in front of it: `buildRaw` parsed each recipient + with `net/mail` and, when that failed, appended the raw string anyway, so a CR/LF inside + an address would have ended the `To:` line and started a header of the sender's + choosing. Subject and the `From` display name already go through `mime.QEncoding` + (which renders CR/LF as `=0D`/`=0A`) and attachment filenames through `%q`. + + Not exploitable as shipped: `Send` issues `c.Rcpt(to)` before `DATA`, and `net/smtp` + runs `validateLine` inside `Rcpt`, refusing any CR or LF - so a CRLF-bearing address + aborted the exchange at `RCPT TO` and never reached the body. That protection is + incidental, lives one call away in the standard library, and covers only this + transport. `buildRaw` now refuses an unparsed address (and an empty recipient list) + outright, returning `mailer.ErrInvalidRecipient` before anything is dialed; the + rejected value is kept out of the error, which is logged. + + The public booking paths validate at intake rather than relying on the mailer: the REST + handler (`POST /v1/bookings`) answers 400 "email must be a valid email address", and + the shared core behind the conversational assistant's `book` tool and the MCP + `create_booking` tool checks the address before it persists anything. Both store the + parsed bare address, so a pasted `Bob ` is recorded as + `bob@example.com` - a small deliberate behaviour change, matching what the hourly + throttle, the per-invitee cap and the `To:` header already assume they hold. + ## [0.9.0] - 2026-09-10 ### Added diff --git a/internal/handler/booking_assistant.go b/internal/handler/booking_assistant.go index eaa2110c..4cbe5125 100644 --- a/internal/handler/booking_assistant.go +++ b/internal/handler/booking_assistant.go @@ -439,6 +439,10 @@ func assistantBookError(err error) string { return "that time was just taken — please choose another slot" case errors.Is(err, booking.ErrBookingLimitReached): return "you already have the maximum number of upcoming bookings for this event" + case errors.Is(err, errInvalidBookerEmail): + // Worth its own case: the model can fix this by asking again, which the generic + // fallback below does not tell it. + return "that email address is not valid — please ask for it again" default: var ae *answerError if errors.As(err, &ae) { diff --git a/internal/handler/booking_email_test.go b/internal/handler/booking_email_test.go new file mode 100644 index 00000000..43f8b251 --- /dev/null +++ b/internal/handler/booking_email_test.go @@ -0,0 +1,122 @@ +package handler_test + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "github.com/calnode/calnode/internal/handler" +) + +// bookWithEmail posts a booking with the given raw email value and returns the response. +func bookWithEmail(t *testing.T, h *handler.Handler, slug, hhmm, email string) *httptest.ResponseRecorder { + t.Helper() + body := fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T%s:00Z","name":"Bob","email":%q}`, + slug, hhmm, email) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + return rec +} + +// organizerEmail reads back the stored organizer address for the workspace's single +// booking. The public create response carries no attendees, so this goes through the +// admin list, which does. +func organizerEmail(t *testing.T, h *handler.Handler, apiKey string) string { + t.Helper() + req := authReq(http.MethodGet, "/v1/bookings", "", apiKey) + rec := httptest.NewRecorder() + h.RequireAuth(h.ListBookings)(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("GET /v1/bookings: %d - %s", rec.Code, rec.Body.String()) + } + var out struct { + Items []struct { + Attendees []struct { + Email string `json:"email"` + } `json:"attendees"` + } `json:"items"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &out); err != nil { + t.Fatalf("decode bookings: %v", err) + } + if len(out.Items) != 1 || len(out.Items[0].Attendees) != 1 { + t.Fatalf("want exactly one booking with one organizer; got %+v", out.Items) + } + return out.Items[0].Attendees[0].Email +} + +// TestCreateBooking_rejectsMalformedEmail: the booker's address ends up in an outbound +// message's To: header, so it is checked at intake rather than at the mailer alone. The +// emptiness check above it only proves the field was filled in. +func TestCreateBooking_rejectsMalformedEmail(t *testing.T) { + h, key, _ := setupWorkspace(t) + slug, _ := seedEventTypeHTTP(t, h, key) + + for _, tc := range []struct { + name string + email string + }{ + {"not an address", "not-an-address"}, + {"header injection", "a@b.example\r\nBcc: x@y.example"}, + {"two addresses", "a@b.example, c@d.example"}, + } { + t.Run(tc.name, func(t *testing.T) { + rec := bookWithEmail(t, h, slug, "09:00", tc.email) + if rec.Code != http.StatusBadRequest { + t.Fatalf("got %d - %s; want 400", rec.Code, rec.Body.String()) + } + var resp struct { + Error string `json:"error"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { + t.Fatalf("decode error body: %v", err) + } + if resp.Error != "email must be a valid email address" { + t.Errorf("error = %q; want the plain intake sentence", resp.Error) + } + }) + } + + // Nothing was stored on any of those attempts. + req := authReq(http.MethodGet, "/v1/bookings", "", key) + rec := httptest.NewRecorder() + h.RequireAuth(h.ListBookings)(rec, req) + if strings.Contains(rec.Body.String(), "b.example") { + t.Errorf("a rejected booking was persisted: %s", rec.Body.String()) + } +} + +// TestCreateBooking_normalisesDisplayNameEmail: a pasted `Bob ` is +// stored as the bare address. Deliberate — every later reader (the hourly throttle, the +// per-invitee cap, the To: header) treats the stored value as a plain address. +func TestCreateBooking_normalisesDisplayNameEmail(t *testing.T) { + h, key, _ := setupWorkspace(t) + slug, _ := seedEventTypeHTTP(t, h, key) + + rec := bookWithEmail(t, h, slug, "09:00", " Bob ") + if rec.Code != http.StatusCreated { + t.Fatalf("got %d - %s; want 201", rec.Code, rec.Body.String()) + } + if got := organizerEmail(t, h, key); got != "bob@example.com" { + t.Errorf("stored organizer email = %q; want %q", got, "bob@example.com") + } +} + +// TestCreateBooking_ordinaryEmailUnchanged: normalisation must not rewrite the common case. +func TestCreateBooking_ordinaryEmailUnchanged(t *testing.T) { + h, key, _ := setupWorkspace(t) + slug, _ := seedEventTypeHTTP(t, h, key) + + rec := bookWithEmail(t, h, slug, "09:00", "Bob.Booker@example.com") + if rec.Code != http.StatusCreated { + t.Fatalf("got %d - %s; want 201", rec.Code, rec.Body.String()) + } + if got := organizerEmail(t, h, key); got != "Bob.Booker@example.com" { + t.Errorf("stored organizer email = %q; want it unchanged", got) + } +} diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 6b7abe35..fc7a5f95 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -8,6 +8,7 @@ import ( "fmt" "io" "net/http" + "net/mail" "net/url" "strconv" "strings" @@ -24,6 +25,31 @@ import ( "github.com/calnode/calnode/internal/zoom" ) +// errInvalidBookerEmail is returned by normalizeBookerEmail for an address net/mail +// cannot parse. Callers map it to their own protocol (400 on the REST path, a short +// retry hint for the assistant). +var errInvalidBookerEmail = errors.New("email must be a valid email address") + +// normalizeBookerEmail validates a booker-supplied address and returns the bare address +// to store. Every booking path ends with that value in an outbound message's To: header, +// so it must be something a header can hold: an unparsed address is the one raw input the +// mailer used to pass through verbatim, and a CR/LF inside it would end the To: line. +// +// Returning a.Address rather than the input also normalises `"Bob" ` to +// `bob@example.com`, which is what the rest of the system already assumes it holds — the +// per-invitee cap, the hourly throttle and the manage-link lookups all compare the stored +// value as a plain address. +// +// mail.ParseAddress is the whole rule. No length or domain heuristics: they reject valid +// addresses, and the property that matters here is parseability, not plausibility. +func normalizeBookerEmail(raw string) (string, error) { + a, err := mail.ParseAddress(strings.TrimSpace(raw)) + if err != nil { + return "", errInvalidBookerEmail + } + return a.Address, nil +} + // maxBookingsPerEmailPerHour caps how many bookings one email address can create // across the workspace in a rolling hour — a per-identity backstop to the per-IP // rate limit, for the openly-public booking page. @@ -479,6 +505,16 @@ func (h *Handler) loadBookableEventType(ctx context.Context, slug string) (*book // booking.ErrDoubleBooked, booking.ErrBookingLimitReached, errNoHostAvailable) for callers to // map to their own protocol. func (h *Handler) createBookingForSlug(ctx context.Context, slug string, startAt time.Time, organizer booking.Attendee, rawAnswers []booking.Answer) (*booking.Booking, error) { + // Both callers take the address from something they do not control — an LLM's + // extraction from booker chat, or an MCP client's tool arguments — so it is checked + // here, once, rather than in each of them. (The REST handler does not come through + // this core; it normalises at its own intake, before its throttle reads the value.) + email, err := normalizeBookerEmail(organizer.Email) + if err != nil { + return nil, err + } + organizer.Email = email + et, err := h.loadBookableEventType(ctx, slug) if err != nil { return nil, err @@ -722,6 +758,15 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusBadRequest, "event_type_slug, start_at, name, and email are required") return } + // Normalise before anything reads req.Email — the hourly throttle, the Stripe + // Checkout session, the attendee row and the confirmation email all take it from + // here, and they must all see the same bare address. + email, err := normalizeBookerEmail(req.Email) + if err != nil { + h.writeError(w, http.StatusBadRequest, err.Error()) + return + } + req.Email = email if req.Timezone == "" { req.Timezone = "UTC" } diff --git a/internal/mailer/ics_test.go b/internal/mailer/ics_test.go index bcb3a215..c0faa023 100644 --- a/internal/mailer/ics_test.go +++ b/internal/mailer/ics_test.go @@ -113,7 +113,7 @@ func TestBuildRaw_multipartWithICS(t *testing.T) { s := smtpForTest() d := testBookingData() d.AttachICS = true - raw := string(s.buildRaw(Message{ + raw := string(mustBuildRaw(t, s, Message{ To: []string{"bob@example.com"}, Subject: "Booking confirmed", Text: "body text", diff --git a/internal/mailer/mailer_test.go b/internal/mailer/mailer_test.go index 67c5d465b..1c1a946a 100644 --- a/internal/mailer/mailer_test.go +++ b/internal/mailer/mailer_test.go @@ -2,6 +2,7 @@ package mailer import ( "context" + "errors" "net/url" "strings" "sync" @@ -244,6 +245,17 @@ func smtpForTest() *SMTP { return &SMTP{from: "noreply@example.com", fromName: "Calnode"} } +// mustBuildRaw builds msg and fails the test if the recipients are refused — for the +// cases below, which are about header encoding rather than recipient validation. +func mustBuildRaw(t *testing.T, s *SMTP, msg Message) []byte { + t.Helper() + raw, err := s.buildRaw(msg) + if err != nil { + t.Fatalf("buildRaw: %v", err) + } + return raw +} + func TestBuildRaw_subjectInjectionPrevented(t *testing.T) { s := smtpForTest() msg := Message{ @@ -251,7 +263,7 @@ func TestBuildRaw_subjectInjectionPrevented(t *testing.T) { Subject: "Evil\r\nBcc: attacker@evil.com", Text: "body", } - raw := string(s.buildRaw(msg)) + raw := string(mustBuildRaw(t, s, msg)) if strings.Contains(raw, "Bcc: attacker@evil.com") { t.Error("header injection: injected Bcc header found in raw message") @@ -273,7 +285,7 @@ func TestBuildRaw_nonASCIISubjectEncoded(t *testing.T) { Subject: "Réunion d'équipe", Text: "body", } - raw := string(s.buildRaw(msg)) + raw := string(mustBuildRaw(t, s, msg)) // The raw Subject: line must not contain bare UTF-8 bytes (> 0x7E). for _, line := range strings.Split(raw, "\r\n") { @@ -298,7 +310,7 @@ func TestBuildRaw_pureASCIISubjectNotEncoded(t *testing.T) { Subject: "Booking confirmed: 30-min call", Text: "body", } - raw := string(s.buildRaw(msg)) + raw := string(mustBuildRaw(t, s, msg)) for _, line := range strings.Split(raw, "\r\n") { if strings.HasPrefix(line, "Subject:") { @@ -313,7 +325,7 @@ func TestBuildRaw_pureASCIISubjectNotEncoded(t *testing.T) { func TestBuildRaw_fromNameFormatted(t *testing.T) { s := smtpForTest() msg := Message{To: []string{"x@example.com"}, Subject: "Hi", Text: "body"} - raw := string(s.buildRaw(msg)) + raw := string(mustBuildRaw(t, s, msg)) if !strings.Contains(raw, "Calnode") { t.Error("From: header missing sender name") @@ -322,3 +334,60 @@ func TestBuildRaw_fromNameFormatted(t *testing.T) { t.Error("From: header missing sender address") } } + +// TestBuildRaw_recipientAddresses covers the To: header, which is the one header field +// assembled from caller-supplied input without an encoder in front of it. Subject and the +// From display name go through mime.QEncoding and attachment filenames through %q; a +// recipient that mail.ParseAddress refuses used to be appended verbatim, so a CR/LF inside +// it would have ended the To: line and started a header of the sender's choosing. +func TestBuildRaw_recipientAddresses(t *testing.T) { + for _, tc := range []struct { + name string + to []string + // want is the expected To: header line. Empty means buildRaw must refuse. + want string + }{ + {"plain address", []string{"bob@example.com"}, "To: "}, + {"display name is normalised into the header", []string{"Bob "}, `To: "Bob" `}, + {"two recipients", []string{"bob@example.com", "eve@example.com"}, "To: , "}, + {"CRLF in the address", []string{"a@b.example\r\nBcc: attacker@example.com"}, ""}, + {"not an address at all", []string{"not-an-address"}, ""}, + {"no recipient", nil, ""}, + } { + t.Run(tc.name, func(t *testing.T) { + raw, err := smtpForTest().buildRaw(Message{To: tc.to, Subject: "Hi", Text: "body"}) + + if tc.want == "" { + if err == nil { + t.Fatalf("buildRaw accepted %q; want a refusal", tc.to) + } + if !errors.Is(err, ErrInvalidRecipient) { + t.Errorf("error = %v; want it to wrap ErrInvalidRecipient", err) + } + if raw != nil { + t.Errorf("buildRaw returned %d bytes alongside its error; want none", len(raw)) + } + // The offending value is attacker-controlled and this error is logged, + // so it must not carry the raw bytes back out. + if strings.Contains(err.Error(), "attacker@example.com") { + t.Errorf("error %q quotes the rejected address back", err) + } + return + } + + if err != nil { + t.Fatalf("buildRaw(%q): %v", tc.to, err) + } + var got string + for _, line := range strings.Split(string(raw), "\r\n") { + if strings.HasPrefix(line, "To:") { + got = line + break + } + } + if got != tc.want { + t.Errorf("To: header = %q; want %q", got, tc.want) + } + }) + } +} diff --git a/internal/mailer/smtp.go b/internal/mailer/smtp.go index 26a478b2..5fb2d946 100644 --- a/internal/mailer/smtp.go +++ b/internal/mailer/smtp.go @@ -82,7 +82,11 @@ func newDialers(deadline time.Time, host string) (net.Dialer, tls.Dialer) { func (s *SMTP) Send(ctx context.Context, msg Message) error { addr := net.JoinHostPort(s.host, s.port) - raw := s.buildRaw(msg) + // Built before anything is dialed, so an unusable recipient costs no connection. + raw, err := s.buildRaw(msg) + if err != nil { + return err + } // Bounds the whole conversation, not just the dial (see defaultSMTPTimeout). // Whichever is EARLIER of "ctx's own deadline" and "now + the default" wins, so a @@ -174,7 +178,13 @@ func (s *SMTP) Send(ctx context.Context, msg Message) error { return nil } -func (s *SMTP) buildRaw(msg Message) []byte { +// ErrInvalidRecipient marks a recipient address that net/mail cannot parse. buildRaw +// refuses to write such an address into the To: header, so Send returns this instead of +// sending anything. The offending value is deliberately left out of the message: it is +// caller-supplied, may carry CR/LF, and this error is logged. +var ErrInvalidRecipient = errors.New("mailer: invalid recipient address") + +func (s *SMTP) buildRaw(msg Message) ([]byte, error) { from := mail.Address{Name: s.fromName, Address: s.from} // mime.QEncoding.Encode returns the string unchanged when it is pure ASCII @@ -184,16 +194,22 @@ func (s *SMTP) buildRaw(msg Message) []byte { // and satisfying RFC 2047 at the same time. subject := mime.QEncoding.Encode("utf-8", msg.Subject) - // Validate and normalise To addresses so the To: header line is properly - // quoted. Delivery uses c.Rcpt() (separate SMTP command) so a To: header - // formatting error cannot redirect mail. + // Validate and normalise To addresses so the To: header line is properly quoted. + // An address that does not parse is REFUSED rather than passed through: writing one + // verbatim is what would let a CR/LF inside it close the To: line and start a header + // of the attacker's choosing. net/smtp's Rcpt happens to reject CR/LF too, but that + // is one call away in the standard library and protects only this transport, so the + // guarantee is made here, where the header is actually assembled. + if len(msg.To) == 0 { + return nil, fmt.Errorf("%w: message has no recipient", ErrInvalidRecipient) + } toFormatted := make([]string, 0, len(msg.To)) - for _, addr := range msg.To { - if a, err := mail.ParseAddress(addr); err == nil { - toFormatted = append(toFormatted, a.String()) - } else { - toFormatted = append(toFormatted, addr) + for i, addr := range msg.To { + a, err := mail.ParseAddress(addr) + if err != nil { + return nil, fmt.Errorf("%w: recipient %d", ErrInvalidRecipient, i) } + toFormatted = append(toFormatted, a.String()) } var buf bytes.Buffer @@ -209,7 +225,7 @@ func (s *SMTP) buildRaw(msg Message) []byte { if !hasHTML && !hasAtt { buf.WriteString("Content-Type: text/plain; charset=utf-8\r\n\r\n") buf.WriteString(msg.Text) - return buf.Bytes() + return buf.Bytes(), nil } // writeBody emits the message body at the current MIME level: either a single @@ -242,7 +258,7 @@ func (s *SMTP) buildRaw(msg Message) []byte { // No attachments: the body is the whole message. if !hasAtt { writeBody(&buf) - return buf.Bytes() + return buf.Bytes(), nil } // multipart/mixed: the body part (text or multipart/alternative) followed by @@ -262,7 +278,7 @@ func (s *SMTP) buildRaw(msg Message) []byte { buf.WriteString("\r\n") } fmt.Fprintf(&buf, "--%s--\r\n", mixed) - return buf.Bytes() + return buf.Bytes(), nil } // base64Wrap base64-encodes b and wraps it at 76 characters per line (RFC 2045). diff --git a/internal/mailer/smtp_test.go b/internal/mailer/smtp_test.go index f32ebbbe..9b8fbf8b 100644 --- a/internal/mailer/smtp_test.go +++ b/internal/mailer/smtp_test.go @@ -2,7 +2,9 @@ package mailer import ( "context" + "errors" "net" + "sync/atomic" "testing" "time" ) @@ -95,3 +97,49 @@ func TestSMTP_Send_appliesDefaultTimeoutWithNoCtxDeadline(t *testing.T) { t.Errorf("Send took %v to fail; want it bounded by defaultSMTPTimeout (300ms), not hanging", elapsed) } } + +// TestSMTP_Send_invalidRecipientNeverDials is the half a buildRaw unit test cannot show: +// the refusal has to happen before a connection is opened, not after. +// +// The address below is stopped today by net/smtp too — Client.Rcpt runs validateLine and +// rejects any CR or LF, so the exchange would abort at RCPT TO before DATA. That is +// incidental protection living one call away in the standard library, it covers only this +// transport, and it costs a dial, an EHLO and an AUTH first. The listener here accepts and +// counts connections, so a regression that moves the check back after the dial fails loudly. +func TestSMTP_Send_invalidRecipientNeverDials(t *testing.T) { + ln, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatalf("listen: %v", err) + } + t.Cleanup(func() { ln.Close() }) //nolint:errcheck + + var accepted atomic.Int32 + go func() { + for { + conn, err := ln.Accept() + if err != nil { + return + } + accepted.Add(1) + conn.Close() //nolint:errcheck + } + }() + + host, port, err := net.SplitHostPort(ln.Addr().String()) + if err != nil { + t.Fatalf("split addr: %v", err) + } + s := NewSMTP(host, port, "", "", false, false, "from@test.local", "Test") + + err = s.Send(context.Background(), Message{ + To: []string{"a@b.example\r\nBcc: attacker@example.com"}, + Subject: "test", + Text: "body", + }) + if !errors.Is(err, ErrInvalidRecipient) { + t.Fatalf("Send error = %v; want ErrInvalidRecipient", err) + } + if n := accepted.Load(); n != 0 { + t.Errorf("Send opened %d connection(s) before refusing the recipient; want 0", n) + } +} From 6f6b31f392b9a6e866baa62472c90dd385bf24e5 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 17 Sep 2026 11:54:20 +1200 Subject: [PATCH 005/250] auth: archived members' MCP bearers stop validating, and cannot be refreshed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit VerifyMCPBearer's OAuth branch never checked users.archived_at, so archiving a member — the documented offboarding path — left their connected agent bearer working, while sessions and API keys already filtered on it. The refresh grant had the same gap: it would mint fresh tokens for a dead account. Both queries now join users and require archived_at IS NULL, mirroring the API-key fallback directly below. Pinned by TestMCP_OAuthBearerRejectedWhenArchived (red-green verified against the unfixed code on both assertions) and one ARCHITECTURE §6 sentence stating the invariant. --- docs/ARCHITECTURE.md | 4 ++ internal/handler/mcp_oauth.go | 11 +++- internal/handler/mcp_oauth_authorize.go | 7 ++- internal/handler/mcp_oauth_test.go | 75 +++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 4 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index e91d5db6..b79052a5 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -189,6 +189,10 @@ the platform/recovery secret doesn't expose secrets. - **Offboarding = archive** (`users.archived_at`), never hard-delete — preserves bookings, event-type ownership, team links. Archived ⇒ no login, hidden from lists, skipped in routing/slots, event types deactivated. Reversible (restore). + "No login" holds on every auth path: sessions, API keys, and MCP OAuth bearers + all filter on `archived_at`, and refresh grants are refused for archived users + too — so archiving ends a member's agent access and leaves no usable + credential material behind. Archiving is blocked while the member has upcoming (primary-host) bookings; a resolve-meetings flow makes the admin reassign/cancel each first. diff --git a/internal/handler/mcp_oauth.go b/internal/handler/mcp_oauth.go index 330b9f13..bd2f1638 100644 --- a/internal/handler/mcp_oauth.go +++ b/internal/handler/mcp_oauth.go @@ -99,10 +99,15 @@ func (h *Handler) MCPCallerMiddleware(next http.Handler) http.Handler { func (h *Handler) VerifyMCPBearer(ctx context.Context, token string, _ *http.Request) (*auth.TokenInfo, error) { hash := hashAPIKey(token) - // OAuth access token? + // OAuth access token? Archived users authenticate with nothing: the session + // path (auth.go) and both API-key paths (below, and auth.go) already filter + // on users.archived_at, and without the same check here an archived member's + // connected agent bearer would keep validating after offboarding. var userID, expiresAt string - err := h.db.QueryRowContext(ctx, - `SELECT user_id, expires_at FROM oauth_access_tokens WHERE token_hash = ?`, hash). + err := h.db.QueryRowContext(ctx, ` + SELECT t.user_id, t.expires_at FROM oauth_access_tokens t + JOIN users u ON u.id = t.user_id + WHERE t.token_hash = ? AND u.archived_at IS NULL`, hash). Scan(&userID, &expiresAt) if err == nil { exp, _ := time.Parse(time.RFC3339, expiresAt) diff --git a/internal/handler/mcp_oauth_authorize.go b/internal/handler/mcp_oauth_authorize.go index 8ab139f2..a7b2e481 100644 --- a/internal/handler/mcp_oauth_authorize.go +++ b/internal/handler/mcp_oauth_authorize.go @@ -246,8 +246,13 @@ func (h *Handler) tokenRefresh(w http.ResponseWriter, r *http.Request) { return } var id, userID, storedClient, scope, resource string + // Archived users refresh nothing: their access tokens no longer validate + // (VerifyMCPBearer filters on archived_at), so minting fresh ones here + // would hand live credential material to a dead account. err := h.db.QueryRowContext(r.Context(), ` - SELECT id, user_id, client_id, scope, resource FROM oauth_access_tokens WHERE refresh_hash = ?`, + SELECT t.id, t.user_id, t.client_id, t.scope, t.resource FROM oauth_access_tokens t + JOIN users u ON u.id = t.user_id + WHERE t.refresh_hash = ? AND u.archived_at IS NULL`, hashAPIKey(refresh)).Scan(&id, &userID, &storedClient, &scope, &resource) if err != nil { writeOAuthError(w, http.StatusBadRequest, "invalid_grant", "unknown refresh token") diff --git a/internal/handler/mcp_oauth_test.go b/internal/handler/mcp_oauth_test.go index 59e5042d..a51dd3b1 100644 --- a/internal/handler/mcp_oauth_test.go +++ b/internal/handler/mcp_oauth_test.go @@ -297,3 +297,78 @@ func TestMCP_OAuthDeny(t *testing.T) { t.Errorf("deny: code=%d location=%q; want 302 with error=access_denied", rec.Code, loc) } } + +// TestMCP_OAuthBearerRejectedWhenArchived pins the offboarding half of +// "Offboarding = archive" (§6) for the MCP OAuth path. The session path and +// both API-key paths already filter on users.archived_at; the OAuth branch of +// VerifyMCPBearer did not, so an archived member's connected agent bearer kept +// validating after they were offboarded. +func TestMCP_OAuthBearerRejectedWhenArchived(t *testing.T) { + h, database, _, userID := setupWorkspaceWithDB(t) + + const rawToken = "archived-user-bearer" + const rawRefresh = "archived-user-refresh" + now := time.Now().UTC() + if _, err := database.Exec(` + INSERT INTO oauth_access_tokens (id, token_hash, refresh_hash, client_id, user_id, expires_at, created_at) + VALUES (?, ?, ?, 'client-1', ?, ?, ?)`, + "tok-archived", sha256HexForTest(rawToken), sha256HexForTest(rawRefresh), userID, + now.Add(time.Hour).Format(time.RFC3339), now.Format(time.RFC3339Nano)); err != nil { + t.Fatalf("seed token: %v", err) + } + refresh := func(t *testing.T, raw string) *httptest.ResponseRecorder { + t.Helper() + form := url.Values{"grant_type": {"refresh_token"}, "refresh_token": {raw}} + req := httptest.NewRequest(http.MethodPost, "/oauth/token", strings.NewReader(form.Encode())) + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + rec := httptest.NewRecorder() + h.TokenMCP(rec, req) + return rec + } + + // Before archiving, the bearer validates and the refresh token rotates. + // The rotated pair is kept: it is the agent's *current* credential, which + // is exactly what must die on archive (testing the pre-rotation values + // post-archive would pass vacuously — rotation already replaced them). + if info, err := h.VerifyMCPBearer(context.Background(), rawToken, nil); err != nil || info.UserID != userID { + t.Fatalf("VerifyMCPBearer before archive = %+v, %v; want UserID=%s", info, err, userID) + } + rec := refresh(t, rawRefresh) + if rec.Code != http.StatusOK { + t.Fatalf("refresh before archive = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + var rotated map[string]any + if err := json.Unmarshal(rec.Body.Bytes(), &rotated); err != nil { + t.Fatalf("decode rotated pair: %v", err) + } + access, _ := rotated["access_token"].(string) + refreshTok, _ := rotated["refresh_token"].(string) + if access == "" || refreshTok == "" { + t.Fatalf("rotated pair missing tokens: %v", rotated) + } + // The rotated access token validates while the user is live — so its + // post-archive rejection below proves the archive check, not a broken + // rotation. + if info, err := h.VerifyMCPBearer(context.Background(), access, nil); err != nil || info.UserID != userID { + t.Fatalf("VerifyMCPBearer(rotated) before archive = %+v, %v; want UserID=%s", info, err, userID) + } + + // Archive the user — the documented offboarding path — and the current + // bearer must stop validating, exactly like the user's sessions and API + // keys do. + if _, err := database.Exec(`UPDATE users SET archived_at = ? WHERE id = ?`, + now.Format(time.RFC3339Nano), userID); err != nil { + t.Fatalf("archive user: %v", err) + } + if info, err := h.VerifyMCPBearer(context.Background(), access, nil); err == nil { + t.Errorf("VerifyMCPBearer after archive = %+v; want rejection — an archived member's agent bearer must not survive offboarding", info) + } + + // The refresh token must not mint fresh credentials for a dead account + // either: the rotated access token would not validate, but issuance itself + // tells the agent it is still authorized and leaves live credential + // material in the table. + if rec := refresh(t, refreshTok); rec.Code == http.StatusOK { + t.Errorf("refresh after archive issued tokens to an archived user: %s", rec.Body.String()) + } +} From ad2bf61941b5ad521beea435d0620f31148216f6 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 20:00:33 -0400 Subject: [PATCH 006/250] security: Dependabot checks monthly, not weekly A weekly feed across four ecosystems is more bot pull requests than this project wants: dependency updates are batched by hand, and a standing weekly drumbeat trains a maintainer to ignore it. Security fixes do not wait on this schedule; they arrive through the Scorecard badge and the audit workflow's scanners the day they are published. All four surfaces keep the same directories; only the interval changes. Co-Authored-By: Claude Opus 5 (1M context) --- .github/dependabot.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8fe4c58a..1a1c1db6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,22 +5,22 @@ updates: - package-ecosystem: gomod directory: / schedule: - interval: weekly + interval: monthly # The SvelteKit admin app. pnpm is handled by the npm ecosystem. - package-ecosystem: npm directory: /frontend schedule: - interval: weekly + interval: monthly # Actions pinned in .github/workflows/. - package-ecosystem: github-actions directory: / schedule: - interval: weekly + interval: monthly # Base images in the root Dockerfile. - package-ecosystem: docker directory: / schedule: - interval: weekly + interval: monthly From 6bd9e48ae315056ec58b8c6e5cc5403ecd79acaf Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 20:01:15 -0400 Subject: [PATCH 007/250] =?UTF-8?q?docs:=20the=20README=20and=20ARCHITECTU?= =?UTF-8?q?RE=20=C2=A718=20count=20nine=20languages=20too?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The locale commit moved the count to nine in ARCHITECTURE §23, CONTRIBUTING and CLAUDE.md but left the README's feature bullet and the LiveKit known issue in §18 at eight, so the repository claimed both numbers at once. Both now say nine, and the README's list names Canadian French. The dated 2026-08-20 entries in the CHANGELOG and the ARCHITECTURE log keep "8 locales": they describe what shipped that day. Co-Authored-By: Claude Opus 5 (1M context) --- README.md | 10 +++++----- docs/ARCHITECTURE.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7af16c7f..ac5c67d0 100644 --- a/README.md +++ b/README.md @@ -190,12 +190,12 @@ domains, Resend email, Google & Microsoft OAuth, Litestream backups, troubleshoo - **Zoom** — per-host OAuth; a Zoom-located booking mints a meeting under the assigned host's account - **Built-in video meetings (LiveKit)** — in-browser rooms as a booking location (no app or account for guests); host controls (end-for-all, hand-off **and reclaim** host, attendee screen-share toggle), **meeting recording** straight to your own **Litestream backup bucket** (the same one you already use for DB backup — no extra storage to provision) with in-app downloads, **recording consent** (notice + consent-or-leave), and an **AI notetaker** (Deepgram transcript → LLM notes). Headless-consumable: MCP `get_meeting_notes`/`get_transcript` + `recording.completed`/`transcript.ready`/`notes.ready` webhooks. BYO LiveKit endpoint (Cloud or self-hosted); configured in Settings → Video — see [docs/VIDEO.md](docs/VIDEO.md) -- **8 languages** on every booker-facing surface - booking page, manage/reschedule page, +- **9 languages** on every booker-facing surface - booking page, manage/reschedule page, embed widget, all four emails, and the calendar invite: **English · Spanish · French · - German · Italian · Portuguese · Dutch · Swedish**. Picked from `Accept-Language` with a - footer switcher and an operator-set fallback language; the booker's choice is stored on - the booking, so reminders arrive in the language they booked in. Adding a language is - adding one JSON file - no code change. *(The admin UI and the built-in video room are + Canadian French · German · Italian · Portuguese · Dutch · Swedish**. Picked from + `Accept-Language` with a footer switcher and an operator-set fallback language; the + booker's choice is stored on the booking, so reminders arrive in the language they + booked in. Adding a language is adding one JSON file - no code change. *(The admin UI and the built-in video room are English-only. Non-English translations are machine drafts without native review - corrections by PR are very welcome.)* - Embeddable booking widget (Shadow-DOM web component; inline + popup) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index d401a8eb..6cf32a37 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -806,7 +806,7 @@ as the desired state: patching. The **public** booking surfaces are unaffected and are verified on mobile; this is admin-only. Deferred 2026-08-22, not a regression. - **LiveKit room is not translated** - the booking surfaces, emails and calendar invites - ship in 8 languages (§23), but the in-browser meeting UI is ~45 hardcoded English + ship in 9 languages (§23), but the in-browser meeting UI is ~45 hardcoded English strings. It has its own vanilla-JS asset pipeline and shares no string plumbing with the Go templates, so it needs a small runtime `t()` of its own. Separate work, not hard. - **Plural rules are 2-form only** (§23) - shipping Polish, Russian or Arabic correctly From 27c5265b93196030be15513f19ca47c5a723b525 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 17 Sep 2026 12:16:26 +1200 Subject: [PATCH 008/250] fix(reminders): name the assigned host, not the event-type owner (#48) sendReminder joined users on et.user_id, so multi-host teams got reminders naming the event-type creator instead of the booked host. Join on bookings.host_id. loadCancellationData had the same shape, so cancellation/reschedule emails use the booking host too. Pinned by TestWorker_reminderNamesAssignedHost. --- internal/handler/booking_handler.go | 15 ++++++---- internal/worker/reminder_test.go | 44 +++++++++++++++++++++++++++++ internal/worker/worker.go | 4 +-- 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 6b7abe35..471c81ce 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -1802,14 +1802,17 @@ func (h *Handler) loadCancellationData(ctx context.Context, b *booking.Booking) d.LocationValue = b.LocationValue d.CancellationReason = b.CancellationReason - // Event type name + slug and host name + email in one join. + // Event type name + slug and the assigned host's name + email. The host + // comes from the booking (b.HostID), not the event-type owner: with + // multi-host event types the owner rarely hosts the booking (#48). err := h.db.QueryRowContext(ctx, ` - SELECT et.name, et.slug, u.name, u.email - FROM event_types et JOIN users u ON u.id = et.user_id - WHERE et.id = ?`, b.EventTypeID). - Scan(&d.EventTypeName, &d.EventTypeSlug, &d.HostName, &d.HostEmail) + SELECT et.name, et.slug FROM event_types et WHERE et.id = ?`, b.EventTypeID). + Scan(&d.EventTypeName, &d.EventTypeSlug) if err != nil { - return d, fmt.Errorf("load event/host: %w", err) + return d, fmt.Errorf("load event: %w", err) + } + if err := h.loadHostIntoData(ctx, b.HostID, &d); err != nil { + return d, fmt.Errorf("load host: %w", err) } // Organizer attendee. diff --git a/internal/worker/reminder_test.go b/internal/worker/reminder_test.go index 4b922e6c..3e5b49d5 100644 --- a/internal/worker/reminder_test.go +++ b/internal/worker/reminder_test.go @@ -226,3 +226,47 @@ func TestWorker_reminderNotFiredBeforeRunAt(t *testing.T) { t.Errorf("job status = %q; want pending", jobStatus) } } + +// --------------------------------------------------------------------------- +// reminder.send: names the assigned host, not the event-type owner (#48) +// --------------------------------------------------------------------------- + +func TestWorker_reminderNamesAssignedHost(t *testing.T) { + database, svc := setup(t) + ctx := context.Background() + + pastRunAt := time.Now().UTC().Add(-time.Second).Format(time.RFC3339) + bookingStart := time.Now().UTC().Add(25 * time.Hour).Format(time.RFC3339) + + // Event type owned by Host One, booking assigned to Host Two. + database.ExecContext(ctx, + `INSERT INTO event_types (id, user_id, slug, name, duration_minutes) + VALUES ('et-h1','host-01','host-test','Hosted Meeting',30)`) + database.ExecContext(ctx, + `INSERT INTO bookings (id, event_type_id, host_id, start_at, end_at, status) + VALUES ('bk-h1','et-h1','host-02',?,?,'confirmed')`, bookingStart, bookingStart) + database.ExecContext(ctx, + `INSERT INTO booking_attendees (id, booking_id, name, email, iana_timezone, is_organizer) + VALUES ('att-h1','bk-h1','Alice','alice@example.com','UTC',1)`) + database.ExecContext(ctx, ` + INSERT INTO jobs (id, type, payload, run_at, status, attempts, max_attempts) + VALUES ('job-h1','reminder.send','{"booking_id":"bk-h1"}',?,'pending',0,3)`, + pastRunAt) + + m := &captureMailer{} + w := worker.New(database, svc, slog.Default(), + worker.WithMailer(m), + worker.WithHTTPClient(&http.Client{})) + w.Poll(ctx) + + if len(m.sent) != 1 { + t.Fatalf("sent %d emails; want 1", len(m.sent)) + } + msg := m.sent[0] + if !strings.Contains(msg.Text, "Host Two") { + t.Errorf("reminder body missing assigned host %q:\n%s", "Host Two", msg.Text) + } + if strings.Contains(msg.Text, "Host One") { + t.Errorf("reminder body names the event-type owner; want the assigned host:\n%s", msg.Text) + } +} diff --git a/internal/worker/worker.go b/internal/worker/worker.go index b44ed1bf..04902998 100644 --- a/internal/worker/worker.go +++ b/internal/worker/worker.go @@ -263,7 +263,7 @@ func (w *Worker) sendReminder(ctx context.Context, payload string) error { return fmt.Errorf("worker: reminder: parse payload: %w", err) } - // One query: join bookings → event_types → users (host). + // One query: join bookings → event_types → users (assigned host). // Also load notify_reminder pref and msg_reminder custom note. // Skip if booking is deleted or no longer confirmed. var d mailer.BookingData @@ -277,7 +277,7 @@ func (w *Worker) sendReminder(ctx context.Context, payload string) error { u.name, u.email, COALESCE(u.notify_reminder, 1) FROM bookings b JOIN event_types et ON et.id = b.event_type_id - JOIN users u ON u.id = et.user_id + JOIN users u ON u.id = b.host_id WHERE b.id = ?`, p.BookingID). Scan(&status, &startAt, &endAt, &locVal, &d.EventTypeName, &d.EventTypeSlug, &msgReminder, &subjReminder, From e814e0f4c53a12b6a426f7e3d1252c9a5022aca0 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 20:32:08 -0400 Subject: [PATCH 009/250] docs: say that revoke-all is not offboarding, and what archive ends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Review asked that §6 not tell two stories about offboarding. The revoke-all bullet sat directly above "Offboarding = archive" while archive still left an MCP client's OAuth bearer working, so an operator reading the pair could archive someone and believe the agent was cut off too. The companion pull request closes that: VerifyMCPBearer refuses an archived member's OAuth token, and archive deletes the member's sessions, MCP tokens and pending authorization codes. This bullet now says revoke-all signs someone out rather than offboarding them, that archive ends MCP access by itself, and why revoke-all leaving cno_ API keys alive is safe: an archived member's keys are already refused on the key path in auth.go. The sentence describes the tree once the companion lands, so this should merge after it. Co-Authored-By: Claude Opus 5 (1M context) --- docs/ARCHITECTURE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index e6be5e32..4abcb1e8 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -198,6 +198,12 @@ the platform/recovery secret doesn't expose secrets. connector (§19) — those authenticate with a bearer token, not the session cookie, so revoking sessions alone would leave an agent holding the authority just withdrawn. Both deletes run in one transaction, so "revoked" is never half-true. + This endpoint signs someone out; it does not offboard them. Offboarding is archive + (next bullet), and archive ends MCP access on its own: the OAuth bearer check refuses + an archived member, and archive deletes their sessions and MCP tokens. API keys + (`cno_`) are deliberately left alone here, which is safe only because an archived + member's keys are already refused (the key path in `auth.go`), so an offboarded + member's keys stop working through archive, not through this endpoint. - **Offboarding = archive** (`users.archived_at`), never hard-delete — preserves bookings, event-type ownership, team links. Archived ⇒ no login, hidden from lists, skipped in routing/slots, event types deactivated. Reversible (restore). From ab14f2cb427ec5e3ac1f0ea5d538c28f42436f71 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 20:41:26 -0400 Subject: [PATCH 010/250] microsoft: select canEdit, so writable calendars can be booked into ListCalendars asked Graph for GET /me/calendars?$select=id,name,isDefaultCalendar&$top=100 and then read canEdit into CalendarInfo.Writable. $select limits the response to the properties it names, so Graph never sent canEdit, the bool decoded as false without an error, and every Microsoft calendar came back not writable. The calendar picker disables the Book radio and shows "(read-only)" for such a calendar, so ever since Writable arrived in 0.5.0 a Microsoft user could not choose which of their calendars bookings are written into. Nothing server-side reads Writable, so the picker is the whole of the effect. What the diagnosis relies on, from Microsoft's Graph documentation: calendar resource type (v1.0), Properties table: canEdit | Boolean | "true if the user can write to the calendar, false otherwise. This property is true for the user who created the calendar. This property is also true for a user who shared a calendar and granted write access." Customize Microsoft Graph responses with query parameters, Select: "Use the $select query parameter to return a subset of properties for a resource." OData 4.01 Part 1 (11.2.5.1) is the underlying rule: $select "requests that the service return only the properties, dynamic properties, actions and functions explicitly requested by the client." Nothing caught it because ListCalendars had no test. The two added here share a fake /me/calendars that honours $select the way Graph does, serving a calendar the user owns (canEdit true) and one shared with them read-only (canEdit false): - TestListCalendars_writableFollowsCanEdit asserts both come back with the right Writable. - TestListCalendars_selectNamesEveryDecodedProperty reads the property names msCalListResp decodes from its json tags by reflection, and fails if the request's $select omits any of them. A field added to the struct later has to be selected too, and the check does not depend on the fake filtering correctly. Both fail with canEdit taken back out of $select. With it out and the fake changed to ignore $select, the Writable test passes and the $select test still fails, which is why the fake has to filter. The other Graph calls have no such gap: calendarView selects start,end and decodes exactly those plus the @odata.nextLink paging link, event create, update and delete send no $select, and the sign-in lookup in internal/handler selects mail,userPrincipalName and decodes exactly those. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 7 + internal/calendar/microsoft/calendars.go | 6 +- internal/calendar/microsoft/microsoft_test.go | 133 ++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f45a54ce..53bc188e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,13 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Fixed +- **Microsoft calendars can be chosen as the one bookings are written into.** Since 0.5.0 + the calendar picker marked every Microsoft calendar "(read-only)" and disabled its Book + option. The calendar list read Graph's `canEdit` but left it out of `$select`, so Graph + never returned it and every calendar decoded as not writable. It is now requested, and a + test fails if that request omits any property the response decodes. + ## [0.9.0] - 2026-09-10 ### Added diff --git a/internal/calendar/microsoft/calendars.go b/internal/calendar/microsoft/calendars.go index 9aae3151..141491ea 100644 --- a/internal/calendar/microsoft/calendars.go +++ b/internal/calendar/microsoft/calendars.go @@ -28,6 +28,10 @@ func (c *Client) clientForAccount(ctx context.Context, userID, accountEmail stri return c.buildClient(ctx, userID, accessEnc, refreshEnc, calID, expiryStr, email) } +// msCalListResp is the GET /me/calendars response. Every property decoded here must also +// be named in ListCalendars' $select: Graph returns only the selected properties, and an +// absent bool decodes as false without error. +// TestListCalendars_selectNamesEveryDecodedProperty holds the two together. type msCalListResp struct { Value []struct { ID string `json:"id"` @@ -45,7 +49,7 @@ func (c *Client) ListCalendars(ctx context.Context, userID, accountEmail string) return nil, err } req, err := http.NewRequestWithContext(ctx, http.MethodGet, - c.apiBase+"/me/calendars?$select=id,name,isDefaultCalendar&$top=100", nil) + c.apiBase+"/me/calendars?$select=id,name,isDefaultCalendar,canEdit&$top=100", nil) if err != nil { return nil, err } diff --git a/internal/calendar/microsoft/microsoft_test.go b/internal/calendar/microsoft/microsoft_test.go index 30088fa9..5e89d3bb 100644 --- a/internal/calendar/microsoft/microsoft_test.go +++ b/internal/calendar/microsoft/microsoft_test.go @@ -4,9 +4,11 @@ import ( "context" "database/sql" "encoding/base64" + "encoding/json" "io" "net/http" "net/http/httptest" + "reflect" "strings" "testing" "time" @@ -223,6 +225,137 @@ func TestCancelEvent_alreadyGoneIsOK(t *testing.T) { } } +// fakeGraphCalendars serves GET /me/calendars the way Graph does: with $select, each +// calendar carries only the selected properties. A fake that returned every property +// regardless could never notice a decoded property missing from the request's $select. +// onSelect, when non-nil, receives the raw $select value. +func fakeGraphCalendars(t *testing.T, cals []map[string]any, onSelect func(string)) *httptest.Server { + t.Helper() + return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet || !strings.HasSuffix(r.URL.Path, "/me/calendars") { + t.Errorf("unexpected %s %s", r.Method, r.URL.Path) + } + sel := r.URL.Query().Get("$select") + if onSelect != nil { + onSelect(sel) + } + value := cals + if sel != "" { + value = make([]map[string]any, 0, len(cals)) + for _, cal := range cals { + picked := map[string]any{} + for _, prop := range strings.Split(sel, ",") { + if v, ok := cal[prop]; ok { + picked[prop] = v + } + } + value = append(value, picked) + } + } + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(map[string]any{"value": value}) + })) +} + +// graphCalendars are two calendars as Graph describes them: the user's own default, and +// one shared with them read-only (canEdit false). +var graphCalendars = []map[string]any{ + { + "id": "cal-own", "name": "Calendar", "isDefaultCalendar": true, "canEdit": true, + "canShare": true, "color": "auto", + "owner": map[string]any{"name": "Alex", "address": "alex@example.com"}, + }, + { + "id": "cal-shared", "name": "Team rota", "isDefaultCalendar": false, "canEdit": false, + "canShare": false, "color": "lightBlue", + "owner": map[string]any{"name": "Sam", "address": "sam@example.com"}, + }, +} + +func TestListCalendars_writableFollowsCanEdit(t *testing.T) { + c := newTestClient(t) + connect(t, c, "u1") + + srv := fakeGraphCalendars(t, graphCalendars, nil) + defer srv.Close() + c.apiBase = srv.URL + + got, err := c.ListCalendars(context.Background(), "u1", "") + if err != nil { + t.Fatalf("ListCalendars: %v", err) + } + want := []calendar.CalendarInfo{ + {ID: "cal-own", Name: "Calendar", Primary: true, Writable: true}, + {ID: "cal-shared", Name: "Team rota", Primary: false, Writable: false}, + } + if !reflect.DeepEqual(got, want) { + t.Errorf("ListCalendars =\n %+v\nwant\n %+v", got, want) + } +} + +// decodedJSONNames lists the JSON property names a struct decodes. For a Graph response +// item that is the set of properties its request has to $select. +func decodedJSONNames(t *testing.T, typ reflect.Type) []string { + t.Helper() + if typ.Kind() != reflect.Struct { + t.Fatalf("decodedJSONNames(%s): want a struct", typ) + } + var names []string + for i := 0; i < typ.NumField(); i++ { + f := typ.Field(i) + if f.Anonymous { + // encoding/json promotes an embedded struct's fields; not needed yet, so refuse + // rather than under-report. + t.Fatalf("decodedJSONNames(%s): embedded field %s is not handled", typ, f.Name) + } + if !f.IsExported() { + continue + } + name, _, _ := strings.Cut(f.Tag.Get("json"), ",") + if name == "-" { + continue + } + if name == "" { + name = f.Name + } + names = append(names, name) + } + return names +} + +// Graph omits any property the request does not $select, and an absent bool decodes as +// false without error. So every property the response item decodes must be selected, or +// it silently reads as its zero value in production while a lenient fake hides it. +func TestListCalendars_selectNamesEveryDecodedProperty(t *testing.T) { + c := newTestClient(t) + connect(t, c, "u1") + + var gotSelect string + srv := fakeGraphCalendars(t, graphCalendars, func(s string) { gotSelect = s }) + defer srv.Close() + c.apiBase = srv.URL + + if _, err := c.ListCalendars(context.Background(), "u1", ""); err != nil { + t.Fatalf("ListCalendars: %v", err) + } + if gotSelect == "" { + return // no $select: Graph returns the default properties, which is not this bug + } + selected := map[string]bool{} + for _, prop := range strings.Split(gotSelect, ",") { + selected[prop] = true + } + value, ok := reflect.TypeOf(msCalListResp{}).FieldByName("Value") + if !ok { + t.Fatal("msCalListResp has no Value field") + } + for _, name := range decodedJSONNames(t, value.Type.Elem()) { + if !selected[name] { + t.Errorf("$select=%q omits %q, which msCalListResp decodes; Graph will not return it", gotSelect, name) + } + } +} + func mkIDToken(tid string) string { payload := base64.RawURLEncoding.EncodeToString([]byte(`{"tid":"` + tid + `"}`)) return "header." + payload + ".sig" From 7a14a5beafb8dfe30d59e3cbe0b28fab2cd47e2a Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 20:48:36 -0400 Subject: [PATCH 011/250] caldav: move or cancel an event as the account that holds it UpdateEvent and CancelEvent loaded the user's current destination connection and sent its Basic credentials to the stored event URL. A host can connect several CalDAV accounts, so once the destination moved from an account on server A to one on server B, rescheduling or cancelling an older booking sent B's username and app password to server A. A refusal left the event in place and the reconciler retried, resending them every sweep for a cancelled booking and until the end time for a moved one. A 404 was taken as "already gone". Update and cancel now resolve the owning connection from what the booking stored. An account can hold the event only if the event URL lies inside one of its collections (the bound calendar_id or a saved connection_calendars id): same scheme, host and port, path under it at a segment boundary. Among those, the one whose collection is the recorded calendar id wins, else the most specific collection. No match or a tie sends nothing and returns an error for the caller to log. With no CalDAV connection at all it returns nil, as the Provider contract says, and logs a warning. A single account that is still the destination sends exactly the requests it did before. The Service routed update and cancel by the current destination's provider, so after a move to Google or Microsoft the CalDAV event URL went to that provider, which cannot find it, and the event on the CalDAV server was never touched. calendar.EventRecognizer lets a provider claim its own ids; CalDAV claims absolute http(s) URLs, which Google and Microsoft ids never are, and everything else still routes by destination. Tests use two httptest servers that record the credentials on every request: the cross-account move and cancel, an empty calendar id (as reassign passes), an event in a picked sub-calendar, a destination moved to another provider, a disconnected owner, and the ambiguous and no-match cases sending zero requests. Restoring loadConn(ctx, userID, -1, 1) fails three of them with B's password seen on server A. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 26 ++ docs/ARCHITECTURE.md | 14 +- internal/caldav/events.go | 191 ++++++++++- internal/caldav/events_test.go | 593 +++++++++++++++++++++++++++++++++ internal/calendar/calendar.go | 32 +- internal/handler/reassign.go | 2 + 6 files changed, 849 insertions(+), 9 deletions(-) create mode 100644 internal/caldav/events_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index f45a54ce..1b2b32ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,32 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Security +- **Moving or cancelling a CalDAV booking no longer sends another account's app password + to the server holding the event.** A host can connect several CalDAV accounts, and + rescheduling or cancelling authenticated as whichever account was the destination at + the time, not the one the event was written to. After a host moved their destination + from an account on one server to an account on another, every reschedule or cancel of + an older booking sent the new account's username and app password to the old account's + server. A server that refused them left the calendar unchanged and the reconciler + retried, sending them again every sweep for a cancelled booking and until the end time + for a moved one. A server that answered 404 instead was taken at its word: the event + counted as already gone and stayed where it was. + + Update and cancel now authenticate as the account that holds the event, found from what + the booking stored: the calendar recorded at creation, or failing that the connected + calendar whose URL contains the event's URL (same scheme, host and port). If no single + account can be established, nothing is sent and the error is logged. Hosts who moved a + CalDAV destination between accounts on different servers should consider rotating the + app password of the account they moved to. + +### Fixed +- **A CalDAV event is moved or deleted even after the destination moves to Google or + Microsoft.** The event was handed to the new destination's provider, which could not + find an id it never issued, so the event stayed on the CalDAV calendar at its old time, + or after its booking was cancelled. A CalDAV event id is the event's URL, which is now + enough to route it back to the CalDAV provider whatever the destination is. + ## [0.9.0] - 2026-09-10 ### Added diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index e91d5db6..f56010b5 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -543,8 +543,18 @@ from the current destination. otherwise changing the destination orphans every existing booking: the provider 404s, the booking cancels in Calnode, and the meeting stays on the host's calendar with nothing surfaced. Empty means "resolve the old way", correct for bookings that predate the column. -Known limit: this rescues a change of calendar *within* an account, not a move to a -different account, which would need the account recorded too. +Known limit (Google, Microsoft): this rescues a change of calendar *within* an account, not +a move to a different account, which would need the account recorded too. + +CalDAV does not have that limit, because its event id is the event's absolute URL and so +already names the server. `Service.UpdateEvent`/`CancelEvent` route an id the CalDAV +provider recognizes (`calendar.EventRecognizer`) to it whatever the destination is now, and +it authenticates as the connected account that holds the event (`caldav.eventConn`), never +as the destination: the account whose bound or saved calendar is the recorded calendar id, +else whose calendar URL contains the event URL (same scheme, host and port, path under it; +most specific wins). No match, or a tie, sends nothing and returns an error. This is a +credential boundary, not a routing nicety: accounts can live on different servers, and the +destination's app password sent to an older event's URL goes to someone else's server. --- diff --git a/internal/caldav/events.go b/internal/caldav/events.go index 3de088b3..f0ffa1af 100644 --- a/internal/caldav/events.go +++ b/internal/caldav/events.go @@ -2,9 +2,11 @@ package caldav import ( "context" + "errors" "fmt" "io" "net/http" + "net/url" "strings" "time" @@ -41,8 +43,12 @@ func (c *Client) CreateEvent(ctx context.Context, userID string, p calendar.Crea // UpdateEvent moves an existing event to new start/end times. CalDAV has no partial update, so // it GETs the current object, rewrites DTSTART/DTEND (and bumps SEQUENCE/DTSTAMP), and PUTs it // back — preserving summary, description, location, and attendees. +// +// It authenticates as the account that holds the event (eventConn), not as the current +// destination, and returns an error without sending anything when that account cannot be +// established. func (c *Client) UpdateEvent(ctx context.Context, userID, calendarID, eventID string, start, end time.Time) error { - cn, ok, err := c.loadConn(ctx, userID, -1, 1) + cn, ok, err := c.eventConn(ctx, userID, calendarID, eventID) if err != nil || !ok { return err } @@ -67,9 +73,10 @@ func (c *Client) UpdateEvent(ctx context.Context, userID, calendarID, eventID st return nil } -// CancelEvent deletes the event resource from the destination calendar. +// CancelEvent deletes the event resource from the calendar it was written to, as the account +// that holds it (see UpdateEvent). func (c *Client) CancelEvent(ctx context.Context, userID, calendarID, eventID string) error { - cn, ok, err := c.loadConn(ctx, userID, -1, 1) + cn, ok, err := c.eventConn(ctx, userID, calendarID, eventID) if err != nil || !ok { return err } @@ -83,6 +90,184 @@ func (c *Client) CancelEvent(ctx context.Context, userID, calendarID, eventID st return nil } +// RecognizesEvent reports whether eventID is a CalDAV event id: the absolute http(s) URL of +// the event resource, which is what CreateEvent returns. Google and Microsoft ids are opaque +// tokens and never URLs, so calendar.Service uses this to send an update or cancel here even +// after the user's destination has moved to another provider. +func (c *Client) RecognizesEvent(eventID string) bool { + _, ok := parseDAVURL(eventID) + return ok +} + +var ( + errEventNotURL = errors.New("caldav: event id is not a CalDAV resource URL; nothing was sent") + errNoEventOwner = errors.New("caldav: none of the user's CalDAV accounts holds this event (it is not inside any of their calendars); nothing was sent") + errManyEventOwner = errors.New("caldav: more than one of the user's CalDAV accounts could hold this event; nothing was sent") +) + +// eventAccount is one connected CalDAV account and every collection URL it is known to use: the +// calendar bound at connect, then any calendars saved for the account in connection_calendars. +type eventAccount struct { + id, username, pwEnc string + collections []string +} + +// eventConn resolves the connection an update or cancel of eventID must authenticate as: the +// account that holds the event, never whichever account is the destination now. A host can +// connect several CalDAV accounts on different servers and move the destination between them, +// and an event's URL names the server it lives on, so using the destination's credentials sends +// that account's password to another account's server. +// +// ok=false with a nil error means the user has no CalDAV connection at all, so there is no +// account to act as (the Provider contract's "no matching connection"). Otherwise it returns an +// error, having sent nothing, unless pickEventOwner finds exactly one account. +func (c *Client) eventConn(ctx context.Context, userID, calendarID, eventID string) (conn, bool, error) { + var accounts []eventAccount + rows, err := c.db.QueryContext(ctx, ` + SELECT id, COALESCE(account_email,''), access_token_enc, calendar_id + FROM calendar_connections + WHERE user_id = ? AND provider = 'caldav'`, userID) + if err != nil { + return conn{}, false, fmt.Errorf("caldav: load connections: %w", err) + } + for rows.Next() { + var a eventAccount + var bound string + if err := rows.Scan(&a.id, &a.username, &a.pwEnc, &bound); err != nil { + rows.Close() // #nosec G104 -- already returning the scan error; nothing more actionable + return conn{}, false, fmt.Errorf("caldav: scan connection: %w", err) + } + a.collections = []string{bound} + accounts = append(accounts, a) + } + rows.Close() // #nosec G104 -- rows already fully consumed above; nothing actionable on close error + if err := rows.Err(); err != nil { + return conn{}, false, err + } + if len(accounts) == 0 { + c.logger.Warn("caldav: no CalDAV account is connected to move or cancel an event; it stays on its calendar", + "user_id", userID) + return conn{}, false, nil + } + + // A second query, not a join, and only after the cursor above is closed: the pool is a + // single connection. + rows, err = c.db.QueryContext(ctx, ` + SELECT account_email, calendar_id FROM connection_calendars + WHERE user_id = ? AND provider = 'caldav'`, userID) + if err != nil { + return conn{}, false, fmt.Errorf("caldav: load saved calendars: %w", err) + } + for rows.Next() { + var email, calID string + if err := rows.Scan(&email, &calID); err != nil { + rows.Close() // #nosec G104 -- already returning the scan error; nothing more actionable + return conn{}, false, fmt.Errorf("caldav: scan saved calendar: %w", err) + } + for i := range accounts { + if accounts[i].username == email { + accounts[i].collections = append(accounts[i].collections, calID) + } + } + } + rows.Close() // #nosec G104 -- rows already fully consumed above; nothing actionable on close error + if err := rows.Err(); err != nil { + return conn{}, false, err + } + + i, err := pickEventOwner(accounts, calendarID, eventID) + if err != nil { + return conn{}, false, err + } + a := accounts[i] + pw, err := c.decrypt(a.pwEnc) + if err != nil { + return conn{}, false, fmt.Errorf("caldav: decrypt password: %w", err) + } + return conn{id: a.id, username: a.username, password: string(pw)}, true, nil +} + +// pickEventOwner returns the index of the one account that holds eventID. +// +// An account can hold the event only if the event URL lies inside one of its collections: same +// scheme, host and port, and a path under the collection's at a segment boundary. That is what +// guarantees an account's credentials only go to a server that account is already configured to +// use. Among the accounts that pass, one whose collection is the calendar id recorded at creation +// wins; failing that (no id recorded, as for reassign and bookings that predate the column, or a +// calendar no longer saved) the account with the most specific collection does. A tie is refused +// rather than guessed. +func pickEventOwner(accounts []eventAccount, calendarID, eventID string) (int, error) { + ev, ok := parseDAVURL(eventID) + if !ok { + return -1, errEventNotURL + } + cal, calOK := parseDAVURL(calendarID) + + best, tie := -1, false + var bestExact bool + bestDepth := -1 + for i, a := range accounts { + held, exact, depth := false, false, -1 + for _, raw := range a.collections { + col, ok := parseDAVURL(raw) + if !ok || !col.contains(ev) { + continue + } + held = true + exact = exact || (calOK && col.sameCollection(cal)) + depth = max(depth, len(strings.TrimRight(col.path, "/"))) + } + switch { + case !held: + case best < 0 || (exact && !bestExact) || (exact == bestExact && depth > bestDepth): + best, bestExact, bestDepth, tie = i, exact, depth, false + case exact == bestExact && depth == bestDepth: + tie = true + } + } + switch { + case best < 0: + return -1, errNoEventOwner + case tie: + return -1, errManyEventOwner + } + return best, nil +} + +// davURL is the part of a CalDAV URL that decides where a request, and its credentials, go. +type davURL struct { + scheme, host, port, path string +} + +// parseDAVURL accepts only an absolute http(s) URL with a host. The port is made explicit and the +// host lower-cased, so equivalent spellings of one server compare equal. The path is kept in its +// escaped form, the form the event URL was built from. +func parseDAVURL(raw string) (davURL, bool) { + u, err := url.Parse(raw) + if err != nil || (u.Scheme != "http" && u.Scheme != "https") || u.Hostname() == "" { + return davURL{}, false + } + port := u.Port() + if port == "" { + port = map[string]string{"http": "80", "https": "443"}[u.Scheme] + } + return davURL{scheme: u.Scheme, host: strings.ToLower(u.Hostname()), port: port, path: u.EscapedPath()}, true +} + +func (d davURL) sameOrigin(o davURL) bool { + return d.scheme == o.scheme && d.host == o.host && d.port == o.port +} + +// contains reports whether resource lies inside the collection d. +func (d davURL) contains(resource davURL) bool { + dir := strings.TrimRight(d.path, "/") + "/" + return d.sameOrigin(resource) && len(resource.path) > len(dir) && strings.HasPrefix(resource.path, dir) +} + +func (d davURL) sameCollection(o davURL) bool { + return d.sameOrigin(o) && strings.TrimRight(d.path, "/") == strings.TrimRight(o.path, "/") +} + // getICS fetches a calendar resource, returning its body, ETag, and HTTP status. func (c *Client) getICS(ctx context.Context, rawURL, username, password string) (body, etag string, status int, err error) { req, err := http.NewRequestWithContext(ctx, http.MethodGet, rawURL, nil) diff --git a/internal/caldav/events_test.go b/internal/caldav/events_test.go new file mode 100644 index 00000000..c4244d72 --- /dev/null +++ b/internal/caldav/events_test.go @@ -0,0 +1,593 @@ +package caldav + +import ( + "context" + "errors" + "io" + "net/http" + "net/http/httptest" + "reflect" + "strings" + "sync" + "testing" + "time" + + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/slots" +) + +// davReq is one request a davServer received, with the credentials it carried. +type davReq struct { + Method, Path, User, Pass, IfMatch string +} + +// davServer is a CalDAV server that holds the events of exactly one account. It records every +// request together with the Basic credentials it carried, so a test can assert which account's +// password reached which server, and it refuses any other credentials the way a real server does. +type davServer struct { + *httptest.Server + user, pass string + + mu sync.Mutex + got []davReq +} + +func newDAVServer(t *testing.T, user, pass string) *davServer { + t.Helper() + s := &davServer{user: user, pass: pass} + s.Server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + u, p, _ := r.BasicAuth() + s.mu.Lock() + s.got = append(s.got, davReq{Method: r.Method, Path: r.URL.Path, User: u, Pass: p, IfMatch: r.Header.Get("If-Match")}) + s.mu.Unlock() + if u != s.user || p != s.pass { + w.WriteHeader(http.StatusUnauthorized) + return + } + switch r.Method { + case http.MethodGet: + w.Header().Set("ETag", `"v1"`) + io.WriteString(w, "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:x@calnode\r\n"+ + "DTSTART:20260701T090000Z\r\nDTEND:20260701T100000Z\r\nSEQUENCE:0\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n") + case http.MethodPut: + w.WriteHeader(http.StatusCreated) + case http.MethodDelete: + w.WriteHeader(http.StatusNoContent) + default: + w.WriteHeader(http.StatusMethodNotAllowed) + } + })) + t.Cleanup(s.Close) + return s +} + +func (s *davServer) requests() []davReq { + s.mu.Lock() + defer s.mu.Unlock() + return append([]davReq(nil), s.got...) +} + +func (s *davServer) reset() { + s.mu.Lock() + defer s.mu.Unlock() + s.got = nil +} + +// onlyOwnCredentials fails the test if any request to s carried credentials other than the +// account s belongs to. +func (s *davServer) onlyOwnCredentials(t *testing.T, name string) { + t.Helper() + for _, r := range s.requests() { + if r.User != s.user || r.Pass != s.pass { + t.Errorf("server %s received %s %s as %q with password %q; only %q's credentials belong there", + name, r.Method, r.Path, r.User, r.Pass, s.user) + } + } +} + +func (s *davServer) noRequests(t *testing.T, name string) { + t.Helper() + if got := s.requests(); len(got) != 0 { + t.Errorf("server %s received %d request(s), want none: %+v", name, len(got), got) + } +} + +var ( + moveStart = time.Date(2026, 7, 2, 14, 0, 0, 0, time.UTC) + moveEnd = moveStart.Add(time.Hour) +) + +func bookingParams() calendar.CreateEventParams { + return calendar.CreateEventParams{ + Summary: "Intro call", Start: time.Date(2026, 7, 1, 9, 0, 0, 0, time.UTC), + End: time.Date(2026, 7, 1, 10, 0, 0, 0, time.UTC), OrganizerEmail: "booker@x.test", + } +} + +// createOn writes a booking's event while accountEmail is the destination, exactly as the +// booking flow does, and returns the ids the flow stores on booking_hosts. +func createOn(t *testing.T, svc *calendar.Service, accountEmail string) (eventID, calendarID string) { + t.Helper() + ctx := context.Background() + if err := svc.SetDestination(ctx, "u1", "caldav", accountEmail); err != nil { + t.Fatalf("set destination %s: %v", accountEmail, err) + } + eventID, _, calendarID, err := svc.CreateEvent(ctx, "u1", bookingParams()) + if err != nil || eventID == "" { + t.Fatalf("CreateEvent on %s: id=%q err=%v", accountEmail, eventID, err) + } + return eventID, calendarID +} + +func newSvc(c *Client) *calendar.Service { + svc := calendar.NewService(c.db) + svc.Register(c) + return svc +} + +// A host books on CalDAV account A, then makes account B (another server) the destination. +// Moving or cancelling the old booking must authenticate to A's server as A. Before the fix +// both operations sent B's password to A's server, which refused it. +func TestUpdateCancel_eventOnPreviousAccountUsesThatAccount(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + srvA := newDAVServer(t, "a@a.test", "pw-a") + srvB := newDAVServer(t, "b@b.test", "pw-b") + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/"); err != nil { + t.Fatal(err) + } + svc := newSvc(c) + eventID, calendarID := createOn(t, svc, "a@a.test") + if err := svc.SetDestination(ctx, "u1", "caldav", "b@b.test"); err != nil { + t.Fatal(err) + } + srvA.reset() + + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + t.Errorf("UpdateEvent: %v", err) + } + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + t.Errorf("CancelEvent: %v", err) + } + + srvA.onlyOwnCredentials(t, "A") + srvB.noRequests(t, "B") + var methods []string + for _, r := range srvA.requests() { + methods = append(methods, r.Method) + } + if want := []string{"GET", "PUT", "DELETE"}; !reflect.DeepEqual(methods, want) { + t.Errorf("server A saw %v, want %v", methods, want) + } +} + +// Reassign cancels with an empty calendar id (it does not load the stored one), and so do +// bookings made before external_calendar_id existed. The owner is then found from the event +// URL alone. +func TestCancel_emptyCalendarIDResolvesOwnerByURL(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + srvA := newDAVServer(t, "a@a.test", "pw-a") + srvB := newDAVServer(t, "b@b.test", "pw-b") + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/"); err != nil { + t.Fatal(err) + } + svc := newSvc(c) + eventID, _ := createOn(t, svc, "a@a.test") + if err := svc.SetDestination(ctx, "u1", "caldav", "b@b.test"); err != nil { + t.Fatal(err) + } + srvA.reset() + + if err := svc.CancelEvent(ctx, "u1", "", eventID); err != nil { + t.Errorf("CancelEvent with no calendar id: %v", err) + } + if err := svc.UpdateEvent(ctx, "u1", "", eventID, moveStart, moveEnd); err != nil { + t.Errorf("UpdateEvent with no calendar id: %v", err) + } + srvA.onlyOwnCredentials(t, "A") + srvB.noRequests(t, "B") + if n := len(srvA.requests()); n != 3 { + t.Errorf("server A saw %d requests, want 3 (DELETE, GET, PUT): %+v", n, srvA.requests()) + } +} + +// An event written into a calendar picked inside the account (connection_calendars), not the +// account's bound collection, is still found: by its recorded calendar id, and by URL when no +// calendar id was recorded. +func TestUpdate_eventInPickedCalendarResolvesToItsAccount(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + srvA := newDAVServer(t, "a@a.test", "pw-a") + srvB := newDAVServer(t, "b@b.test", "pw-b") + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/"); err != nil { + t.Fatal(err) + } + svc := newSvc(c) + work := srvA.URL + "/calendars/a/work/" + if err := svc.SetAccountCalendars(ctx, "u1", "caldav", "a@a.test", []calendar.CalendarSelection{ + {CalendarInfo: calendar.CalendarInfo{ID: srvA.URL + "/calendars/a/home/"}, CheckConflicts: true}, + {CalendarInfo: calendar.CalendarInfo{ID: work}, CheckConflicts: true, IsDestination: true}, + }); err != nil { + t.Fatal(err) + } + eventID, _, calendarID, err := svc.CreateEvent(ctx, "u1", bookingParams()) + if err != nil || calendarID != work || !strings.HasPrefix(eventID, work) { + t.Fatalf("CreateEvent: id=%q cal=%q err=%v, want an event in %s", eventID, calendarID, err, work) + } + if err := svc.SetDestination(ctx, "u1", "caldav", "b@b.test"); err != nil { + t.Fatal(err) + } + srvA.reset() + + for _, calID := range []string{calendarID, ""} { + if err := svc.UpdateEvent(ctx, "u1", calID, eventID, moveStart, moveEnd); err != nil { + t.Errorf("UpdateEvent(calendarID=%q): %v", calID, err) + } + } + srvA.onlyOwnCredentials(t, "A") + srvB.noRequests(t, "B") + if n := len(srvA.requests()); n != 4 { + t.Errorf("server A saw %d requests, want 4 (two GET+PUT pairs): %+v", n, srvA.requests()) + } +} + +// otherProvider stands in for Google (the provider column only admits real provider names) as +// the user's destination. Like the real one, it cannot find an event id it never issued; it +// records every id it is asked about. +type otherProvider struct { + mu sync.Mutex + touched []string +} + +func (p *otherProvider) record(eventID string) error { + p.mu.Lock() + defer p.mu.Unlock() + p.touched = append(p.touched, eventID) + return errors.New("other: event not found") +} + +func (p *otherProvider) Name() string { return "google" } +func (p *otherProvider) InvitesGuests() bool { return true } +func (p *otherProvider) AuthURL(string) string { return "" } +func (p *otherProvider) EncryptState(string) (string, error) { return "", nil } +func (p *otherProvider) DecryptState(string) (string, error) { return "", nil } +func (p *otherProvider) Exchange(context.Context, string, string, string) error { return nil } +func (p *otherProvider) Connected(context.Context, string) (bool, error) { return true, nil } +func (p *otherProvider) Disconnect(context.Context, string) error { return nil } +func (p *otherProvider) HasDestination(context.Context, string) (bool, error) { return true, nil } +func (p *otherProvider) ListCalendars(context.Context, string, string) ([]calendar.CalendarInfo, error) { + return nil, nil +} +func (p *otherProvider) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return nil, nil +} +func (p *otherProvider) CreateEvent(context.Context, string, calendar.CreateEventParams) (string, string, string, error) { + return "other-event-1", "", "primary", nil +} +func (p *otherProvider) UpdateEvent(_ context.Context, _, _, eventID string, _, _ time.Time) error { + return p.record(eventID) +} +func (p *otherProvider) CancelEvent(_ context.Context, _, _, eventID string) error { + return p.record(eventID) +} + +func seedOtherDestination(t *testing.T, c *Client, svc *calendar.Service) { + t.Helper() + ctx := context.Background() + if _, err := c.db.ExecContext(ctx, ` + INSERT INTO calendar_connections + (id, user_id, provider, account_email, access_token_enc, calendar_id, + check_conflicts, is_destination, created_at) + VALUES ('google-1', 'u1', 'google', 'o@o.test', 'enc', 'primary', 1, 0, '2026-01-03T00:00:00Z')`); err != nil { + t.Fatal(err) + } + if err := svc.SetDestination(ctx, "u1", "google", "o@o.test"); err != nil { + t.Fatal(err) + } +} + +// The destination moves from a CalDAV account to another provider. The CalDAV event must +// still be moved and deleted on its own server, as its own account, and the other provider +// must never be handed a CalDAV event URL. Before the fix the Service routed both calls to +// the new destination's provider, so the event on the CalDAV server was never touched. +func TestUpdateCancel_destinationMovedToAnotherProvider(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + srvA := newDAVServer(t, "a@a.test", "pw-a") + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + other := &otherProvider{} + svc := newSvc(c) + svc.Register(other) + eventID, calendarID := createOn(t, svc, "a@a.test") + seedOtherDestination(t, c, svc) + srvA.reset() + + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + t.Errorf("UpdateEvent: %v", err) + } + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + t.Errorf("CancelEvent: %v", err) + } + if len(other.touched) != 0 { + t.Errorf("the other provider was asked about CalDAV event(s) %v", other.touched) + } + srvA.onlyOwnCredentials(t, "A") + if n := len(srvA.requests()); n != 3 { + t.Errorf("server A saw %d requests, want 3 (GET, PUT, DELETE): %+v", n, srvA.requests()) + } + + // The other provider's own events still route to it, by destination, as before. + if err := svc.CancelEvent(ctx, "u1", "primary", "other-event-1"); err == nil { + t.Error("CancelEvent of the other provider's event: want its error, got nil") + } + if !reflect.DeepEqual(other.touched, []string{"other-event-1"}) { + t.Errorf("other provider touched %v, want [other-event-1]", other.touched) + } +} + +// The CalDAV account that held the event is gone. There are no credentials left that belong +// to its server, so nothing is sent anywhere, and nothing is retried against a provider that +// never issued the id. +func TestUpdateCancel_owningAccountDisconnectedSendsNothing(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + srvA := newDAVServer(t, "a@a.test", "pw-a") + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + other := &otherProvider{} + svc := newSvc(c) + svc.Register(other) + eventID, calendarID := createOn(t, svc, "a@a.test") + seedOtherDestination(t, c, svc) + if err := svc.DisconnectOne(ctx, "u1", "caldav", "a@a.test"); err != nil { + t.Fatal(err) + } + srvA.reset() + + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + t.Errorf("UpdateEvent with no CalDAV account left: %v, want nil (no connection to act as)", err) + } + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + t.Errorf("CancelEvent with no CalDAV account left: %v, want nil (no connection to act as)", err) + } + srvA.noRequests(t, "A") + if len(other.touched) != 0 { + t.Errorf("the other provider was asked about CalDAV event(s) %v", other.touched) + } +} + +// When the stored ids do not identify exactly one of the user's CalDAV accounts, nothing is +// sent: not to the event's server, and not with the destination's credentials. +func TestUpdateCancel_ambiguousOrUnknownOwnerSendsNothing(t *testing.T) { + type setup struct { + c *Client + srvA, srvB *davServer + stranger *davServer // a server none of the user's connections uses + } + newSetup := func(t *testing.T) setup { + c := newTestClient(t) + seedUser(t, c.db, "u1") + s := setup{ + c: c, + srvA: newDAVServer(t, "a@a.test", "pw-a"), + srvB: newDAVServer(t, "b@b.test", "pw-b"), + stranger: newDAVServer(t, "a@a.test", "pw-a"), + } + ctx := context.Background() + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", s.srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", s.srvB.URL+"/calendars/b/home"); err != nil { + t.Fatal(err) + } + return s + } + + cases := []struct { + name string + extra func(t *testing.T, s setup) // optional additional state + ids func(s setup) (calendarID, eventID string) + }{ + { + name: "event on a server no connection uses", + ids: func(s setup) (string, string) { + return "", s.stranger.URL + "/calendars/a/home/ev1.ics" + }, + }, + { + name: "calendar id names an account but the event is on another server", + ids: func(s setup) (string, string) { + return s.srvB.URL + "/calendars/b/home", s.stranger.URL + "/calendars/b/home/ev1.ics" + }, + }, + { + name: "event on a connection's server but outside its collection", + ids: func(s setup) (string, string) { + return "", s.srvA.URL + "/calendars/someone-else/home/ev1.ics" + }, + }, + { + name: "collection path is a prefix only up to a segment boundary", + ids: func(s setup) (string, string) { + return "", s.srvB.URL + "/calendars/b/homework/ev1.ics" + }, + }, + { + name: "event id is not a URL at all (another provider's id)", + ids: func(s setup) (string, string) { + return "primary", "abc123def456" + }, + }, + { + name: "two accounts bound to the same collection", + extra: func(t *testing.T, s setup) { + if err := s.c.saveConnection(context.Background(), "u1", "delegate@a.test", "pw-d", s.srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + }, + ids: func(s setup) (string, string) { + return s.srvA.URL + "/calendars/a/home/", s.srvA.URL + "/calendars/a/home/ev1.ics" + }, + }, + { + name: "two accounts bound to the same collection, no calendar id", + extra: func(t *testing.T, s setup) { + if err := s.c.saveConnection(context.Background(), "u1", "delegate@a.test", "pw-d", s.srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + }, + ids: func(s setup) (string, string) { + return "", s.srvA.URL + "/calendars/a/home/ev1.ics" + }, + }, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + s := newSetup(t) + if tc.extra != nil { + tc.extra(t, s) + } + ctx := context.Background() + svc := newSvc(s.c) + calendarID, eventID := tc.ids(s) + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err == nil { + t.Error("UpdateEvent: want an error when the owning account cannot be established, got nil") + } + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err == nil { + t.Error("CancelEvent: want an error when the owning account cannot be established, got nil") + } + s.srvA.noRequests(t, "A") + s.srvB.noRequests(t, "B") + s.stranger.noRequests(t, "stranger") + }) + } +} + +// The common case, one CalDAV account that is still the destination, sends exactly the +// requests it always did, whether or not a calendar id was recorded. +func TestUpdateCancel_singleAccountUnchanged(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + srvA := newDAVServer(t, "a@a.test", "pw-a") + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + svc := newSvc(c) + eventID, calendarID := createOn(t, svc, "a@a.test") + path := strings.TrimPrefix(eventID, srvA.URL) + srvA.reset() + + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + t.Errorf("UpdateEvent: %v", err) + } + if err := svc.UpdateEvent(ctx, "u1", "", eventID, moveStart, moveEnd); err != nil { + t.Errorf("UpdateEvent (no calendar id): %v", err) + } + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + t.Errorf("CancelEvent: %v", err) + } + if err := svc.CancelEvent(ctx, "u1", "", eventID); err != nil { + t.Errorf("CancelEvent (no calendar id): %v", err) + } + a := func(method, ifMatch string) davReq { + return davReq{Method: method, Path: path, User: "a@a.test", Pass: "pw-a", IfMatch: ifMatch} + } + want := []davReq{ + a("GET", ""), a("PUT", `"v1"`), + a("GET", ""), a("PUT", `"v1"`), + a("DELETE", ""), + a("DELETE", ""), + } + if got := srvA.requests(); !reflect.DeepEqual(got, want) { + t.Errorf("requests:\n got %+v\nwant %+v", got, want) + } +} + +// pickEventOwner decides which account's credentials an event URL may receive, so the origin and +// path rules are pinned directly, including the ones an httptest server cannot exercise (a scheme +// or default-port change needs a second listener on the same address). +func TestPickEventOwner(t *testing.T) { + acct := func(collections ...string) eventAccount { return eventAccount{collections: collections} } + cases := []struct { + name string + accounts []eventAccount + calendarID string + eventID string + want int + wantErr error + }{ + {"inside the bound collection", []eventAccount{acct("https://a.test/cal/a/"), acct("https://b.test/cal/b/")}, + "", "https://a.test/cal/a/e.ics", 0, nil}, + {"inside a saved calendar", []eventAccount{acct("https://a.test/cal/a/"), acct("https://b.test/cal/b/", "https://b.test/cal/b-work/")}, + "https://b.test/cal/b-work/", "https://b.test/cal/b-work/e.ics", 1, nil}, + {"collection stored without a trailing slash", []eventAccount{acct("https://a.test/cal/a")}, + "https://a.test/cal/a/", "https://a.test/cal/a/e.ics", 0, nil}, + {"host case and an explicit default port are the same origin", []eventAccount{acct("https://A.test:443/cal/a/")}, + "", "https://a.TEST/cal/a/e.ics", 0, nil}, + {"http and https are different origins", []eventAccount{acct("https://a.test/cal/a/")}, + "", "http://a.test/cal/a/e.ics", -1, errNoEventOwner}, + {"a non-default port is a different origin", []eventAccount{acct("https://a.test/cal/a/")}, + "", "https://a.test:8443/cal/a/e.ics", -1, errNoEventOwner}, + {"a sibling path is not inside", []eventAccount{acct("https://a.test/cal/a/")}, + "", "https://a.test/cal/ab/e.ics", -1, errNoEventOwner}, + {"the collection itself is not an event inside it", []eventAccount{acct("https://a.test/cal/a/")}, + "", "https://a.test/cal/a/", -1, errNoEventOwner}, + {"the more specific collection wins", []eventAccount{acct("https://a.test/dav/"), acct("https://a.test/dav/b/home/")}, + "", "https://a.test/dav/b/home/e.ics", 1, nil}, + {"one calendar recorded in two accounts is a tie", []eventAccount{acct("https://a.test/dav/b/home/"), acct("https://a.test/dav/b/home/")}, + "https://a.test/dav/b/home/", "https://a.test/dav/b/home/e.ics", -1, errManyEventOwner}, + {"a recorded calendar id outranks a more specific collection", []eventAccount{acct("https://a.test/dav/"), acct("https://a.test/dav/x/")}, + "https://a.test/dav/", "https://a.test/dav/x/e.ics", 0, nil}, + {"equally specific collections on one server tie", []eventAccount{acct("https://a.test/cal/shared/"), acct("https://a.test/cal/shared")}, + "", "https://a.test/cal/shared/e.ics", -1, errManyEventOwner}, + {"a calendar id outside the event's origin does not count", []eventAccount{acct("https://a.test/cal/a/"), acct("https://b.test/cal/a/")}, + "https://b.test/cal/a/", "https://a.test/cal/a/e.ics", 0, nil}, + {"a Google event id", []eventAccount{acct("https://a.test/cal/a/")}, "primary", "7cbh8rpc10lrc0ckih9tafss99", -1, errEventNotURL}, + {"a Microsoft event id", []eventAccount{acct("https://a.test/cal/a/")}, "", "AAMkAGI2TG93AAA=", -1, errEventNotURL}, + {"no accounts", nil, "", "https://a.test/cal/a/e.ics", -1, errNoEventOwner}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + got, err := pickEventOwner(tc.accounts, tc.calendarID, tc.eventID) + if got != tc.want || !errors.Is(err, tc.wantErr) { + t.Errorf("pickEventOwner = (%d, %v), want (%d, %v)", got, err, tc.want, tc.wantErr) + } + }) + } +} + +func TestRecognizesEvent(t *testing.T) { + c := newTestClient(t) + for id, want := range map[string]bool{ + "https://caldav.icloud.com/123/calendars/home/e.ics": true, + "http://nextcloud.lan/remote.php/dav/calendars/u/personal/e.ics": true, + "7cbh8rpc10lrc0ckih9tafss99": false, // Google + "AAMkAGI2TG93AAA=": false, // Microsoft + "": false, + "/calendars/home/e.ics": false, + "mailto:someone@x.test": false, + } { + if got := c.RecognizesEvent(id); got != want { + t.Errorf("RecognizesEvent(%q) = %v, want %v", id, got, want) + } + } +} diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index afaade9c..eda1b5ad 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -79,6 +79,18 @@ type Provider interface { CancelEvent(ctx context.Context, userID, calendarID, eventID string) error } +// EventRecognizer is implemented by a provider whose event ids identify the provider by +// themselves. The Service sends an update or cancel of such an event to that provider whatever +// the user's destination is now, so moving the destination to another provider neither strands +// the events written before the move nor hands their ids to a provider that never issued them. +// +// CalDAV implements it: its event id is the absolute URL of the event resource. Google and +// Microsoft ids are opaque and never URLs; they do not implement it and keep routing by +// destination. +type EventRecognizer interface { + RecognizesEvent(eventID string) bool +} + // Service holds the configured providers and dispatches per-user operations to // whichever provider that user has connected. type Service struct { @@ -384,19 +396,31 @@ func (s *Service) CreateEvent(ctx context.Context, userID string, p CreateEventP return "", "", "", nil } +// providerForEvent resolves the provider an existing event belongs to: the one that recognizes +// its id (EventRecognizer), else the user's destination provider. Returns nil if neither. +func (s *Service) providerForEvent(ctx context.Context, userID, eventID string) Provider { + for _, name := range s.ProviderNames() { + if r, ok := s.providers[name].(EventRecognizer); ok && r.RecognizesEvent(eventID) { + return s.providers[name] + } + } + return s.providerForDestination(ctx, userID) +} + // UpdateEvent moves an event. calendarID is the one recorded at creation; empty falls back -// to the user's current destination. +// to the user's current destination. The provider is the one that recognizes eventID, if any +// does, else the destination's (providerForEvent). func (s *Service) UpdateEvent(ctx context.Context, userID, calendarID, eventID string, start, end time.Time) error { - if pr := s.providerForDestination(ctx, userID); pr != nil { + if pr := s.providerForEvent(ctx, userID, eventID); pr != nil { return pr.UpdateEvent(ctx, userID, calendarID, eventID, start, end) } return nil } // CancelEvent deletes an event. calendarID is the one recorded at creation; empty falls -// back to the user's current destination. +// back to the user's current destination. The provider is chosen as for UpdateEvent. func (s *Service) CancelEvent(ctx context.Context, userID, calendarID, eventID string) error { - if pr := s.providerForDestination(ctx, userID); pr != nil { + if pr := s.providerForEvent(ctx, userID, eventID); pr != nil { return pr.CancelEvent(ctx, userID, calendarID, eventID) } return nil diff --git a/internal/handler/reassign.go b/internal/handler/reassign.go index e3d58c1e..3c68d774 100644 --- a/internal/handler/reassign.go +++ b/internal/handler/reassign.go @@ -162,6 +162,8 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { // Reassignment cancels on the OLD host's calendar. Their stored calendar id is not // loaded here, so this falls back to resolving their destination - the same // behaviour as before, and correct unless they also moved their destination. + // A CalDAV event is the exception: its id is its URL, which is enough to find the + // account that holds it wherever the destination is now. if err := gc.CancelEvent(ctx, oldHostID, "", extEventID); err != nil { h.logger.Error("reassign: delete old calendar event", "error", err, "booking_id", bCopy.ID) } From 57db7dc5be45a0595cb597a01f37f3b0188b7bc5 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 21:01:52 -0400 Subject: [PATCH 012/250] =?UTF-8?q?docs:=20match=20the=20=C2=A76=20sentenc?= =?UTF-8?q?e=20to=20#49,=20which=20ends=20MCP=20access=20without=20deletin?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous commit described archive as deleting a member's sessions and MCP tokens. #49 closed the hole differently: the OAuth bearer check and the refresh grant both refuse an archived member, and archive deletes nothing, so restore stays a true reverse. The sentence now says what #49 does. It still describes the tree once #49 is in, so this merges after it. Co-Authored-By: Claude Opus 5 (1M context) --- docs/ARCHITECTURE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 4abcb1e8..ba1f2c69 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -199,8 +199,8 @@ the platform/recovery secret doesn't expose secrets. revoking sessions alone would leave an agent holding the authority just withdrawn. Both deletes run in one transaction, so "revoked" is never half-true. This endpoint signs someone out; it does not offboard them. Offboarding is archive - (next bullet), and archive ends MCP access on its own: the OAuth bearer check refuses - an archived member, and archive deletes their sessions and MCP tokens. API keys + (next bullet), which ends MCP access on its own: the OAuth bearer check and the + refresh grant both refuse an archived member. API keys (`cno_`) are deliberately left alone here, which is safe only because an archived member's keys are already refused (the key path in `auth.go`), so an offboarded member's keys stop working through archive, not through this endpoint. From 33d2ed0e6cff47851f82daab22ac83d29fd57f9e Mon Sep 17 00:00:00 2001 From: Distronode Date: Wed, 16 Sep 2026 21:16:57 -0400 Subject: [PATCH 013/250] docs: say who can connect an unpublished Zoom app, and what to do otherwise (#52) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Settings → Zoom told operators they could keep the Zoom app unpublished because "your own team's Zoom users can still connect". Read in Calnode, "team" means the people on the Members page, and that is not what Zoom allows: an unpublished General app can only be authorized by users inside the Zoom account that created it. A member with their own Zoom account is refused on marketplace.zoom.us/error before the request ever reaches /v1/zoom/callback, so nothing in Calnode can catch or explain it (#35). The settings step now says who can connect, and DEPLOY.md gains a Zoom section: the account rule, Zoom's three ways past it (bring hosts into the app's account, beta sharing, publishing) with Zoom's own limits and links, and the fallback that needs no Zoom app at all, a Zoom link on the event type, which mintMeetingLink already uses when a host has not connected. A troubleshooting row names the symptom. First run and Troubleshooting move to §9 and §10; nothing referred to them by number. Co-authored-by: Distronode <254259913+distronode-com@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) --- CHANGELOG.md | 9 +++++ DEPLOY.md | 39 ++++++++++++++++++- .../src/routes/settings/zoom/+page.svelte | 6 ++- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f45a54ce..6d8f8a49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,15 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Fixed +- **The Zoom setup text no longer promises that an unpublished app works for "your own + team".** Zoom only lets users inside the Zoom account that owns an unpublished app + authorize it, so a member with their own Zoom account was refused on a Zoom error page + that Calnode never sees. Settings → Zoom now says so, and `DEPLOY.md` gains a Zoom + section with Zoom's three ways around it (same account, beta sharing, publishing) and + the link-only fallback that needs no Zoom app. Answers + [#35](https://github.com/Calnode/calnode/issues/35). + ## [0.9.0] - 2026-09-10 ### Added diff --git a/DEPLOY.md b/DEPLOY.md index 3ad7cbb2..f45a1b4d 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -297,7 +297,41 @@ Full setup guide, including recording consent, the AI notetaker, and host contro --- -## 8. First run +## 8. Zoom meeting links + +Optional. With a Zoom app configured in **Settings → Zoom**, each host connects their own +Zoom account (Calendar page) and a Zoom-located booking gets a meeting minted under the +assigned host's account. The settings page shows the exact **Redirect URL** to register +(`https:///v1/zoom/callback`). + +**Who can connect depends on how the Zoom app is distributed, and that is Zoom's rule, +not Calnode's.** A Zoom **General app** that is not published to the Zoom App Marketplace +can only be authorized by users inside the Zoom account that created it. A member who signs +in with their own, separate Zoom account is refused by Zoom before the request ever reaches +Calnode (they land on a Marketplace "Something went wrong" page). Zoom offers three ways +around that, none of them a Calnode setting: + +- **Bring the hosts into your Zoom account.** Members of the app's own Zoom account can + connect an unpublished app. Joining puts their Zoom user under your account's + administration and licensing, so this suits a team that already shares one Zoom + account, not independent people. +- **Beta sharing.** On request, Zoom's review team can approve an authorization URL for + users outside your account: up to 100 of them for a user-level app, valid for 4 weeks + with two further 4-week extensions. It is a test channel, not a permanent one. +- **Publish the app** to the Zoom App Marketplace, which requires passing Zoom's app + review. + +Details: Zoom's [App distribution](https://developers.zoom.us/docs/distribute/) and +[Sharing private and beta apps](https://developers.zoom.us/docs/distribute/sharing-private-and-beta-apps/). + +If none of those fits, a Zoom-located event type still works without any Zoom app: set a +**Zoom link** on the event type and every booking carries that link (one link per event +type, so it suits a personal meeting room rather than a rotation of hosts). The built-in +video rooms (§7) need no per-host account at all. + +--- + +## 9. First run Open `https:///` → it redirects to `/admin/`. On a fresh database you'll be guided through **first-run setup** (create the owner account). Then: @@ -306,7 +340,7 @@ first event type + availability. --- -## 9. Troubleshooting +## 10. Troubleshooting | Symptom | Likely cause | |---|---| @@ -315,6 +349,7 @@ first event type + availability. | `ERR_CERT_COMMON_NAME_INVALID` on a new domain | Cert not issued yet — wait; ensure the DNS record is **DNS-only**, not proxied. | | 403 on admin actions behind a proxy | Proxy not forwarding the original `Host` header (CSRF same-origin check). | | OAuth `redirect_uri_mismatch` | Registered URI doesn't match `BASE_URL` + `/v1/...callback` exactly. | +| Connecting Zoom works for you but a member lands on Zoom's "Something went wrong" page | The Zoom app is unpublished and the member's Zoom account is not in the account that owns it (§8). | | Email `550 domain not verified` | From address domain isn't verified with your email provider. | | Logo broken in email when testing locally | Gmail's image proxy can't reach `localhost` — only loads from a public URL. | | Litestream `InvalidAccessKeyId` / 403, log shows `endpoint=""` | `LITESTREAM_ENDPOINT` unset (or the running build predates the endpoint/region config) → Litestream defaults to AWS. Set the **account** endpoint (no bucket) + `region=auto` for R2, and redeploy so the config is live. | diff --git a/frontend/src/routes/settings/zoom/+page.svelte b/frontend/src/routes/settings/zoom/+page.svelte index 8a9c4328..b4062c68 100644 --- a/frontend/src/routes/settings/zoom/+page.svelte +++ b/frontend/src/routes/settings/zoom/+page.svelte @@ -59,8 +59,10 @@
  • 2
    - Choose a General App (User-managed OAuth). You can keep it - unpublished — your own team's Zoom users can still connect. + Choose a General App (User-managed OAuth). While it is + unpublished, Zoom only lets users inside the Zoom account that owns + the app connect; hosts with their own separate Zoom accounts need a published app + (see DEPLOY.md, "Zoom meeting links").
  • From 72cafb641eece5361c23999c589219d901a30800 Mon Sep 17 00:00:00 2001 From: Distronode Date: Wed, 16 Sep 2026 21:18:59 -0400 Subject: [PATCH 014/250] server: let an operator frame the admin console, and nothing else (#40) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Second of the features split out of #30. FRAME_ANCESTORS is a space-separated list of origins allowed to embed /admin/ in a frame; when set, the admin routes send `Content-Security-Policy: frame-ancestors `. Unset, nothing is sent and /admin/ behaves exactly as it does today. Three deliberate refusals, each of which is the interesting half: ⛔ Scoped to the admin SPA, and it must stay that way. The public booking pages set `frame-ancestors 'none'` plus `X-Frame-Options: DENY` in their own handlers and this never reaches them. They are unauthenticated pages that collect names, emails and card details, and clickjacking one is worth more to an attacker than framing a console nobody can open without a session. ⛔ An entry that is not `https://host[:port]` or `'self'` stops the process booting rather than being dropped. A browser discards a source list it cannot parse, so a typo would leave the admin UI MORE embeddable than leaving the setting unset — the one failure mode a validation error must not have. ⛔ No X-Frame-Options is sent beside the CSP. That header has no allow-list form (its ALLOW-FROM was implemented by one browser and is dead), so the only value it could carry is SAMEORIGIN, which every browser that reads it applies INSTEAD of honouring frame-ancestors — breaking the embedding this exists to enable. With the list empty the wrapped handler sends no frame header at all rather than a default deny, because adding one would be a behaviour change smuggled in on an opt-in setting. TestAdminSPA_sendsNoFrameHeadersWhenUnset pins that. ⛔ One caveat the CSP cannot express, recorded in DEPLOY.md, ARCHITECTURE §786 and on the config field: calnode_session is SameSite=Lax, so a browser withholds it from a subresource request made by a CROSS-SITE parent. A console on an unrelated registrable domain gets exactly the frame it asked for and a login screen inside it, with nothing in the response saying why. Same-site parents ('self', or a host under BASE_URL's domain) are the working case. Relaxing that means SameSite=None on the session cookie, which withdraws the CSRF protection Lax gives every other route, so it is not offered as a setting. Mutation-checked rather than assumed: with the Set call replaced by a discard, TestAdminSPA_frameAncestorsWhenConfigured and ...OnSPAFallback both fail. Co-authored-by: Sean Dean <254259913+distronode-com@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) --- CHANGELOG.md | 13 +++++ DEPLOY.md | 1 + cmd/calnode/main.go | 7 +++ docs/ARCHITECTURE.md | 27 +++++++++ internal/config/config.go | 81 ++++++++++++++++++++++++++ internal/config/config_test.go | 74 +++++++++++++++++++++++ internal/server/frameancestors_test.go | 59 +++++++++++++++++++ internal/server/middleware.go | 35 +++++++++++ internal/server/server.go | 5 +- 9 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 internal/server/frameancestors_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d8f8a49..0f1ce7cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,19 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad pool could satisfy are all excluded, so the explanation never appears attached to the wrong cause. Three new/changed keys in all eight locales. +- **`FRAME_ANCESTORS`: embed the admin UI in your own console.** Space-separated origins + (`https://console.example.com 'self'`); when set, `/admin/` sends + `Content-Security-Policy: frame-ancestors `. The public booking pages are + untouched and still deny framing outright — this is about the console, not the pages + that take card details. + + Two deliberate refusals. An entry that is not `https://host[:port]` or `'self'` stops + the app booting rather than being ignored, because a browser drops a source list it + cannot parse, which would leave the admin UI *more* embeddable than the setting being + unset. And no `X-Frame-Options` is sent beside it: that header has no allow-list form, + so the only value it could carry is `SAMEORIGIN`, which browsers honour instead of the + CSP and would break the embedding this exists for. + ### Fixed - **Constraint violations are recognised by SQLite's error code rather than by its English message.** Thirteen call sites asked `strings.Contains(err.Error(), "UNIQUE diff --git a/DEPLOY.md b/DEPLOY.md index f45a1b4d..d16e3fba 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -36,6 +36,7 @@ This guide covers a generic Docker deploy and a step-by-step **Railway** deploy | `LITESTREAM_REPLICA_URL` | recommended | — | Enables continuous SQLite backup (see §6). | | `COOKIE_SECURE` | no | https→true | Override cookie Secure flag; defaults from `BASE_URL` scheme. | | `TRUSTED_PROXY_CIDRS` | no | — | Comma-separated CIDRs (a bare address = one host) whose `X-Forwarded-For` is believed when keying per-IP rate limits, e.g. `10.0.0.0/8`. Include a fronting CDN's own ranges so the walk steps over its edge and lands on the visitor. Unset ⇒ the header is ignored and the limit keys on the TCP peer, so behind a CDN every visitor shares one bucket. **Only list networks you control**: anything in the list can name any client IP it likes. Single-value vendor headers (`CF-Connecting-IP`, `X-Real-IP`) are never read, from any peer. | +| `FRAME_ANCESTORS` | no | — | **Space**-separated origins allowed to embed the **admin UI** in a frame, e.g. `https://console.example.com 'self'`. Each entry must be `https://host[:port]` or `'self'` — anything else and **the app refuses to start**, because browsers drop a policy they cannot parse. Does not affect the public booking pages, which always deny framing. ⛔ **Same-site only in practice**: `calnode_session` is `SameSite=Lax`, so a cross-site parent can frame `/admin/` and still never be sent the cookie — it gets the login screen inside the frame. Use `'self'` or a host sharing `BASE_URL`'s registrable domain. | | `LOG_LEVEL` | no | `info` | `debug`/`info`/`warn`/`error`. | ¹ Email is optional to boot, but bookings won't send confirmations until SMTP is configured (env **or** the admin UI). Precedence is **env var > DB setting > default**. diff --git a/cmd/calnode/main.go b/cmd/calnode/main.go index 29a38aae..115a6954 100644 --- a/cmd/calnode/main.go +++ b/cmd/calnode/main.go @@ -53,6 +53,13 @@ func main() { bi := buildinfo.Get() logger.Info("starting calnode", "version", bi.Version, "commit", bi.Commit, "build_time", bi.BuildTime, "dirty", bi.Dirty) + // Config whose wrong value is worse than its absence is checked here rather than + // tolerated at request time — see (*config.Config).Validate. + if err := cfg.Validate(); err != nil { + logger.Error("invalid configuration", "error", err) + os.Exit(1) + } + if cfg.GoogleClientID != "" { slog.Info("Google OAuth configured", "client_id_prefix", cfg.GoogleClientID[:20]) } else { diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index e91d5db6..f45889d9 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -783,6 +783,33 @@ as the desired state: strict default and relaxes only when head code-injection is configured (broad `https:` or the operator's `tracking_csp_allow`). Don't re-hardcode the CSP on the `book`/`manage` handlers — route it through `publicCSP`. +9. **`FRAME_ANCESTORS` is the admin SPA's only, and it must stay that way.** Set it + (space-separated `https://host[:port]` / `'self'`) and the handler under `/admin/` + sends `Content-Security-Policy: frame-ancestors ` so an operator can embed the + console in their own tooling. `internal/server`'s `FrameAncestors` middleware wraps + `frontend.Handler()` and nothing else: the public booking pages keep + `frame-ancestors 'none'` + `X-Frame-Options: DENY` unconditionally, because they are + unauthenticated pages collecting names, emails and card details and clickjacking one + is worth more than framing a console nobody reaches without a session. + ⚠️ **Unset sends no frame header at all, which is what `/admin/` has always sent** — + the SPA is framable by default. This setting deliberately does *not* add a default + deny, since an opt-in flag must not smuggle in a behaviour change; + `TestAdminSPA_sendsNoFrameHeadersWhenUnset` pins the current answer so changing it is + a decision. No `X-Frame-Options` is sent beside the CSP either: that header has no + allow-list form (`ALLOW-FROM` is dead), so the only value it could carry is + `SAMEORIGIN`, which browsers apply *instead of* the CSP and would break the embedding. + An entry that isn't `https://host[:port]` or `'self'` fails `config.Validate()` and the + process **refuses to start** — a browser drops a source list it cannot parse, so a + typo would otherwise leave `/admin/` more embeddable than with the setting unset. + ⛔ **The CSP is only half of what an embed needs, and the other half is not + configurable.** `calnode_session` is `SameSite=Lax` (`session.go`), so a browser does + not send it on a subresource request from a **cross-site** parent. A console on an + unrelated eTLD+1 may therefore frame `/admin/` after this setting and still get the + login screen inside the frame, forever — the header permits the embed and the cookie + declines to authenticate it. Working embeds are same-site: `'self'`, or a parent + sharing `BASE_URL`'s registrable domain. Relaxing that means `SameSite=None; Secure` + on the session cookie, which removes the CSRF protection the `Lax` default provides + for every other route, so it is deliberately not offered as a setting. --- diff --git a/internal/config/config.go b/internal/config/config.go index 8e19f059..bf63157e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,7 +1,9 @@ package config import ( + "fmt" "log/slog" + "net/url" "os" "strconv" "strings" @@ -67,6 +69,28 @@ type Config struct { // walk steps over its edge address and lands on the visitor. TrustedProxyCIDRs []string + // FrameAncestors lists the origins allowed to embed the admin SPA in a frame, as a + // Content-Security-Policy frame-ancestors source list. Space-separated, matching the + // CSP syntax it becomes. Empty (the default) ⇒ nothing is sent and /admin/ behaves + // exactly as it did. Each entry must be `https://host[:port]` or `'self'`; anything + // else fails Validate and the process refuses to start, because a directive the + // browser cannot parse is a directive that silently allows everything. + // + // Only the admin SPA is affected. The public booking pages keep their + // `frame-ancestors 'none'` + `X-Frame-Options: DENY` unconditionally — those are + // unauthenticated pages that take payment details, and no operator convenience is + // worth making them embeddable. + // + // ⛔ Permitting the frame is not the same as making it work, and this setting is only + // the first half. calnode_session is SameSite=Lax, so a browser withholds it from a + // subresource request made by a CROSS-SITE parent: an operator who lists a console on + // an unrelated registrable domain gets the frame they asked for and a login screen + // inside it, with nothing in the response explaining why. Same-site parents ('self', + // or a host under BASE_URL's registrable domain) are the working case. The fix would + // be SameSite=None on the session cookie, which withdraws the CSRF protection Lax + // gives every other route, so it is not on offer here. + FrameAncestors []string + // DemoMode turns this instance into a public, self-resetting demo: seeds sample // data on every boot (there's no persistent volume, so every boot is a fresh DB), // disables calendar/Zoom connect, serves a disallow-all robots.txt, and exposes @@ -106,6 +130,9 @@ func Load() *Config { EmbedAllowedOrigins: splitCSV(getEnv("EMBED_ALLOWED_ORIGINS", "")), DataDir: getEnv("DATA_DIR", "data"), TrustedProxyCIDRs: splitCSV(getEnv("TRUSTED_PROXY_CIDRS", "")), + // Space-separated, not comma: the value goes into a CSP source list verbatim, so + // it reads the same in the env var as it does in the header. + FrameAncestors: strings.Fields(getEnv("FRAME_ANCESTORS", "")), } cfg.EncryptionKey = os.Getenv("CALNODE_ENCRYPTION_KEY") @@ -121,6 +148,60 @@ func Load() *Config { return cfg } +// Validate reports the configuration errors an operator has to fix before the process +// can safely serve traffic. Called from main after Load; a non-nil error is fatal. +// +// It holds the settings whose wrong value is worse than their absence. A malformed CSP +// directive is the example: browsers drop a source list they cannot parse, so the admin +// UI would end up MORE embeddable than with the setting unset, and nothing in the +// response would say so. +func (c *Config) Validate() error { + for _, origin := range c.FrameAncestors { + if err := validFrameAncestor(origin); err != nil { + return fmt.Errorf("FRAME_ANCESTORS: %w", err) + } + } + return nil +} + +// validFrameAncestor accepts 'self' or an https origin with no path, credentials, query +// or fragment. +// +// Wildcards are deliberately refused even though CSP allows them. `https://*.example.com` +// trusts every host any subdomain of that name ever points at, including one taken over +// later; an operator who needs two hosts can name two hosts. Plain http is refused for +// the same reason the admin session cookie is Secure — the framing page would be able to +// read nothing, but its own compromise becomes a foothold. +func validFrameAncestor(origin string) error { + if origin == "'self'" { + return nil + } + if strings.HasPrefix(origin, "'") { + // 'none', 'unsafe-inline' and friends are keywords this setting has no use for: + // 'none' is not "unset" (see FrameAncestors) and the rest are not source + // expressions at all. Refusing them keeps the accepted grammar one line long. + return fmt.Errorf("%q is not a supported keyword; use 'self' or an https:// origin", origin) + } + u, err := url.Parse(origin) + switch { + case err != nil: + return fmt.Errorf("%q is not a URL: %w", origin, err) + case u.Scheme != "https": + return fmt.Errorf("%q must use https://", origin) + case u.Host == "": + return fmt.Errorf("%q has no host", origin) + case strings.Contains(u.Host, "*"): + return fmt.Errorf("%q must name one host, not a wildcard", origin) + case u.User != nil: + return fmt.Errorf("%q must not carry credentials", origin) + case u.Path != "" && u.Path != "/": + return fmt.Errorf("%q must be an origin, with no path", origin) + case u.RawQuery != "" || u.Fragment != "": + return fmt.Errorf("%q must be an origin, with no query or fragment", origin) + } + return nil +} + func parseLogLevel(s string) slog.Level { switch s { case "debug": diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 990f1e4c..4b727c42 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -134,3 +134,77 @@ func TestLoad_dataDir(t *testing.T) { t.Errorf("DataDir = %q; want /var/lib/calnode", cfg.DataDir) } } + +// --------------------------------------------------------------------------- +// FRAME_ANCESTORS +// --------------------------------------------------------------------------- + +func TestLoad_frameAncestorsIsSpaceSeparated(t *testing.T) { + t.Setenv("FRAME_ANCESTORS", " https://console.example.test 'self' ") + + cfg := config.Load() + + if len(cfg.FrameAncestors) != 2 { + t.Fatalf("FrameAncestors = %#v; want 2 entries", cfg.FrameAncestors) + } + if cfg.FrameAncestors[0] != "https://console.example.test" || cfg.FrameAncestors[1] != "'self'" { + t.Errorf("FrameAncestors = %#v; want the two sources unchanged", cfg.FrameAncestors) + } + if err := cfg.Validate(); err != nil { + t.Errorf("Validate() = %v; want nil", err) + } +} + +func TestLoad_frameAncestorsDefaultsToEmpty(t *testing.T) { + os.Unsetenv("FRAME_ANCESTORS") + + cfg := config.Load() + + if len(cfg.FrameAncestors) != 0 { + t.Errorf("FrameAncestors = %#v; want empty", cfg.FrameAncestors) + } + if err := cfg.Validate(); err != nil { + t.Errorf("Validate() = %v; want nil", err) + } +} + +// A directive the browser cannot parse is dropped whole, which would leave the admin SPA +// more embeddable than with the setting unset. Refusing to start is the only outcome that +// cannot be missed. +func TestValidate_rejectsBadFrameAncestors(t *testing.T) { + cases := map[string]string{ + "plain http": "http://console.example.test", + "no scheme": "console.example.test", + "wildcard host": "https://*.example.test", + "with a path": "https://console.example.test/admin", + "with a query": "https://console.example.test?x=1", + "credentials": "https://user:pw@console.example.test", + "none keyword": "'none'", + "unsafe keyword": "'unsafe-inline'", + "scheme only": "https://", + } + for name, value := range cases { + t.Run(name, func(t *testing.T) { + t.Setenv("FRAME_ANCESTORS", value) + if err := config.Load().Validate(); err == nil { + t.Errorf("Validate() = nil for %q; want an error", value) + } + }) + } +} + +// One bad entry beside a good one still fails: a half-applied source list is a policy +// nobody wrote. +func TestValidate_rejectsAListWithOneBadEntry(t *testing.T) { + t.Setenv("FRAME_ANCESTORS", "https://good.example.test http://bad.example.test") + if err := config.Load().Validate(); err == nil { + t.Error("Validate() = nil; want an error naming the http entry") + } +} + +func TestValidate_acceptsAPortAndATrailingSlash(t *testing.T) { + t.Setenv("FRAME_ANCESTORS", "https://console.example.test:8443 https://other.example.test/") + if err := config.Load().Validate(); err != nil { + t.Errorf("Validate() = %v; want nil", err) + } +} diff --git a/internal/server/frameancestors_test.go b/internal/server/frameancestors_test.go new file mode 100644 index 00000000..f5867944 --- /dev/null +++ b/internal/server/frameancestors_test.go @@ -0,0 +1,59 @@ +package server + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/calnode/calnode/frontend" +) + +// serveAdminSPA runs a request through the admin SPA handler wrapped exactly as New +// wraps it, and returns the response. +func serveAdminSPA(origins []string, path string) *httptest.ResponseRecorder { + h := FrameAncestors(origins)(frontend.Handler()) + rec := httptest.NewRecorder() + h.ServeHTTP(rec, httptest.NewRequest(http.MethodGet, path, nil)) + return rec +} + +// ⚠️ This pins what /admin/ sends TODAY, which is no frame header at all: the SPA is +// framable by any site unless an operator says otherwise. FRAME_ANCESTORS deliberately +// does not change that when unset — an opt-in setting must not smuggle in a default deny +// — so this test exists to make the next person's change to it deliberate rather than +// incidental. The public booking pages are the ones that carry an unconditional DENY. +func TestAdminSPA_sendsNoFrameHeadersWhenUnset(t *testing.T) { + for _, path := range []string{"/", "/bookings", "/favicon.svg"} { + t.Run(path, func(t *testing.T) { + rec := serveAdminSPA(nil, path) + if got := rec.Header().Get("Content-Security-Policy"); got != "" { + t.Errorf("Content-Security-Policy = %q; want it absent", got) + } + if got := rec.Header().Get("X-Frame-Options"); got != "" { + t.Errorf("X-Frame-Options = %q; want it absent", got) + } + }) + } +} + +func TestAdminSPA_frameAncestorsWhenConfigured(t *testing.T) { + rec := serveAdminSPA([]string{"https://console.example.test", "'self'"}, "/") + + want := "frame-ancestors https://console.example.test 'self'" + if got := rec.Header().Get("Content-Security-Policy"); got != want { + t.Errorf("Content-Security-Policy = %q; want %q", got, want) + } + // X-Frame-Options has no allow-list form, and SAMEORIGIN would be honoured instead of + // the CSP by the browsers that read it, breaking the embedding this enables. + if got := rec.Header().Get("X-Frame-Options"); got != "" { + t.Errorf("X-Frame-Options = %q; want it absent alongside frame-ancestors", got) + } +} + +// The SPA fallback route (any client-side path) carries it too, not just the shell. +func TestAdminSPA_frameAncestorsOnSPAFallback(t *testing.T) { + rec := serveAdminSPA([]string{"'self'"}, "/settings/video") + if got := rec.Header().Get("Content-Security-Policy"); got != "frame-ancestors 'self'" { + t.Errorf("Content-Security-Policy = %q; want frame-ancestors 'self'", got) + } +} diff --git a/internal/server/middleware.go b/internal/server/middleware.go index 0f5c412d..a1f970fd 100644 --- a/internal/server/middleware.go +++ b/internal/server/middleware.go @@ -240,6 +240,41 @@ func (rl *rateLimiter) cleanup() { } } +// FrameAncestors returns middleware that sets `Content-Security-Policy: +// frame-ancestors ` on the responses it wraps, so an operator can embed the +// admin SPA in their own console. An empty list is a pass-through. +// +// ⛔ Scoped to the admin SPA on purpose, and it must stay that way. The public booking +// pages set `frame-ancestors 'none'` plus `X-Frame-Options: DENY` in their own handlers +// (book.go, manage_handler.go, tracking_settings.go's publicCSP) and this must never +// reach them: they are unauthenticated pages that collect names, emails and card +// details, and clickjacking one is worth more to an attacker than framing an admin UI +// nobody can reach without a session. +// +// No `X-Frame-Options` is set beside the CSP. That header has no allow-list form — its +// `ALLOW-FROM` was only ever implemented by one browser and is dead — so the only value +// it could carry here is `SAMEORIGIN`, which every browser that reads it would apply +// INSTEAD of honouring the CSP, breaking the embedding this exists to enable. Every +// browser that can frame anything today supports frame-ancestors. +// +// ⚠️ With the list empty the wrapped handler sends no frame header at all, which is what +// /admin/ has always sent: this middleware does not add a default deny, because that +// would be a behaviour change smuggled in on an opt-in setting. See +// TestAdminSPA_sendsNoFrameHeadersWhenUnset, which pins it. +func FrameAncestors(origins []string) func(http.Handler) http.Handler { + if len(origins) == 0 { + return func(next http.Handler) http.Handler { return next } + } + policy := "frame-ancestors " + strings.Join(origins, " ") + return func(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // Set before next writes: a header added after the first Write is dropped. + w.Header().Set("Content-Security-Policy", policy) + next.ServeHTTP(w, r) + }) + } +} + // remoteIP returns the IP a per-IP limit keys on. // // By default that is the TCP-level remote address, stripped of its port, and the diff --git a/internal/server/server.go b/internal/server/server.go index 460b46f7..a0825e45 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -533,7 +533,10 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge mux.Handle("GET /favicon.ico", favicon) // Admin SPA — served at /admin/* with SPA fallback for client-side routing. - adminSPA := frontend.Handler() + // FrameAncestors is applied here and nowhere else: FRAME_ANCESTORS is about embedding + // the admin console, and the public pages' own DENY must not be reachable from a + // config flag. + adminSPA := FrameAncestors(cfg.FrameAncestors)(frontend.Handler()) mux.Handle("GET /admin", http.RedirectHandler("/admin/", http.StatusMovedPermanently)) mux.Handle("/admin/", http.StripPrefix("/admin", adminSPA)) From 4345e1b3ff58a75c608e60773a8c8628b5759cde Mon Sep 17 00:00:00 2001 From: Distronode Date: Wed, 16 Sep 2026 21:19:08 -0400 Subject: [PATCH 015/250] deps: clear the fourteen advisories Scorecard reports, by version bump only (#43) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenSSF Scorecard's OSV check reports fourteen advisories against this tree. None of them needs a code change; all but one are closed by moving a version. Go: GO-2026-6303 · GO-2026-6354 · GO-2026-6355 · GO-2026-5932 golang.org/x/crypto v0.53.0 -> v0.56.0 Nothing behavioural changes here. The affected packages in those four advisories are x/crypto/ssh and x/crypto/openpgp; this tree imports only bcrypt and argon2 (internal/keyvault/keyvault.go, internal/handler/{claim,email_auth,invites}.go, cmd/calnode/reset_admin.go), neither of which is touched by any of them. The bump is still worth taking so the module graph stops reporting them. go.sum moves two lines and no other module moves. The `go` directive goes from `go 1.26` to `go 1.26.0` because x/crypto v0.56.0 declares `go 1.26.0` and the go command requires the main module to be at least that; `go 1.26` alone now fails with "updates to go.mod needed". Same language version, written out. GHSA-q7pp-wcgr-pffx github.com/disintegration/imaging v1.6.2 -> not fixed upstream Left alone deliberately: there is no fixed release. imaging is also not on a reachable path for it here. Every call site (avatar.go, branding_settings.go) goes through decodeUploadedImage in internal/handler/image_upload.go, which sniffs the content type with http.DetectContentType and rejects anything that is not JPEG, PNG, GIF or WebP before decoding, and it caps decoded pixels. imaging itself is only ever asked for imaging.Fit on an already-decoded image.Image - its decoders are never called. Frontend: GHSA-29g2-3rmr-qm68 · GHSA-866w-xmhq-wj7x · GHSA-wqjv-9729-c5q2 @sveltejs/kit ^2.65.1 -> ^2.70.2 (resolves 2.70.3) All three are in Kit's server runtime, which this project never runs: the admin app builds with adapter-static and fallback: '200.html' (see frontend/svelte.config.js) and is served as static files embedded into the Go binary. The bump is still the right answer rather than an exception note - the dependency is in the tree, and five minors of Kit fixes come with it. GHSA-p63j-vcc4-9vmv @vitest/browser ^4.1.9 -> ^4.1.10 (resolves 4.1.11) vitest ^4.1.9 -> ^4.1.10 (resolves 4.1.11) @vitest/browser-playwright ^4.1.9 -> ^4.1.10 (resolves 4.1.11) Test-only, but rated critical. Vitest's packages peer-depend on each other at an exact version, so all three move together or pnpm reports an unmet peer. GHSA-fxqj-rqcc-2cmp · GHSA-r28c-9q8g-f849 postcss 8.5.15 -> 8.5.28 (transitive: vite, shadcn-svelte) GHSA-28wg-ghj8-5hjv · GHSA-2v37-7h3g-55p8 nanoid 3.3.12 -> 3.3.19 (transitive: postcss) Both moved inside their parents' existing ranges, lockfile only. GHSA-pxg6-pf52-xh8x cookie 0.6.0 -> 0.7.2 (transitive: @sveltejs/kit) This one needs a pnpm override, which is why there is now an `overrides` block. @sveltejs/kit 2.70.3 - the newest 2.x - still declares cookie ^0.6.0, and for a 0.x version that caret means >=0.6.0 <0.7.0, so the fixed 0.7.0 cannot be reached within the range. The override is scoped to that range (`cookie@^0.6.0`) so it does not touch the separate cookie 1.1.1 that msw pulls in, which was never affected. Worth flagging for review: forcing a dependency inside Kit is a maintainer's call. The risk here is small - cookie 0.7.x is the same API with stricter validation of names, paths and domains, and under adapter-static the Kit code that calls it never executes - but it is an override and it should be dropped the moment Kit widens its range. Verified: pnpm install --frozen-lockfile, pnpm build and pnpm test:visual (Vitest browser mode, 5/5) all pass; pnpm audit reports no known vulnerabilities. On the Go side go build ./..., go vet ./... and go test ./internal/keyvault/... ./internal/handler/... all pass. Co-authored-by: Distronode <254259913+distronode-com@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) --- frontend/package.json | 13 +- frontend/pnpm-lock.yaml | 317 +++++++++++++++++++++------------------- go.mod | 4 +- go.sum | 4 +- 4 files changed, 175 insertions(+), 163 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 8753ea1d..d8d22e3f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,10 @@ "pnpm": { "onlyBuiltDependencies": [ "msw" - ] + ], + "overrides": { + "cookie@^0.6.0": "^0.7.2" + } }, "scripts": { "dev": "vite dev", @@ -25,12 +28,12 @@ "@internationalized/date": "^3.12.2", "@lucide/svelte": "^1.20.0", "@sveltejs/adapter-static": "^3.0.10", - "@sveltejs/kit": "^2.65.1", + "@sveltejs/kit": "^2.70.2", "@sveltejs/vite-plugin-svelte": "^7.1.2", "@tailwindcss/vite": "^4.3.1", "@types/node": "^26.0.1", - "@vitest/browser": "^4.1.9", - "@vitest/browser-playwright": "^4.1.9", + "@vitest/browser": "^4.1.10", + "@vitest/browser-playwright": "^4.1.10", "bits-ui": "^2.18.1", "playwright": "^1.61.0", "shadcn-svelte": "1.3.0", @@ -42,7 +45,7 @@ "tw-animate-css": "^1.4.0", "typescript": "^5.7.3", "vite": "^8.0.16", - "vitest": "^4.1.9", + "vitest": "^4.1.10", "vitest-browser-svelte": "^2.1.1" } } diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index a0674ad4..98fb47d2 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + cookie@^0.6.0: ^0.7.2 + importers: .: @@ -26,10 +29,10 @@ importers: version: 1.20.0(svelte@5.56.3) '@sveltejs/adapter-static': specifier: ^3.0.10 - version: 3.0.10(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))) + version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))) '@sveltejs/kit': - specifier: ^2.65.1 - version: 2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + specifier: ^2.70.2 + version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) '@sveltejs/vite-plugin-svelte': specifier: ^7.1.2 version: 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) @@ -40,14 +43,14 @@ importers: specifier: ^26.0.1 version: 26.0.1 '@vitest/browser': - specifier: ^4.1.9 - version: 4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.9) + specifier: ^4.1.10 + version: 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) '@vitest/browser-playwright': - specifier: ^4.1.9 - version: 4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.9) + specifier: ^4.1.10 + version: 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) bits-ui: specifier: ^2.18.1 - version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) playwright: specifier: ^1.61.0 version: 1.61.0 @@ -79,11 +82,11 @@ importers: specifier: ^8.0.16 version: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) vitest: - specifier: ^4.1.9 - version: 4.1.9(@types/node@26.0.1)(@vitest/browser-playwright@4.1.9)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + specifier: ^4.1.10 + version: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) vitest-browser-svelte: specifier: ^2.1.1 - version: 2.1.1(svelte@5.56.3)(vitest@4.1.9) + version: 2.1.1(svelte@5.56.3)(vitest@4.1.11) packages: @@ -108,12 +111,12 @@ packages: '@floating-ui/utils@0.2.11': resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==} - '@inquirer/ansi@2.0.7': - resolution: {integrity: sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==} + '@inquirer/ansi@2.0.8': + resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/confirm@6.1.1': - resolution: {integrity: sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==} + '@inquirer/confirm@6.3.2': + resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -121,8 +124,8 @@ packages: '@types/node': optional: true - '@inquirer/core@11.2.1': - resolution: {integrity: sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==} + '@inquirer/core@12.0.3': + resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -130,12 +133,12 @@ packages: '@types/node': optional: true - '@inquirer/figures@2.0.7': - resolution: {integrity: sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==} + '@inquirer/figures@2.0.9': + resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/type@4.0.7': - resolution: {integrity: sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==} + '@inquirer/type@4.1.1': + resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -306,8 +309,8 @@ packages: peerDependencies: '@sveltejs/kit': ^2.0.0 - '@sveltejs/kit@2.65.1': - resolution: {integrity: sha512-Sa1rFYYqBB+zv3rIxAg/CsFskR/x4aj5BY/hvLxBd9r/mqbipxM945As1K3PqsDicJAyekPR0BlWoVIiw2OHYg==} + '@sveltejs/kit@2.70.3': + resolution: {integrity: sha512-UDvEYuZqAMbfB/oXIoqKvbKcb7YczK5zYrzmsGV1zRJk03jntwp8dXiYoIJotxAndsKvcPFtx9H1GRSKFdSHgg==} engines: {node: '>=18.13'} hasBin: true peerDependencies: @@ -451,12 +454,12 @@ packages: '@types/estree@1.0.9': resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} - '@types/node@25.9.3': - resolution: {integrity: sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==} - '@types/node@26.0.1': resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==} + '@types/node@26.5.1': + resolution: {integrity: sha512-CzNm2FezW4VR/LjG6yUdiEgLE/rAQ9Slj5gCu/C2VrdcW7I0ahNZ8DRbHT7zOZ6r3ONgd/bsQIeSaoDGrd1C6g==} + '@types/set-cookie-parser@2.4.10': resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} @@ -466,22 +469,22 @@ packages: '@types/trusted-types@2.0.7': resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==} - '@vitest/browser-playwright@4.1.9': - resolution: {integrity: sha512-Bq1rOGf9waevzG3EOkO/dene6bvKTUsZMVg8S1i+WH3JcMjuXEjiahP9rAqZRELUqjBySOJsvvSWqK/B3wjKQw==} + '@vitest/browser-playwright@4.1.11': + resolution: {integrity: sha512-riLBxPqwnJ0lWs2DN2WeUfYeKLoAjbP2Xx8cLQdSddzMi20sksIa6K2mPz79DyMZKKVKH2ksOC2yJvtNcZg8cg==} peerDependencies: playwright: '*' - vitest: 4.1.9 + vitest: 4.1.11 - '@vitest/browser@4.1.9': - resolution: {integrity: sha512-j1BKtWmPcqpMhmx/L9EPLgAJpCb0zKfwoWLmqBbxaogCXHjOwHFSEoHCBfnGtx93xKQwilZ26m+UOsHqHMkRNg==} + '@vitest/browser@4.1.11': + resolution: {integrity: sha512-bwMovvAeuTFOK5kIFevw4VEf+1gVEICv4SYK4k3knJOxl6b1zEWud8mYKD73e1B0odAn174h1MofURy2TPWf3w==} peerDependencies: - vitest: 4.1.9 + vitest: 4.1.11 - '@vitest/expect@4.1.9': - resolution: {integrity: sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==} + '@vitest/expect@4.1.11': + resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==} - '@vitest/mocker@4.1.9': - resolution: {integrity: sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==} + '@vitest/mocker@4.1.11': + resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==} peerDependencies: msw: ^2.4.9 vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -491,20 +494,20 @@ packages: vite: optional: true - '@vitest/pretty-format@4.1.9': - resolution: {integrity: sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==} + '@vitest/pretty-format@4.1.11': + resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==} - '@vitest/runner@4.1.9': - resolution: {integrity: sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==} + '@vitest/runner@4.1.11': + resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==} - '@vitest/snapshot@4.1.9': - resolution: {integrity: sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==} + '@vitest/snapshot@4.1.11': + resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==} - '@vitest/spy@4.1.9': - resolution: {integrity: sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==} + '@vitest/spy@4.1.11': + resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==} - '@vitest/utils@4.1.9': - resolution: {integrity: sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==} + '@vitest/utils@4.1.11': + resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==} acorn@8.17.0: resolution: {integrity: sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==} @@ -572,8 +575,8 @@ packages: convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - cookie@0.6.0: - resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} + cookie@0.7.2: + resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==} engines: {node: '>= 0.6'} cookie@1.1.1: @@ -799,8 +802,8 @@ packages: resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==} engines: {node: ^20.17.0 || >=22.9.0} - nanoid@3.3.12: - resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==} + nanoid@3.3.19: + resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -841,8 +844,8 @@ packages: resolution: {integrity: sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==} engines: {node: '>=14.19.0'} - postcss@8.5.15: - resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==} + postcss@8.5.28: + resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==} engines: {node: ^10 || ^12 || >=14} readdirp@4.1.2: @@ -882,6 +885,9 @@ packages: set-cookie-parser@3.1.0: resolution: {integrity: sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==} + set-cookie-parser@3.1.2: + resolution: {integrity: sha512-5/r/lTwbJ3zQ+qwdUFZYeRNqda7P5HD8zQKqlSjdGt1/S0cjLAphHusj4Y58ahDtWn/g32xrIS58/ikOvwl0Lw==} + shadcn-svelte@1.3.0: resolution: {integrity: sha512-Pd4ICWTkTks/b2YU4c9vF2XsX1x5HFPRl5bKszS1LcnWS83x+7T4WiIvbWz8Qh9knkcGZ+SCz1+Dmhdq+AYooA==} hasBin: true @@ -992,19 +998,19 @@ packages: resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} - tldts-core@7.4.3: - resolution: {integrity: sha512-27ep5H9PzdBrNd5OFM/j3WCU8F3kPwM9D0BOaOf7uYfxMJfyr0K5Tjj69Gri+sZlh2WXd5buIm47NuPF29CDiw==} + tldts-core@7.4.12: + resolution: {integrity: sha512-nYNzS2WRf4QJmjzFFgAxLOBjyBxAGRbCy9PVBPaglcYyYajh40VBn+v5Ngr96ZMc7oM0+aCJdtQnNejvdBnXMQ==} - tldts@7.4.3: - resolution: {integrity: sha512-A3BDQBeeukYPzB4QdQ1DtdlUmp4x2OCH8n5UVhEWbyANxNep8GavottKzd1xYKFJKjUgMyPT7EzOfnBO55s8Sg==} + tldts@7.4.12: + resolution: {integrity: sha512-WylhSDKVeYnWXL3a+vKTaOxjnOeEGw938hImY8zoRWJjRRK/Jp1K+IihBzIONpUmW4e3WmXT6q5FW6vlESVZCA==} hasBin: true totalist@3.0.1: resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} engines: {node: '>=6'} - tough-cookie@6.0.1: - resolution: {integrity: sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==} + tough-cookie@6.0.2: + resolution: {integrity: sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==} engines: {node: '>=16'} tslib@2.8.1: @@ -1013,8 +1019,8 @@ packages: tw-animate-css@1.4.0: resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==} - type-fest@5.7.0: - resolution: {integrity: sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg==} + type-fest@5.9.0: + resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} engines: {node: '>=20'} typescript@5.9.3: @@ -1022,12 +1028,12 @@ packages: engines: {node: '>=14.17'} hasBin: true - undici-types@7.24.6: - resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==} - undici-types@8.3.0: resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} + undici-types@8.9.0: + resolution: {integrity: sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==} + until-async@3.0.2: resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} @@ -1088,20 +1094,20 @@ packages: svelte: ^3 || ^4 || ^5 || ^5.0.0-next.0 vitest: ^4.0.0 - vitest@4.1.9: - resolution: {integrity: sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==} + vitest@4.1.11: + resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 4.1.9 - '@vitest/browser-preview': 4.1.9 - '@vitest/browser-webdriverio': 4.1.9 - '@vitest/coverage-istanbul': 4.1.9 - '@vitest/coverage-v8': 4.1.9 - '@vitest/ui': 4.1.9 + '@vitest/browser-playwright': 4.1.11 + '@vitest/browser-preview': 4.1.11 + '@vitest/browser-webdriverio': 4.1.11 + '@vitest/coverage-istanbul': 4.1.11 + '@vitest/coverage-v8': 4.1.11 + '@vitest/ui': 4.1.11 happy-dom: '*' jsdom: '*' vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -1158,8 +1164,8 @@ packages: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} - yargs@17.7.2: - resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + yargs@17.7.3: + resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==} engines: {node: '>=12'} zimmerframe@1.1.4: @@ -1196,22 +1202,22 @@ snapshots: '@floating-ui/utils@0.2.11': {} - '@inquirer/ansi@2.0.7': + '@inquirer/ansi@2.0.8': optional: true - '@inquirer/confirm@6.1.1(@types/node@26.0.1)': + '@inquirer/confirm@6.3.2(@types/node@26.0.1)': dependencies: - '@inquirer/core': 11.2.1(@types/node@26.0.1) - '@inquirer/type': 4.0.7(@types/node@26.0.1) + '@inquirer/core': 12.0.3(@types/node@26.0.1) + '@inquirer/type': 4.1.1(@types/node@26.0.1) optionalDependencies: '@types/node': 26.0.1 optional: true - '@inquirer/core@11.2.1(@types/node@26.0.1)': + '@inquirer/core@12.0.3(@types/node@26.0.1)': dependencies: - '@inquirer/ansi': 2.0.7 - '@inquirer/figures': 2.0.7 - '@inquirer/type': 4.0.7(@types/node@26.0.1) + '@inquirer/ansi': 2.0.8 + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@26.0.1) cli-width: 4.1.0 fast-wrap-ansi: 0.2.2 mute-stream: 3.0.0 @@ -1220,10 +1226,10 @@ snapshots: '@types/node': 26.0.1 optional: true - '@inquirer/figures@2.0.7': + '@inquirer/figures@2.0.9': optional: true - '@inquirer/type@4.0.7(@types/node@26.0.1)': + '@inquirer/type@4.1.1(@types/node@26.0.1)': optionalDependencies: '@types/node': 26.0.1 optional: true @@ -1348,18 +1354,18 @@ snapshots: dependencies: acorn: 8.17.0 - '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))': + '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))': dependencies: - '@sveltejs/kit': 2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) - '@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': + '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': dependencies: '@standard-schema/spec': 1.1.0 '@sveltejs/acorn-typescript': 1.0.10(acorn@8.17.0) '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) '@types/cookie': 0.6.0 acorn: 8.17.0 - cookie: 0.6.0 + cookie: 0.7.2 devalue: 5.8.1 esm-env: 1.2.2 kleur: 4.1.5 @@ -1475,18 +1481,18 @@ snapshots: '@types/estree@1.0.9': {} - '@types/node@25.9.3': - dependencies: - undici-types: 7.24.6 - optional: true - '@types/node@26.0.1': dependencies: undici-types: 8.3.0 + '@types/node@26.5.1': + dependencies: + undici-types: 8.9.0 + optional: true + '@types/set-cookie-parser@2.4.10': dependencies: - '@types/node': 25.9.3 + '@types/node': 26.5.1 optional: true '@types/statuses@2.0.6': @@ -1494,29 +1500,29 @@ snapshots: '@types/trusted-types@2.0.7': {} - '@vitest/browser-playwright@4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.9)': + '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11)': dependencies: - '@vitest/browser': 4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.9) - '@vitest/mocker': 4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@vitest/browser': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) playwright: 1.61.0 tinyrainbow: 3.1.0 - vitest: 4.1.9(@types/node@26.0.1)(@vitest/browser-playwright@4.1.9)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) transitivePeerDependencies: - bufferutil - msw - utf-8-validate - vite - '@vitest/browser@4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.9)': + '@vitest/browser@4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11)': dependencies: '@blazediff/core': 1.9.1 - '@vitest/mocker': 4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) - '@vitest/utils': 4.1.9 + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@vitest/utils': 4.1.11 magic-string: 0.30.21 pngjs: 7.0.0 sirv: 3.0.2 tinyrainbow: 3.1.0 - vitest: 4.1.9(@types/node@26.0.1)(@vitest/browser-playwright@4.1.9)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) ws: 8.21.0 transitivePeerDependencies: - bufferutil @@ -1524,45 +1530,45 @@ snapshots: - utf-8-validate - vite - '@vitest/expect@4.1.9': + '@vitest/expect@4.1.11': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.3 - '@vitest/spy': 4.1.9 - '@vitest/utils': 4.1.9 + '@vitest/spy': 4.1.11 + '@vitest/utils': 4.1.11 chai: 6.2.2 tinyrainbow: 3.1.0 - '@vitest/mocker@4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': + '@vitest/mocker@4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': dependencies: - '@vitest/spy': 4.1.9 + '@vitest/spy': 4.1.11 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.14.6(@types/node@26.0.1)(typescript@5.9.3) vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) - '@vitest/pretty-format@4.1.9': + '@vitest/pretty-format@4.1.11': dependencies: tinyrainbow: 3.1.0 - '@vitest/runner@4.1.9': + '@vitest/runner@4.1.11': dependencies: - '@vitest/utils': 4.1.9 + '@vitest/utils': 4.1.11 pathe: 2.0.3 - '@vitest/snapshot@4.1.9': + '@vitest/snapshot@4.1.11': dependencies: - '@vitest/pretty-format': 4.1.9 - '@vitest/utils': 4.1.9 + '@vitest/pretty-format': 4.1.11 + '@vitest/utils': 4.1.11 magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/spy@4.1.9': {} + '@vitest/spy@4.1.11': {} - '@vitest/utils@4.1.9': + '@vitest/utils@4.1.11': dependencies: - '@vitest/pretty-format': 4.1.9 + '@vitest/pretty-format': 4.1.11 convert-source-map: 2.0.0 tinyrainbow: 3.1.0 @@ -1582,15 +1588,15 @@ snapshots: axobject-query@4.1.0: {} - bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): + bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): dependencies: '@floating-ui/core': 1.7.5 '@floating-ui/dom': 1.7.6 '@internationalized/date': 3.12.2 esm-env: 1.2.2 - runed: 0.35.1(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) svelte: 5.56.3 - svelte-toolbelt: 0.10.6(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) tabbable: 6.4.0 transitivePeerDependencies: - '@sveltejs/kit' @@ -1625,7 +1631,7 @@ snapshots: convert-source-map@2.0.0: {} - cookie@0.6.0: {} + cookie@0.7.2: {} cookie@1.1.1: optional: true @@ -1699,7 +1705,7 @@ snapshots: headers-polyfill@5.0.1: dependencies: '@types/set-cookie-parser': 2.4.10 - set-cookie-parser: 3.1.0 + set-cookie-parser: 3.1.2 optional: true inline-style-parser@0.2.7: {} @@ -1781,7 +1787,7 @@ snapshots: msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3): dependencies: - '@inquirer/confirm': 6.1.1(@types/node@26.0.1) + '@inquirer/confirm': 6.3.2(@types/node@26.0.1) '@mswjs/interceptors': 0.41.9 '@open-draft/deferred-promise': 3.0.0 '@types/statuses': 2.0.6 @@ -1795,10 +1801,10 @@ snapshots: rettime: 0.11.11 statuses: 2.0.2 strict-event-emitter: 0.5.1 - tough-cookie: 6.0.1 - type-fest: 5.7.0 + tough-cookie: 6.0.2 + type-fest: 5.9.0 until-async: 3.0.2 - yargs: 17.7.2 + yargs: 17.7.3 optionalDependencies: typescript: 5.9.3 transitivePeerDependencies: @@ -1808,7 +1814,7 @@ snapshots: mute-stream@3.0.0: optional: true - nanoid@3.3.12: {} + nanoid@3.3.19: {} node-fetch-native@1.6.7: {} @@ -1836,9 +1842,9 @@ snapshots: pngjs@7.0.0: {} - postcss@8.5.15: + postcss@8.5.28: dependencies: - nanoid: 3.3.12 + nanoid: 3.3.19 picocolors: 1.1.1 source-map-js: 1.2.1 @@ -1876,14 +1882,14 @@ snapshots: esm-env: 1.2.2 svelte: 5.56.3 - runed@0.35.1(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): + runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): dependencies: dequal: 2.0.3 esm-env: 1.2.2 lz-string: 1.5.0 svelte: 5.56.3 optionalDependencies: - '@sveltejs/kit': 2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) sade@1.8.1: dependencies: @@ -1891,11 +1897,14 @@ snapshots: set-cookie-parser@3.1.0: {} + set-cookie-parser@3.1.2: + optional: true + shadcn-svelte@1.3.0(svelte@5.56.3): dependencies: commander: 14.0.3 node-fetch-native: 1.6.7 - postcss: 8.5.15 + postcss: 8.5.28 svelte: 5.56.3 tailwind-merge: 3.6.0 @@ -1956,10 +1965,10 @@ snapshots: runed: 0.28.0(svelte@5.56.3) svelte: 5.56.3 - svelte-toolbelt@0.10.6(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): + svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): dependencies: clsx: 2.1.1 - runed: 0.35.1(@sveltejs/kit@2.65.1(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) style-to-object: 1.0.14 svelte: 5.56.3 transitivePeerDependencies: @@ -2014,37 +2023,37 @@ snapshots: tinyrainbow@3.1.0: {} - tldts-core@7.4.3: + tldts-core@7.4.12: optional: true - tldts@7.4.3: + tldts@7.4.12: dependencies: - tldts-core: 7.4.3 + tldts-core: 7.4.12 optional: true totalist@3.0.1: {} - tough-cookie@6.0.1: + tough-cookie@6.0.2: dependencies: - tldts: 7.4.3 + tldts: 7.4.12 optional: true tslib@2.8.1: {} tw-animate-css@1.4.0: {} - type-fest@5.7.0: + type-fest@5.9.0: dependencies: tagged-tag: 1.0.0 optional: true typescript@5.9.3: {} - undici-types@7.24.6: - optional: true - undici-types@8.3.0: {} + undici-types@8.9.0: + optional: true + until-async@3.0.2: optional: true @@ -2052,7 +2061,7 @@ snapshots: dependencies: lightningcss: 1.32.0 picomatch: 4.0.4 - postcss: 8.5.15 + postcss: 8.5.28 rolldown: 1.0.3 tinyglobby: 0.2.17 optionalDependencies: @@ -2064,21 +2073,21 @@ snapshots: optionalDependencies: vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) - vitest-browser-svelte@2.1.1(svelte@5.56.3)(vitest@4.1.9): + vitest-browser-svelte@2.1.1(svelte@5.56.3)(vitest@4.1.11): dependencies: '@testing-library/svelte-core': 1.0.0(svelte@5.56.3) svelte: 5.56.3 - vitest: 4.1.9(@types/node@26.0.1)(@vitest/browser-playwright@4.1.9)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) - vitest@4.1.9(@types/node@26.0.1)(@vitest/browser-playwright@4.1.9)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)): + vitest@4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)): dependencies: - '@vitest/expect': 4.1.9 - '@vitest/mocker': 4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) - '@vitest/pretty-format': 4.1.9 - '@vitest/runner': 4.1.9 - '@vitest/snapshot': 4.1.9 - '@vitest/spy': 4.1.9 - '@vitest/utils': 4.1.9 + '@vitest/expect': 4.1.11 + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@vitest/pretty-format': 4.1.11 + '@vitest/runner': 4.1.11 + '@vitest/snapshot': 4.1.11 + '@vitest/spy': 4.1.11 + '@vitest/utils': 4.1.11 es-module-lexer: 2.1.0 expect-type: 1.3.0 magic-string: 0.30.21 @@ -2094,7 +2103,7 @@ snapshots: why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 26.0.1 - '@vitest/browser-playwright': 4.1.9(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.9) + '@vitest/browser-playwright': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) transitivePeerDependencies: - msw @@ -2118,7 +2127,7 @@ snapshots: yargs-parser@21.1.1: optional: true - yargs@17.7.2: + yargs@17.7.3: dependencies: cliui: 8.0.1 escalade: 3.2.0 diff --git a/go.mod b/go.mod index 8b8a9a91..1ea6bd5f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/calnode/calnode -go 1.26 +go 1.26.0 toolchain go1.26.6 @@ -10,7 +10,7 @@ require ( github.com/modelcontextprotocol/go-sdk v1.6.1 github.com/pressly/goose/v3 v3.27.1 github.com/yuin/goldmark v1.8.2 - golang.org/x/crypto v0.53.0 + golang.org/x/crypto v0.56.0 golang.org/x/image v0.45.0 golang.org/x/oauth2 v0.36.0 golang.org/x/text v0.41.0 diff --git a/go.sum b/go.sum index 5dc4a22d..8a2af3f8 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE= github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto= -golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio= +golang.org/x/crypto v0.56.0 h1:GUh5Ii4J5jtcseSMiRqr1jXCNHoxjeV9Fmekc2oLy6Y= +golang.org/x/crypto v0.56.0/go.mod h1:OMW5y6CY9l38uPLmxU6l6pwcXp1obtLo3e6gT7gQR2I= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.45.0 h1:FMb1nTbH5H9vF55SriQHgFw5GnNL9Jg6L25BwXKzhB0= golang.org/x/image v0.45.0/go.mod h1:n62x/7RqlwXDvGsSU4u6IUTUf6KghUZ9Bt7cG/T9Fx4= From eb04dca18b3f8b74522f257a509f41bd3beed3d6 Mon Sep 17 00:00:00 2001 From: shockalotti Date: Thu, 17 Sep 2026 13:20:05 +1200 Subject: [PATCH 016/250] auth: archived members' MCP bearers stop validating, and cannot be refreshed (#49) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit VerifyMCPBearer's OAuth branch never checked users.archived_at, so archiving a member — the documented offboarding path — left their connected agent bearer working, while sessions and API keys already filtered on it. The refresh grant had the same gap: it would mint fresh tokens for a dead account. Both queries now join users and require archived_at IS NULL, mirroring the API-key fallback directly below. Pinned by TestMCP_OAuthBearerRejectedWhenArchived (red-green verified against the unfixed code on both assertions) and one ARCHITECTURE §6 sentence stating the invariant. --- docs/ARCHITECTURE.md | 4 ++ internal/handler/mcp_oauth.go | 11 +++- internal/handler/mcp_oauth_authorize.go | 7 ++- internal/handler/mcp_oauth_test.go | 75 +++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 4 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index f45889d9..58defaab 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -189,6 +189,10 @@ the platform/recovery secret doesn't expose secrets. - **Offboarding = archive** (`users.archived_at`), never hard-delete — preserves bookings, event-type ownership, team links. Archived ⇒ no login, hidden from lists, skipped in routing/slots, event types deactivated. Reversible (restore). + "No login" holds on every auth path: sessions, API keys, and MCP OAuth bearers + all filter on `archived_at`, and refresh grants are refused for archived users + too — so archiving ends a member's agent access and leaves no usable + credential material behind. Archiving is blocked while the member has upcoming (primary-host) bookings; a resolve-meetings flow makes the admin reassign/cancel each first. diff --git a/internal/handler/mcp_oauth.go b/internal/handler/mcp_oauth.go index 330b9f13..bd2f1638 100644 --- a/internal/handler/mcp_oauth.go +++ b/internal/handler/mcp_oauth.go @@ -99,10 +99,15 @@ func (h *Handler) MCPCallerMiddleware(next http.Handler) http.Handler { func (h *Handler) VerifyMCPBearer(ctx context.Context, token string, _ *http.Request) (*auth.TokenInfo, error) { hash := hashAPIKey(token) - // OAuth access token? + // OAuth access token? Archived users authenticate with nothing: the session + // path (auth.go) and both API-key paths (below, and auth.go) already filter + // on users.archived_at, and without the same check here an archived member's + // connected agent bearer would keep validating after offboarding. var userID, expiresAt string - err := h.db.QueryRowContext(ctx, - `SELECT user_id, expires_at FROM oauth_access_tokens WHERE token_hash = ?`, hash). + err := h.db.QueryRowContext(ctx, ` + SELECT t.user_id, t.expires_at FROM oauth_access_tokens t + JOIN users u ON u.id = t.user_id + WHERE t.token_hash = ? AND u.archived_at IS NULL`, hash). Scan(&userID, &expiresAt) if err == nil { exp, _ := time.Parse(time.RFC3339, expiresAt) diff --git a/internal/handler/mcp_oauth_authorize.go b/internal/handler/mcp_oauth_authorize.go index 8ab139f2..a7b2e481 100644 --- a/internal/handler/mcp_oauth_authorize.go +++ b/internal/handler/mcp_oauth_authorize.go @@ -246,8 +246,13 @@ func (h *Handler) tokenRefresh(w http.ResponseWriter, r *http.Request) { return } var id, userID, storedClient, scope, resource string + // Archived users refresh nothing: their access tokens no longer validate + // (VerifyMCPBearer filters on archived_at), so minting fresh ones here + // would hand live credential material to a dead account. err := h.db.QueryRowContext(r.Context(), ` - SELECT id, user_id, client_id, scope, resource FROM oauth_access_tokens WHERE refresh_hash = ?`, + SELECT t.id, t.user_id, t.client_id, t.scope, t.resource FROM oauth_access_tokens t + JOIN users u ON u.id = t.user_id + WHERE t.refresh_hash = ? AND u.archived_at IS NULL`, hashAPIKey(refresh)).Scan(&id, &userID, &storedClient, &scope, &resource) if err != nil { writeOAuthError(w, http.StatusBadRequest, "invalid_grant", "unknown refresh token") diff --git a/internal/handler/mcp_oauth_test.go b/internal/handler/mcp_oauth_test.go index 59e5042d..a51dd3b1 100644 --- a/internal/handler/mcp_oauth_test.go +++ b/internal/handler/mcp_oauth_test.go @@ -297,3 +297,78 @@ func TestMCP_OAuthDeny(t *testing.T) { t.Errorf("deny: code=%d location=%q; want 302 with error=access_denied", rec.Code, loc) } } + +// TestMCP_OAuthBearerRejectedWhenArchived pins the offboarding half of +// "Offboarding = archive" (§6) for the MCP OAuth path. The session path and +// both API-key paths already filter on users.archived_at; the OAuth branch of +// VerifyMCPBearer did not, so an archived member's connected agent bearer kept +// validating after they were offboarded. +func TestMCP_OAuthBearerRejectedWhenArchived(t *testing.T) { + h, database, _, userID := setupWorkspaceWithDB(t) + + const rawToken = "archived-user-bearer" + const rawRefresh = "archived-user-refresh" + now := time.Now().UTC() + if _, err := database.Exec(` + INSERT INTO oauth_access_tokens (id, token_hash, refresh_hash, client_id, user_id, expires_at, created_at) + VALUES (?, ?, ?, 'client-1', ?, ?, ?)`, + "tok-archived", sha256HexForTest(rawToken), sha256HexForTest(rawRefresh), userID, + now.Add(time.Hour).Format(time.RFC3339), now.Format(time.RFC3339Nano)); err != nil { + t.Fatalf("seed token: %v", err) + } + refresh := func(t *testing.T, raw string) *httptest.ResponseRecorder { + t.Helper() + form := url.Values{"grant_type": {"refresh_token"}, "refresh_token": {raw}} + req := httptest.NewRequest(http.MethodPost, "/oauth/token", strings.NewReader(form.Encode())) + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + rec := httptest.NewRecorder() + h.TokenMCP(rec, req) + return rec + } + + // Before archiving, the bearer validates and the refresh token rotates. + // The rotated pair is kept: it is the agent's *current* credential, which + // is exactly what must die on archive (testing the pre-rotation values + // post-archive would pass vacuously — rotation already replaced them). + if info, err := h.VerifyMCPBearer(context.Background(), rawToken, nil); err != nil || info.UserID != userID { + t.Fatalf("VerifyMCPBearer before archive = %+v, %v; want UserID=%s", info, err, userID) + } + rec := refresh(t, rawRefresh) + if rec.Code != http.StatusOK { + t.Fatalf("refresh before archive = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + var rotated map[string]any + if err := json.Unmarshal(rec.Body.Bytes(), &rotated); err != nil { + t.Fatalf("decode rotated pair: %v", err) + } + access, _ := rotated["access_token"].(string) + refreshTok, _ := rotated["refresh_token"].(string) + if access == "" || refreshTok == "" { + t.Fatalf("rotated pair missing tokens: %v", rotated) + } + // The rotated access token validates while the user is live — so its + // post-archive rejection below proves the archive check, not a broken + // rotation. + if info, err := h.VerifyMCPBearer(context.Background(), access, nil); err != nil || info.UserID != userID { + t.Fatalf("VerifyMCPBearer(rotated) before archive = %+v, %v; want UserID=%s", info, err, userID) + } + + // Archive the user — the documented offboarding path — and the current + // bearer must stop validating, exactly like the user's sessions and API + // keys do. + if _, err := database.Exec(`UPDATE users SET archived_at = ? WHERE id = ?`, + now.Format(time.RFC3339Nano), userID); err != nil { + t.Fatalf("archive user: %v", err) + } + if info, err := h.VerifyMCPBearer(context.Background(), access, nil); err == nil { + t.Errorf("VerifyMCPBearer after archive = %+v; want rejection — an archived member's agent bearer must not survive offboarding", info) + } + + // The refresh token must not mint fresh credentials for a dead account + // either: the rotated access token would not validate, but issuance itself + // tells the agent it is still authorized and leaves live credential + // material in the table. + if rec := refresh(t, refreshTok); rec.Code == http.StatusOK { + t.Errorf("refresh after archive issued tokens to an archived user: %s", rec.Body.String()) + } +} From 659626dce5d421e3b0a55c4fc1dd21e10222efd7 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 17 Sep 2026 13:53:19 +1200 Subject: [PATCH 017/250] feat(auth): self-service password reset via emailed link (#34) The login page linked /admin/forgot-password, which never existed. Add POST /v1/auth/password/forgot (enumeration-safe, background send, skips archived and email-login-disabled accounts) and POST /v1/auth/password/reset (single-use hashed token, 1h TTL, revokes all sessions, signs straight in), mirroring the magic-link flow, plus the two public SPA pages. Pinned by nine tests in password_reset_test.go. --- frontend/src/routes/+layout.svelte | 2 + .../src/routes/forgot-password/+page.svelte | 85 ++++++ .../src/routes/reset-password/+page.svelte | 101 ++++++++ .../00058_password_reset_tokens.sql | 15 ++ internal/handler/password_reset.go | 187 ++++++++++++++ internal/handler/password_reset_test.go | 241 ++++++++++++++++++ internal/server/server.go | 2 + 7 files changed, 633 insertions(+) create mode 100644 frontend/src/routes/forgot-password/+page.svelte create mode 100644 frontend/src/routes/reset-password/+page.svelte create mode 100644 internal/db/migrations/00058_password_reset_tokens.sql create mode 100644 internal/handler/password_reset.go create mode 100644 internal/handler/password_reset_test.go diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte index 7a34f787..856a229d 100644 --- a/frontend/src/routes/+layout.svelte +++ b/frontend/src/routes/+layout.svelte @@ -27,6 +27,8 @@ const isPublicRoute = $derived( $page.route.id === '/login' || $page.route.id === '/claim' || + $page.route.id === '/forgot-password' || + $page.route.id === '/reset-password' || $page.route.id === '/invite/[token]' ); diff --git a/frontend/src/routes/forgot-password/+page.svelte b/frontend/src/routes/forgot-password/+page.svelte new file mode 100644 index 00000000..a7e8e707 --- /dev/null +++ b/frontend/src/routes/forgot-password/+page.svelte @@ -0,0 +1,85 @@ + + +Forgot password — Calnode + +
    +
    +
    +

    Forgot your password?

    +

    + Enter your account email and we'll send you a link to set a new password. +

    +
    + + {#if message} +
    {message}
    +

    + Back to sign in +

    + {:else} +
    +
    + + (error = '')} + aria-invalid={error ? 'true' : undefined} + required + /> + {#if error} +

    {error}

    + {/if} +
    + +
    +

    + Back to sign in +

    + {/if} +
    +
    diff --git a/frontend/src/routes/reset-password/+page.svelte b/frontend/src/routes/reset-password/+page.svelte new file mode 100644 index 00000000..ce9b95fe --- /dev/null +++ b/frontend/src/routes/reset-password/+page.svelte @@ -0,0 +1,101 @@ + + +Set a new password — Calnode + +
    +
    +
    +

    Set a new password

    +

    Choose a password of at least 8 characters.

    +
    + + {#if error && !token} +
    {error}
    +

    + Request a new reset link +

    + {:else} +
    +
    + + +
    +
    + + +
    + {#if error} +
    {error}
    + {/if} + +
    + {/if} +
    +
    diff --git a/internal/db/migrations/00058_password_reset_tokens.sql b/internal/db/migrations/00058_password_reset_tokens.sql new file mode 100644 index 00000000..d358a568 --- /dev/null +++ b/internal/db/migrations/00058_password_reset_tokens.sql @@ -0,0 +1,15 @@ +-- +goose Up +-- One-time, short-lived password-reset tokens emailed to a user. We store only the +-- SHA-256 of the token (never the raw value); single-use is enforced by used_at. +-- Mirrors magic_link_tokens (00040) with a longer TTL: a reset email sits in an +-- inbox longer than a just-requested login link. +CREATE TABLE password_reset_tokens ( + token_hash TEXT PRIMARY KEY, + user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE, + expires_at TEXT NOT NULL, + used_at TEXT, + created_at TEXT NOT NULL DEFAULT (datetime('now')) +); + +-- +goose Down +DROP TABLE password_reset_tokens; diff --git a/internal/handler/password_reset.go b/internal/handler/password_reset.go new file mode 100644 index 00000000..add65c66 --- /dev/null +++ b/internal/handler/password_reset.go @@ -0,0 +1,187 @@ +package handler + +import ( + "context" + "crypto/rand" + "crypto/sha256" + "database/sql" + "encoding/hex" + "encoding/json" + "fmt" + "net/http" + "strings" + "time" + + "github.com/calnode/calnode/internal/mailer" + "golang.org/x/crypto/bcrypt" +) + +// resetLinkTTL is longer than the magic-link TTL: a reset email sits in an +// inbox longer than a just-requested login link, and the token is single-use +// and hashed at rest either way. +const resetLinkTTL = time.Hour + +// RequestPasswordReset handles POST /v1/auth/password/forgot — emails a one-time +// password-reset link to the address if it belongs to an active account with email +// login enabled. Always responds 200 with the same message (no account enumeration): +// the user lookup happens inline (a single indexed SELECT), but token generation, +// the DB write, and the email send are dispatched to a background goroutine rather +// than awaited, so a timing attacker can't distinguish "no such user" from "found +// user, still emailing" — the same pattern as RequestMagicLink. +func (h *Handler) RequestPasswordReset(w http.ResponseWriter, r *http.Request) { + r.Body = http.MaxBytesReader(w, r.Body, 4<<10) + var req struct { + Email string `json:"email"` + } + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { + h.writeError(w, http.StatusBadRequest, "invalid JSON") + return + } + email := strings.TrimSpace(strings.ToLower(req.Email)) + if email != "" { + var userID string + var archivedAt sql.NullString + var emailLogin int + err := h.db.QueryRowContext(r.Context(), + `SELECT id, archived_at, email_login FROM users WHERE email = ?`, email). + Scan(&userID, &archivedAt, &emailLogin) + if err == nil && !archivedAt.Valid && emailLogin != 0 { + go h.sendPasswordReset(context.WithoutCancel(r.Context()), userID, email) + } + } + h.writeJSON(w, http.StatusOK, map[string]any{ + "ok": true, + "message": "If an account with that email exists, a password-reset link is on its way.", + }) +} + +// sendPasswordReset generates and stores a token and emails the reset link. Run in a +// background goroutine by RequestPasswordReset so its variable cost (DB write + +// mailer round-trip) never shows up in the HTTP response timing. +func (h *Handler) sendPasswordReset(ctx context.Context, userID, email string) { + rawBytes := make([]byte, 32) + if _, err := rand.Read(rawBytes); err != nil { + h.logger.ErrorContext(ctx, "password reset: rand", "error", err) + return + } + raw := hex.EncodeToString(rawBytes) + sum := sha256.Sum256([]byte(raw)) + tokenHash := hex.EncodeToString(sum[:]) + expiresAt := time.Now().UTC().Add(resetLinkTTL).Format(time.RFC3339) + + if _, err := h.db.ExecContext(ctx, + `INSERT INTO password_reset_tokens (token_hash, user_id, expires_at) VALUES (?, ?, ?)`, + tokenHash, userID, expiresAt); err != nil { + h.logger.ErrorContext(ctx, "password reset: store token", "error", err) + return + } + + link := h.baseURL + "/admin/reset-password?token=" + raw + if h.mailer != nil { + if err := h.mailer.Send(ctx, resetPasswordMessage(email, link)); err != nil { + h.logger.ErrorContext(ctx, "password reset: send email", "error", err, "user_id", userID) + } + } +} + +// ResetPassword handles POST /v1/auth/password/reset — consumes a reset token and +// sets a new password. The token proves ownership of the email address, so no session +// is required; on success every existing session is revoked and a fresh one is +// created, signing the user straight in (same assurance as VerifyMagicLink). +func (h *Handler) ResetPassword(w http.ResponseWriter, r *http.Request) { + r.Body = http.MaxBytesReader(w, r.Body, 4<<10) + var req struct { + Token string `json:"token"` + NewPassword string `json:"new_password"` + } + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { + h.writeError(w, http.StatusBadRequest, "invalid JSON") + return + } + // Validate the password before touching the token so a weak-password attempt + // doesn't burn the single-use link. + if msg := validatePassword(req.NewPassword); msg != "" { + h.writeError(w, http.StatusBadRequest, msg) + return + } + if req.Token == "" { + h.writeError(w, http.StatusBadRequest, "reset link is invalid or has expired") + return + } + sum := sha256.Sum256([]byte(req.Token)) + tokenHash := hex.EncodeToString(sum[:]) + now := time.Now().UTC().Format(time.RFC3339) + + // Atomically consume: only succeeds if unused and unexpired (single-use, race-safe). + res, err := h.db.ExecContext(r.Context(), + `UPDATE password_reset_tokens SET used_at = ? WHERE token_hash = ? AND used_at IS NULL AND expires_at > ?`, + now, tokenHash, now) + if err != nil { + h.logger.ErrorContext(r.Context(), "password reset: consume", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if n, _ := res.RowsAffected(); n == 0 { + h.writeError(w, http.StatusBadRequest, "reset link is invalid or has expired") + return + } + + var userID string + var archivedAt sql.NullString + var emailLogin int + if err := h.db.QueryRowContext(r.Context(), + `SELECT u.id, u.archived_at, u.email_login FROM password_reset_tokens t JOIN users u ON u.id = t.user_id WHERE t.token_hash = ?`, + tokenHash).Scan(&userID, &archivedAt, &emailLogin); err != nil { + h.logger.ErrorContext(r.Context(), "password reset: load user", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + // The token was emailed to this address, so saying *why* it can't be used leaks + // nothing — but an archived or email-login-disabled account must not gain access. + if archivedAt.Valid || emailLogin == 0 { + h.writeError(w, http.StatusForbidden, "password reset is not available for this account") + return + } + + newHash, err := bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost) + if err != nil { + h.logger.ErrorContext(r.Context(), "password reset: bcrypt", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if _, err := h.db.ExecContext(r.Context(), + `UPDATE users SET password_hash = ? WHERE id = ?`, string(newHash), userID); err != nil { + h.logger.ErrorContext(r.Context(), "password reset: update", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + // Unauthenticated request, so there is no current session to preserve — revoke + // everything (a compromised session must not survive the reset), then sign in. + if _, err := h.db.ExecContext(r.Context(), + `DELETE FROM sessions WHERE user_id = ?`, userID); err != nil { + h.logger.ErrorContext(r.Context(), "password reset: revoke sessions", "error", err, "user_id", userID) + } + if err := h.createSession(r.Context(), w, userID); err != nil { + // The password IS reset; only the convenience sign-in failed. The login + // page bounces to /admin/login without a session, so report success and + // let the user sign in with the new password. + h.logger.ErrorContext(r.Context(), "password reset: create session", "error", err) + } + h.writeJSON(w, http.StatusOK, map[string]any{"ok": true}) +} + +// resetPasswordMessage builds the reset-link email (multipart text + minimal HTML). +func resetPasswordMessage(to, link string) mailer.Message { + return mailer.Message{ + To: []string{to}, + Subject: "Reset your Calnode password", + Text: "Click the link below to set a new Calnode password. It expires in 1 hour and can be used once.\n\n" + + link + "\n\nIf you didn't request this, you can ignore this email — your password stays unchanged.", + HTML: fmt.Sprintf(`
    `+ + `

    Click the button below to set a new Calnode password. It expires in 1 hour and can be used once.

    `+ + `

    Set a new password

    `+ + `

    Or paste this link into your browser:
    %s

    `+ + `

    If you didn't request this, you can ignore this email — your password stays unchanged.

    `, + link, link, link), + } +} diff --git a/internal/handler/password_reset_test.go b/internal/handler/password_reset_test.go new file mode 100644 index 00000000..5ec4dc60 --- /dev/null +++ b/internal/handler/password_reset_test.go @@ -0,0 +1,241 @@ +package handler_test + +import ( + "crypto/sha256" + "database/sql" + "encoding/hex" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" + + "golang.org/x/crypto/bcrypt" +) + +func resetReq(token, newPassword string) *http.Request { + body := `{"token":"` + token + `","new_password":"` + newPassword + `"}` + return httptest.NewRequest(http.MethodPost, "/v1/auth/password/reset", strings.NewReader(body)) +} + +func seedResetToken(t *testing.T, db *sql.DB, raw, userID string, expiresAt time.Time) string { + t.Helper() + sum := sha256.Sum256([]byte(raw)) + hash := hex.EncodeToString(sum[:]) + if _, err := db.Exec(`INSERT INTO password_reset_tokens (token_hash,user_id,expires_at) VALUES (?,?,?)`, + hash, userID, expiresAt.UTC().Format(time.RFC3339)); err != nil { + t.Fatalf("seed reset token: %v", err) + } + return hash +} + +func seedPasswordUser(t *testing.T, db *sql.DB, id, email, password string, emailLogin int) { + t.Helper() + hash, _ := bcrypt.GenerateFromPassword([]byte(password), bcrypt.MinCost) + if _, err := db.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin,email_login,password_hash) VALUES (?,?,?, 'UTC',0,?,?)`, + id, email, "Test User", emailLogin, string(hash)); err != nil { + t.Fatalf("seed user: %v", err) + } +} + +func TestPasswordReset_requestUnknownEmailGeneric(t *testing.T) { + h, db := newTestHandlerDB(t) + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodPost, "/v1/auth/password/forgot", + strings.NewReader(`{"email":"nobody@example.com"}`)) + h.RequestPasswordReset(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200 (generic)", rec.Code) + } + var n int + db.QueryRow(`SELECT COUNT(*) FROM password_reset_tokens`).Scan(&n) //nolint:errcheck + if n != 0 { + t.Errorf("token rows = %d; want 0 for unknown email", n) + } +} + +func TestPasswordReset_requestKnownEmailCreatesToken(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "known@example.com", "oldpassword", 1) + + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodPost, "/v1/auth/password/forgot", + strings.NewReader(`{"email":"known@example.com"}`)) + h.RequestPasswordReset(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("status = %d; want 200", rec.Code) + } + + deadline := time.Now().Add(2 * time.Second) + for time.Now().Before(deadline) { + var n int + db.QueryRow(`SELECT COUNT(*) FROM password_reset_tokens WHERE user_id = 'u1'`).Scan(&n) //nolint:errcheck + if n == 1 { + return + } + time.Sleep(5 * time.Millisecond) + } + t.Fatal("no token row for u1 after waiting (background send never completed)") +} + +func TestPasswordReset_requestSkipsArchivedAndDisabled(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "archived@example.com", "oldpassword", 1) + db.Exec(`UPDATE users SET archived_at = '2026-01-01T00:00:00Z' WHERE id = 'u1'`) //nolint:errcheck + seedPasswordUser(t, db, "u2", "disabled@example.com", "oldpassword", 0) + + for _, email := range []string{"archived@example.com", "disabled@example.com"} { + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodPost, "/v1/auth/password/forgot", + strings.NewReader(`{"email":"`+email+`"}`)) + h.RequestPasswordReset(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("%s: status = %d; want generic 200", email, rec.Code) + } + } + time.Sleep(100 * time.Millisecond) // no goroutine should have been spawned; fail loudly if one was + var n int + db.QueryRow(`SELECT COUNT(*) FROM password_reset_tokens`).Scan(&n) //nolint:errcheck + if n != 0 { + t.Errorf("token rows = %d; want 0 (archived and email-login-disabled get no email)", n) + } +} + +func TestPasswordReset_happyPath(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "alice@example.com", "oldpassword", 1) + seedResetToken(t, db, "rawtoken123", "u1", time.Now().Add(time.Hour)) + + rec := httptest.NewRecorder() + h.ResetPassword(rec, resetReq("rawtoken123", "newpassword1")) + if rec.Code != http.StatusOK { + t.Fatalf("reset status = %d; want 200 — %s", rec.Code, rec.Body.String()) + } + found := false + for _, c := range rec.Result().Cookies() { + if c.Name == "calnode_session" && c.Value != "" { + found = true + } + } + if !found { + t.Error("reset did not set a session cookie (user should be signed straight in)") + } + + // New password works, old one doesn't. + rec2 := httptest.NewRecorder() + h.LoginEmail(rec2, loginEmailReq("alice@example.com", "newpassword1")) + if rec2.Code != http.StatusOK { + t.Errorf("login with new password: got %d; want 200", rec2.Code) + } + rec3 := httptest.NewRecorder() + h.LoginEmail(rec3, loginEmailReq("alice@example.com", "oldpassword")) + if rec3.Code != http.StatusUnauthorized { + t.Errorf("login with old password: got %d; want 401", rec3.Code) + } +} + +func TestPasswordReset_tokenSingleUse(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "a@example.com", "oldpassword", 1) + seedResetToken(t, db, "oncetoken", "u1", time.Now().Add(time.Hour)) + + rec := httptest.NewRecorder() + h.ResetPassword(rec, resetReq("oncetoken", "newpassword1")) + if rec.Code != http.StatusOK { + t.Fatalf("first reset: got %d; want 200", rec.Code) + } + rec2 := httptest.NewRecorder() + h.ResetPassword(rec2, resetReq("oncetoken", "anotherpw2")) + if rec2.Code != http.StatusBadRequest { + t.Errorf("second reset with same token: got %d; want 400", rec2.Code) + } +} + +func TestPasswordReset_expiredToken(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "a@example.com", "oldpassword", 1) + seedResetToken(t, db, "expiredtok", "u1", time.Now().Add(-time.Minute)) + + rec := httptest.NewRecorder() + h.ResetPassword(rec, resetReq("expiredtok", "newpassword1")) + if rec.Code != http.StatusBadRequest { + t.Errorf("expired reset: got %d; want 400", rec.Code) + } +} + +func TestPasswordReset_weakPasswordDoesNotConsume(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "a@example.com", "oldpassword", 1) + hash := seedResetToken(t, db, "retrytoken", "u1", time.Now().Add(time.Hour)) + + rec := httptest.NewRecorder() + h.ResetPassword(rec, resetReq("retrytoken", "short")) + if rec.Code != http.StatusBadRequest { + t.Fatalf("weak password reset: got %d; want 400", rec.Code) + } + var n int + db.QueryRow(`SELECT COUNT(*) FROM password_reset_tokens WHERE token_hash = ? AND used_at IS NULL`, hash).Scan(&n) //nolint:errcheck + if n != 1 { + t.Fatalf("weak attempt consumed the token; want it still usable") + } + + // Same link works with a good password. + rec2 := httptest.NewRecorder() + h.ResetPassword(rec2, resetReq("retrytoken", "goodpassword1")) + if rec2.Code != http.StatusOK { + t.Errorf("retry with good password: got %d; want 200", rec2.Code) + } +} + +func TestPasswordReset_archivedAndDisabledForbidden(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "archived@example.com", "oldpassword", 1) + db.Exec(`UPDATE users SET archived_at = '2026-01-01T00:00:00Z' WHERE id = 'u1'`) //nolint:errcheck + seedResetToken(t, db, "archtok", "u1", time.Now().Add(time.Hour)) + seedPasswordUser(t, db, "u2", "disabled@example.com", "oldpassword", 0) + seedResetToken(t, db, "distok", "u2", time.Now().Add(time.Hour)) + + for _, tc := range []struct{ raw string }{{"archtok"}, {"distok"}} { + rec := httptest.NewRecorder() + h.ResetPassword(rec, resetReq(tc.raw, "newpassword1")) + if rec.Code != http.StatusForbidden { + t.Errorf("token %s: got %d; want 403", tc.raw, rec.Code) + } + for _, c := range rec.Result().Cookies() { + if c.Name == "calnode_session" { + t.Errorf("token %s: must not create a session", tc.raw) + } + } + } +} + +func TestPasswordReset_revokesOldSessions(t *testing.T) { + h, db := newTestHandlerDB(t) + seedPasswordUser(t, db, "u1", "a@example.com", "oldpassword", 1) + future := time.Now().UTC().Add(24 * time.Hour).Format(time.RFC3339) + db.Exec(`INSERT INTO sessions (id,user_id,expires_at) VALUES ('old1','u1',?),('old2','u1',?)`, future, future) //nolint:errcheck + seedResetToken(t, db, "sesstoken", "u1", time.Now().Add(time.Hour)) + + rec := httptest.NewRecorder() + h.ResetPassword(rec, resetReq("sesstoken", "newpassword1")) + if rec.Code != http.StatusOK { + t.Fatalf("reset: got %d; want 200", rec.Code) + } + var ids []string + rows, err := db.Query(`SELECT id FROM sessions WHERE user_id = 'u1'`) //nolint:errcheck + if err != nil { + t.Fatalf("list sessions: %v", err) + } + defer rows.Close() + for rows.Next() { + var id string + rows.Scan(&id) //nolint:errcheck + ids = append(ids, id) + } + if len(ids) != 1 { + t.Fatalf("sessions after reset = %v; want exactly the fresh one", ids) + } + if ids[0] == "old1" || ids[0] == "old2" { + t.Errorf("pre-reset session %q survived the reset", ids[0]) + } +} diff --git a/internal/server/server.go b/internal/server/server.go index 460b46f7..ae98ec81 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -279,6 +279,8 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge mux.HandleFunc("POST /v1/auth/login/email", loginRL(h.LoginEmail)) mux.HandleFunc("POST /v1/auth/magic-link/request", loginRL(h.RequestMagicLink)) mux.HandleFunc("GET /v1/auth/magic-link/verify", loginRL(h.VerifyMagicLink)) + mux.HandleFunc("POST /v1/auth/password/forgot", loginRL(h.RequestPasswordReset)) + mux.HandleFunc("POST /v1/auth/password/reset", loginRL(h.ResetPassword)) // OAuth login (browser sessions for admin UI). authRL := RateLimit(10, time.Minute) From 86cc414c4baacf0a51e8819c9fe1e6d420e91fd6 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 17 Sep 2026 14:05:53 +1200 Subject: [PATCH 018/250] fix(booking): rename honeypot off the autofill-mapped company name (#33) Browsers map a field named company to the organization autofill entry (ignoring autocomplete=off) and fill it for real humans, who are then rejected as bots with 400 invalid submission. Rename to hp_extra on the booking page and embed widget; the stale company key is now an ignored unknown field, so old embeds keep working. --- internal/handler/booking_abuse_test.go | 23 +++++++++++++++++++++-- internal/handler/booking_handler.go | 7 +++++-- internal/handler/embed.js | 4 ++-- internal/handler/templates/book.html | 8 +++++--- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/internal/handler/booking_abuse_test.go b/internal/handler/booking_abuse_test.go index 4398b64a..228ec968 100644 --- a/internal/handler/booking_abuse_test.go +++ b/internal/handler/booking_abuse_test.go @@ -8,13 +8,13 @@ import ( "testing" ) -// TestCreateBooking_honeypotRejected: a filled honeypot ("company") field marks an +// TestCreateBooking_honeypotRejected: a filled honeypot ("hp_extra") field marks an // automated submission and is rejected without creating a booking. func TestCreateBooking_honeypotRejected(t *testing.T) { h, key, _ := setupWorkspace(t) slug, _ := seedEventTypeHTTP(t, h, key) - body := fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T09:00:00Z","name":"Bot","email":"bot@example.com","company":"Acme Spam Co"}`, slug) + body := fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T09:00:00Z","name":"Bot","email":"bot@example.com","hp_extra":"Acme Spam Co"}`, slug) req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(body)) req.Header.Set("Content-Type", "application/json") rec := httptest.NewRecorder() @@ -25,6 +25,25 @@ func TestCreateBooking_honeypotRejected(t *testing.T) { } } +// TestCreateBooking_legacyCompanyFieldIgnored: the honeypot used to be named "company", +// which browsers autofill for real humans (#33). A submission carrying the old field +// (e.g. an autofilled legacy page, or a stale embed) must be treated as a normal +// booking, not a bot. +func TestCreateBooking_legacyCompanyFieldIgnored(t *testing.T) { + h, key, _ := setupWorkspace(t) + slug, _ := seedEventTypeHTTP(t, h, key) + + body := fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T09:00:00Z","name":"Sam","email":"sam@example.com","company":"Acme Corp"}`, slug) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + + if rec.Code != http.StatusCreated { + t.Errorf("booking with legacy company value: %d; want 201 — %s", rec.Code, rec.Body.String()) + } +} + // TestCreateBooking_perEmailThrottle: one email can create up to the hourly cap // across distinct slots, then is throttled with 429. func TestCreateBooking_perEmailThrottle(t *testing.T) { diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 471c81ce..c695305e 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -649,7 +649,10 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { // calnode_lang cookie, and a site owner's forced lang= override wouldn't be visible // from headers alone. See internal-docs/i18n-plan.md. Language string `json:"language"` - Company string `json:"company"` // honeypot: a hidden form field; must stay empty + // Deliberately NOT named "company": browsers map that to the organization + // autofill entry (ignoring autocomplete="off") and fill this invisible field + // for real humans, who are then rejected as bots (#33). + Honeypot string `json:"hp_extra"` Answers []struct { QuestionID string `json:"question_id"` Value string `json:"value"` @@ -662,7 +665,7 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { // Honeypot: a field hidden from humans on the booking form. A non-empty value // means an automated submission — reject with a generic error. - if strings.TrimSpace(req.Company) != "" { + if strings.TrimSpace(req.Honeypot) != "" { h.logger.InfoContext(r.Context(), "booking rejected: honeypot filled") h.writeError(w, http.StatusBadRequest, "invalid submission") return diff --git a/internal/handler/embed.js b/internal/handler/embed.js index 4853ddea..f9f1c279 100644 --- a/internal/handler/embed.js +++ b/internal/handler/embed.js @@ -555,7 +555,7 @@ var back = el('button', { class: 'back-btn', html: SVG_BACK + ' ' + t(this.i18n, 'back') }); back.addEventListener('click', function () { self.state.view = 'pick'; self.render(); }); var form = el('form', { novalidate: 'novalidate' }); - var hp = el('input', { type: 'text', tabindex: '-1', autocomplete: 'off' }); + var hp = el('input', { type: 'text', name: 'hp_extra', tabindex: '-1', autocomplete: 'off' }); form.appendChild(el('div', { 'aria-hidden': 'true', style: 'position:absolute;left:-5000px;height:0;width:0;overflow:hidden;' }, [hp])); var name = el('input', { type: 'text', required: 'required', autocomplete: 'name', placeholder: t(this.i18n, 'name_placeholder') }); var email = el('input', { type: 'email', required: 'required', autocomplete: 'email', placeholder: t(this.i18n, 'email_placeholder') }); @@ -603,7 +603,7 @@ }); fetch(BASE + '/v1/bookings', { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ event_type_slug: self.slug, start_at: slot.start, name: name.value.trim(), email: email.value.trim().toLowerCase(), timezone: TZ, language: self.locale, company: hp.value, answers: answers }), + body: JSON.stringify({ event_type_slug: self.slug, start_at: slot.start, name: name.value.trim(), email: email.value.trim().toLowerCase(), timezone: TZ, language: self.locale, hp_extra: hp.value, answers: answers }), }).then(function (r) { return r.json().then(function (data) { return { ok: r.ok, status: r.status, data: data }; }); }).then(function (res) { diff --git a/internal/handler/templates/book.html b/internal/handler/templates/book.html index e2bd96d6..4145bedb 100644 --- a/internal/handler/templates/book.html +++ b/internal/handler/templates/book.html @@ -191,9 +191,11 @@

    {{.Name}}

    + it is rejected server-side. Real submissions leave it empty. The field is + deliberately NOT named "company": browsers map that to the organization + autofill entry and fill it for real humans, who are then rejected (#33). -->
    @@ -682,7 +684,7 @@

    {{call .T "booking_confirmed"}}

    email: form.email.value.trim(), timezone: TZ, language: LOCALE, - company: form.company.value, + hp_extra: form.hp_extra.value, answers, }), }); From 3c7e662fc938af02e5b07c5f4ac2e4b2a183d7b5 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 22:19:52 -0400 Subject: [PATCH 019/250] caldav: stop retrying an event no single account holds eventConn refuses to send anything when the stored ids do not pick out exactly one CalDAV account: no account holds the event URL, two tie, or the id is not a URL at all. The reconciler treated that refusal like any other failure, leaving needs_sync set (reschedules) or the event id in place (cancellations) and trying again next sweep. Nothing is sent now, but a retry re-reads the same connections and refuses the same way, so the loop only moved: an error line every two minutes until the booking ended, and forever for a cancellation, whose sweep has no date bound. The three refusals now match calendar.ErrEventUnreachable. On it the reconciler logs one warning and lets go: it clears needs_sync for a reschedule (the event keeps its old time and its id) and clears the id for a cancellation (the event stays on its calendar). The cancel warning names the event, since clearing the id drops the only record of it, and logs it redacted because a CalDAV id is a URL that can carry userinfo. A tie is treated the same. needs_sync is surfaced nowhere a person would see it, so leaving it set would reach nobody but the log, and only a change to the host's connections could break the tie. Every other error stays retryable, including a server that is down or refuses the stored password, since reconnecting or waiting fixes those. Tests: the reconciler, with a provider that claims the event, over two sweeps: an unreachable refusal is called once, clears the flag or id and warns exactly once; a transient error is called twice and keeps both. The warning does not log a password embedded in the event URL. On the CalDAV side, all seven no-owner and tie cases now assert the sentinel, and a refused password and an unreachable server assert that they do not match it. Restoring the old reconciler branch fails both reconciler tests; removing the sentinel match fails 14 CalDAV assertions. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 4 +- docs/ARCHITECTURE.md | 7 + internal/caldav/events.go | 16 +- internal/caldav/events_test.go | 50 +++- internal/calendar/calendar.go | 7 + internal/handler/calendar_reconcile.go | 29 ++- .../calendar_reconcile_internal_test.go | 224 ++++++++++++++++++ 7 files changed, 324 insertions(+), 13 deletions(-) create mode 100644 internal/handler/calendar_reconcile_internal_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 5abee573..2dd577d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,9 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad Update and cancel now authenticate as the account that holds the event, found from what the booking stored: the calendar recorded at creation, or failing that the connected calendar whose URL contains the event's URL (same scheme, host and port). If no single - account can be established, nothing is sent and the error is logged. Hosts who moved a + account can be established, nothing is sent, and the reconciler logs one warning and stops + retrying that event rather than refusing it again every sweep; the event stays where it + is. Hosts who moved a CalDAV destination between accounts on different servers should consider rotating the app password of the account they moved to. diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index d16328ed..4c41602f 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -560,6 +560,13 @@ most specific wins). No match, or a tie, sends nothing and returns an error. Thi credential boundary, not a routing nicety: accounts can live on different servers, and the destination's app password sent to an older event's URL goes to someone else's server. +That refusal matches `calendar.ErrEventUnreachable`, and the reconciler treats it as final: +it logs one warning, clears `needs_sync` (reschedule) or the event id (cancel, logged +redacted since it is the only record), and does not retry. Retrying cannot help, because it +re-reads the same connections and refuses the same way, and the cancellation sweep has no +date bound, so it would repeat forever. Any other error, such as a server that is down or +refuses the stored password, stays retryable. + --- ## 11. Calendar reconciler (self-healing) diff --git a/internal/caldav/events.go b/internal/caldav/events.go index f0ffa1af..81afcb8e 100644 --- a/internal/caldav/events.go +++ b/internal/caldav/events.go @@ -2,7 +2,6 @@ package caldav import ( "context" - "errors" "fmt" "io" "net/http" @@ -100,11 +99,20 @@ func (c *Client) RecognizesEvent(eventID string) bool { } var ( - errEventNotURL = errors.New("caldav: event id is not a CalDAV resource URL; nothing was sent") - errNoEventOwner = errors.New("caldav: none of the user's CalDAV accounts holds this event (it is not inside any of their calendars); nothing was sent") - errManyEventOwner = errors.New("caldav: more than one of the user's CalDAV accounts could hold this event; nothing was sent") + errEventNotURL error = unreachableEventError("caldav: event id is not a CalDAV resource URL; nothing was sent") + errNoEventOwner error = unreachableEventError("caldav: none of the user's CalDAV accounts holds this event (it is not inside any of their calendars); nothing was sent") + errManyEventOwner error = unreachableEventError("caldav: more than one of the user's CalDAV accounts could hold this event; nothing was sent") ) +// unreachableEventError is an update or cancel refused before any request, because the stored +// ids do not pick out one account to send it as. It matches calendar.ErrEventUnreachable, which +// is what tells the reconciler that retrying cannot help. +type unreachableEventError string + +func (e unreachableEventError) Error() string { return string(e) } + +func (e unreachableEventError) Is(target error) bool { return target == calendar.ErrEventUnreachable } + // eventAccount is one connected CalDAV account and every collection URL it is known to use: the // calendar bound at connect, then any calendars saved for the account in connection_calendars. type eventAccount struct { diff --git a/internal/caldav/events_test.go b/internal/caldav/events_test.go index c4244d72..c57cfe09 100644 --- a/internal/caldav/events_test.go +++ b/internal/caldav/events_test.go @@ -468,11 +468,13 @@ func TestUpdateCancel_ambiguousOrUnknownOwnerSendsNothing(t *testing.T) { ctx := context.Background() svc := newSvc(s.c) calendarID, eventID := tc.ids(s) - if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err == nil { - t.Error("UpdateEvent: want an error when the owning account cannot be established, got nil") + // ErrEventUnreachable specifically, not just an error: it is what stops the + // reconciler retrying a refusal that no later sweep can change. + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); !errors.Is(err, calendar.ErrEventUnreachable) { + t.Errorf("UpdateEvent = %v, want calendar.ErrEventUnreachable when the owning account cannot be established", err) } - if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err == nil { - t.Error("CancelEvent: want an error when the owning account cannot be established, got nil") + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); !errors.Is(err, calendar.ErrEventUnreachable) { + t.Errorf("CancelEvent = %v, want calendar.ErrEventUnreachable when the owning account cannot be established", err) } s.srvA.noRequests(t, "A") s.srvB.noRequests(t, "B") @@ -481,6 +483,46 @@ func TestUpdateCancel_ambiguousOrUnknownOwnerSendsNothing(t *testing.T) { } } +// Once the owning account is established, a failure talking to its server is an ordinary error +// and must not read as ErrEventUnreachable: the server can come back, and the app password can +// be fixed by reconnecting, so the reconciler has to keep retrying these. +func TestUpdateCancel_serverFailureStaysRetryable(t *testing.T) { + cases := []struct { + name string + fail func(t *testing.T, c *Client, s *davServer) + }{ + {"server refuses the stored password", func(t *testing.T, c *Client, s *davServer) { + if err := c.saveConnection(context.Background(), "u1", "a@a.test", "revoked", s.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + }}, + {"server is unreachable", func(_ *testing.T, _ *Client, s *davServer) { s.Close() }}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + srvA := newDAVServer(t, "a@a.test", "pw-a") + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + t.Fatal(err) + } + svc := newSvc(c) + eventID, calendarID := createOn(t, svc, "a@a.test") + tc.fail(t, c, srvA) + + err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd) + if err == nil || errors.Is(err, calendar.ErrEventUnreachable) { + t.Errorf("UpdateEvent = %v, want a retryable error (not ErrEventUnreachable)", err) + } + err = svc.CancelEvent(ctx, "u1", calendarID, eventID) + if err == nil || errors.Is(err, calendar.ErrEventUnreachable) { + t.Errorf("CancelEvent = %v, want a retryable error (not ErrEventUnreachable)", err) + } + }) + } +} + // The common case, one CalDAV account that is still the destination, sends exactly the // requests it always did, whether or not a calendar id was recorded. func TestUpdateCancel_singleAccountUnchanged(t *testing.T) { diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index eda1b5ad..d9f0df29 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -7,6 +7,7 @@ package calendar import ( "context" "database/sql" + "errors" "sort" "time" @@ -91,6 +92,12 @@ type EventRecognizer interface { RecognizesEvent(eventID string) bool } +// ErrEventUnreachable matches an UpdateEvent or CancelEvent error that was refused before +// anything was sent, because the stored ids do not identify one connected account to act as. +// It is a verdict on stored state, not a failed request: a retry re-reads the same connections +// and refuses the same way, so the reconciler stops retrying an event that returns it. +var ErrEventUnreachable = errors.New("calendar: no single connected account holds this event") + // Service holds the configured providers and dispatches per-user operations to // whichever provider that user has connected. type Service struct { diff --git a/internal/handler/calendar_reconcile.go b/internal/handler/calendar_reconcile.go index 5ff52c11..ba67ca85 100644 --- a/internal/handler/calendar_reconcile.go +++ b/internal/handler/calendar_reconcile.go @@ -2,6 +2,8 @@ package handler import ( "context" + "errors" + "net/url" "time" "github.com/calnode/calnode/internal/calendar" @@ -96,8 +98,15 @@ func (h *Handler) reconcileReschedules(ctx context.Context, gc *calendar.Service continue } if err := gc.UpdateEvent(ctx, d.userID, d.calendarID, d.eventID, start, end); err != nil { - h.logger.Error("reconcile: re-apply event time", "error", err, "booking_id", d.bookingID, "host", d.userID) - continue // leave the flag set; retry next sweep + if !errors.Is(err, calendar.ErrEventUnreachable) { + h.logger.Error("reconcile: re-apply event time", "error", err, "booking_id", d.bookingID, "host", d.userID) + continue // leave the flag set; retry next sweep + } + // Nothing was sent, and the next sweep would re-read the same connections and + // refuse the same way, so clear the flag rather than log this every sweep until + // the booking ends. The event keeps its old time. + h.logger.Warn("reconcile: not retrying an event no single account holds; it keeps its old time", + "error", err, "booking_id", d.bookingID, "host", d.userID) } if _, err := h.db.ExecContext(ctx, `UPDATE booking_hosts SET needs_sync = 0 WHERE booking_id = ? AND user_id = ?`, @@ -133,8 +142,20 @@ func (h *Handler) reconcileCancellations(ctx context.Context, gc *calendar.Servi for _, o := range orphans { if err := gc.CancelEvent(ctx, o.userID, o.calendarID, o.eventID); err != nil { - h.logger.Error("reconcile: cancel orphaned event", "error", err, "booking_id", o.bookingID, "host", o.userID) - continue // leave the id in place; retry next sweep + if !errors.Is(err, calendar.ErrEventUnreachable) { + h.logger.Error("reconcile: cancel orphaned event", "error", err, "booking_id", o.bookingID, "host", o.userID) + continue // leave the id in place; retry next sweep + } + // As for reschedules: no retry can succeed, and this query has no date bound, so + // leaving the id would repeat the refusal every sweep forever. The event stays on + // its calendar; its id is logged because clearing it drops the only copy. A CalDAV + // id is a URL and could carry userinfo, so it is logged redacted, or not at all. + eventForLog := "" + if u, perr := url.Parse(o.eventID); perr == nil { + eventForLog = u.Redacted() + } + h.logger.Warn("reconcile: not retrying the delete of an event no single account holds; it stays on its calendar", + "error", err, "booking_id", o.bookingID, "host", o.userID, "event_id", eventForLog) } if _, err := h.db.ExecContext(ctx, `UPDATE booking_hosts SET external_event_id = NULL WHERE booking_id = ? AND user_id = ?`, diff --git a/internal/handler/calendar_reconcile_internal_test.go b/internal/handler/calendar_reconcile_internal_test.go new file mode 100644 index 00000000..a25c2753 --- /dev/null +++ b/internal/handler/calendar_reconcile_internal_test.go @@ -0,0 +1,224 @@ +package handler + +import ( + "bytes" + "context" + "database/sql" + "errors" + "fmt" + "log/slog" + "strings" + "sync" + "testing" + "time" + + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/db" + "github.com/calnode/calnode/internal/slots" +) + +// stuckProvider claims every event id (as CalDAV does for its URLs) and fails every update and +// cancel with err, counting the calls so a test can tell a retry from a sweep that let go. +type stuckProvider struct { + err error + + mu sync.Mutex + updates int + cancels int +} + +func (p *stuckProvider) calls() (updates, cancels int) { + p.mu.Lock() + defer p.mu.Unlock() + return p.updates, p.cancels +} + +func (p *stuckProvider) Name() string { return "caldav" } +func (p *stuckProvider) InvitesGuests() bool { return false } +func (p *stuckProvider) RecognizesEvent(string) bool { return true } +func (p *stuckProvider) AuthURL(string) string { return "" } +func (p *stuckProvider) EncryptState(string) (string, error) { return "", nil } +func (p *stuckProvider) DecryptState(string) (string, error) { return "", nil } +func (p *stuckProvider) Exchange(context.Context, string, string, string) error { return nil } +func (p *stuckProvider) Connected(context.Context, string) (bool, error) { return true, nil } +func (p *stuckProvider) Disconnect(context.Context, string) error { return nil } +func (p *stuckProvider) HasDestination(context.Context, string) (bool, error) { return false, nil } +func (p *stuckProvider) ListCalendars(context.Context, string, string) ([]calendar.CalendarInfo, error) { + return nil, nil +} +func (p *stuckProvider) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return nil, nil +} +func (p *stuckProvider) CreateEvent(context.Context, string, calendar.CreateEventParams) (string, string, string, error) { + return "", "", "", nil +} +func (p *stuckProvider) UpdateEvent(context.Context, string, string, string, time.Time, time.Time) error { + p.mu.Lock() + defer p.mu.Unlock() + p.updates++ + return p.err +} +func (p *stuckProvider) CancelEvent(context.Context, string, string, string) error { + p.mu.Lock() + defer p.mu.Unlock() + p.cancels++ + return p.err +} + +// unreachable stands in for the CalDAV provider's refusal: its own message, matching the +// sentinel the way caldav's errors do, rather than the bare sentinel. +type unreachable struct{} + +func (unreachable) Error() string { return "caldav: more than one account could hold this event" } +func (unreachable) Is(target error) bool { return target == calendar.ErrEventUnreachable } + +// newReconcileFixture seeds one host, an event type and a booking in the given status whose +// host row carries an event id, with needs_sync set. It returns the handler (logging into logs), +// the database and the booking id. +func newReconcileFixture(t *testing.T, status string, logs *bytes.Buffer) (*Handler, *sql.DB, string) { + t.Helper() + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatalf("db.Open: %v", err) + } + if err := db.Migrate(database); err != nil { + t.Fatalf("db.Migrate: %v", err) + } + t.Cleanup(func() { database.Close() }) + + start := time.Now().UTC().Add(24 * time.Hour) + for _, q := range []struct { + sql string + args []any + }{ + {`INSERT INTO users (id, email, name, iana_timezone) VALUES ('host-1', 'host@example.com', 'Host', 'UTC')`, nil}, + {`INSERT INTO event_types (id, user_id, slug, name, duration_minutes) VALUES ('et-1', 'host-1', 'intro', 'Intro', 30)`, nil}, + {`INSERT INTO bookings (id, event_type_id, host_id, start_at, end_at, status) VALUES ('bk-1', 'et-1', 'host-1', ?, ?, ?)`, + []any{start.Format(time.RFC3339), start.Add(30 * time.Minute).Format(time.RFC3339), status}}, + {`INSERT INTO booking_hosts (id, booking_id, user_id, is_primary, external_event_id, external_calendar_id, needs_sync) + VALUES ('bh-1', 'bk-1', 'host-1', 1, 'https://dav.example.com/calendars/host/home/ev1.ics', 'https://dav.example.com/calendars/host/home/', 1)`, nil}, + } { + if _, err := database.Exec(q.sql, q.args...); err != nil { + t.Fatalf("seed: %v\n%s", err, q.sql) + } + } + return New(database, slog.New(slog.NewTextHandler(logs, nil))), database, "bk-1" +} + +func hostRow(t *testing.T, database *sql.DB) (eventID sql.NullString, needsSync int) { + t.Helper() + if err := database.QueryRow( + `SELECT external_event_id, needs_sync FROM booking_hosts WHERE booking_id = 'bk-1' AND user_id = 'host-1'`, + ).Scan(&eventID, &needsSync); err != nil { + t.Fatalf("read booking_hosts: %v", err) + } + return eventID, needsSync +} + +// A reschedule the provider refuses as unreachable is not retried: the first sweep logs one +// warning and clears needs_sync, and the second sweep does not call the provider at all. Any +// other error leaves the flag set, so the next sweep tries again. +func TestReconcileReschedules_unreachableEventIsNotRetried(t *testing.T) { + cases := []struct { + name string + err error + wantUpdates int + wantSync int + }{ + {"unreachable: flag cleared, second sweep sends nothing", fmt.Errorf("update: %w", unreachable{}), 1, 0}, + {"transient: flag kept, retried every sweep", errors.New("caldav: fetch event for update returned status 503"), 2, 1}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + var logs bytes.Buffer + h, database, _ := newReconcileFixture(t, "confirmed", &logs) + p := &stuckProvider{err: tc.err} + svc := calendar.NewService(database) + svc.Register(p) + + h.reconcileReschedules(context.Background(), svc) + h.reconcileReschedules(context.Background(), svc) + + if updates, _ := p.calls(); updates != tc.wantUpdates { + t.Errorf("UpdateEvent called %d times over two sweeps, want %d", updates, tc.wantUpdates) + } + eventID, needsSync := hostRow(t, database) + if needsSync != tc.wantSync { + t.Errorf("needs_sync = %d, want %d", needsSync, tc.wantSync) + } + if !eventID.Valid { + t.Error("external_event_id was cleared; a reschedule must keep the event id") + } + if tc.wantSync == 0 { + if n := strings.Count(logs.String(), "not retrying an event no single account holds"); n != 1 { + t.Errorf("logged the give-up warning %d times, want exactly once:\n%s", n, logs.String()) + } + } + }) + } +} + +// A cancellation the provider refuses as unreachable is not retried either. This sweep has no +// date bound, so before this change the refusal repeated every two minutes forever. The event id +// is logged (it is the only record of which event was left behind), then cleared. +func TestReconcileCancellations_unreachableEventIsNotRetried(t *testing.T) { + cases := []struct { + name string + err error + wantCancels int + wantID bool + }{ + {"unreachable: id cleared, second sweep sends nothing", fmt.Errorf("cancel: %w", unreachable{}), 1, false}, + {"transient: id kept, retried every sweep", errors.New("caldav: delete event returned status 503"), 2, true}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + var logs bytes.Buffer + h, database, _ := newReconcileFixture(t, "cancelled", &logs) + p := &stuckProvider{err: tc.err} + svc := calendar.NewService(database) + svc.Register(p) + + h.reconcileCancellations(context.Background(), svc) + h.reconcileCancellations(context.Background(), svc) + + if _, cancels := p.calls(); cancels != tc.wantCancels { + t.Errorf("CancelEvent called %d times over two sweeps, want %d", cancels, tc.wantCancels) + } + eventID, _ := hostRow(t, database) + if eventID.Valid != tc.wantID { + t.Errorf("external_event_id present = %v, want %v", eventID.Valid, tc.wantID) + } + if !tc.wantID { + out := logs.String() + if n := strings.Count(out, "not retrying the delete of an event no single account holds"); n != 1 { + t.Errorf("logged the give-up warning %d times, want exactly once:\n%s", n, out) + } + if !strings.Contains(out, "calendars/host/home/ev1.ics") { + t.Errorf("the warning does not name the event it leaves behind:\n%s", out) + } + } + }) + } +} + +// The event id is a URL a host typed the server part of, so it can carry userinfo. The give-up +// warning must not write a password into the log. +func TestReconcileCancellations_warningRedactsEventURL(t *testing.T) { + var logs bytes.Buffer + h, database, _ := newReconcileFixture(t, "cancelled", &logs) + if _, err := database.Exec(`UPDATE booking_hosts SET external_event_id = 'https://host:s3cret@dav.example.com/calendars/host/home/ev1.ics'`); err != nil { + t.Fatal(err) + } + svc := calendar.NewService(database) + svc.Register(&stuckProvider{err: unreachable{}}) + + h.reconcileCancellations(context.Background(), svc) + + if strings.Contains(logs.String(), "s3cret") { + t.Errorf("the warning logged the password embedded in the event URL:\n%s", logs.String()) + } + if !strings.Contains(logs.String(), "calendars/host/home/ev1.ics") { + t.Errorf("the warning does not name the event:\n%s", logs.String()) + } +} From 60db2b3de5ba61cf6d8255f3f06ee62bb969ae36 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 22:21:16 -0400 Subject: [PATCH 020/250] changelog: fr-CA is unreleased, not part of 0.9.0 The branch was cut before 0.9.0, when its entry sat under [Unreleased]. 0.9.0 renamed that section, and merging main moved the entry with it without a conflict, so it read as something 0.9.0 shipped. Moved back under [Unreleased], text unchanged. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec90e074..d7423d3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,20 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Added +- **Canadian French (`fr-CA`) on the booker-facing surfaces.** A visitor whose browser asks + for `fr-CA` now gets Canadian French rather than the France copy; `fr` and `fr-FR` are + unaffected. It is the first regional locale, and a separate file rather than a fallback + because the differences are real: `courriel` rather than `e-mail`, `reporter`/`report` + rather than `reprogrammer`, `renseignements personnels` (the Quebec statutory term) rather + than `données personnelles`, no space before `!` `?` `;` where France puts one, and CLDR + itself spells July `juill.` here against `juil.` in France. + + ⚠️ **The wording is an unreviewed draft**, like every non-English locale in this + repository: the structure is verified by the same three guards (same keys, printf-verb + parity, date tables cross-checked against CLDR), but no native Canadian French speaker has + read the copy. Corrections are welcome and easy to merge — see CONTRIBUTING. + ### Fixed - **The Zoom setup text no longer promises that an unpublished app works for "your own team".** Zoom only lets users inside the Zoom account that owns an unpublished app @@ -34,19 +48,6 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad `-copy-2`, `-copy-3`, …) slug, and keeps `price_cents`/`currency` verbatim: zeroing a copied price is how a paid meeting quietly starts selling for nothing. Bookings are not copied. -- **Canadian French (`fr-CA`) on the booker-facing surfaces.** A visitor whose browser asks - for `fr-CA` now gets Canadian French rather than the France copy; `fr` and `fr-FR` are - unaffected. It is the first regional locale, and a separate file rather than a fallback - because the differences are real: `courriel` rather than `e-mail`, `reporter`/`report` - rather than `reprogrammer`, `renseignements personnels` (the Quebec statutory term) rather - than `données personnelles`, no space before `!` `?` `;` where France puts one, and CLDR - itself spells July `juill.` here against `juil.` in France. - - ⚠️ **The wording is an unreviewed draft**, like every non-English locale in this - repository: the structure is verified by the same three guards (same keys, printf-verb - parity, date tables cross-checked against CLDR), but no native Canadian French speaker has - read the copy. Corrections are welcome and easy to merge — see CONTRIBUTING. - - **Empty days and minimum-notice gaps now explain themselves** on all three booking surfaces (booking page, manage/reschedule page, embed widget). Closes [#20](https://github.com/Calnode/calnode/issues/20). From 707e4a4d9ffdde75e76351c6aabdaec12c24446d Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 22:21:16 -0400 Subject: [PATCH 021/250] changelog: FRAME_ANCESTORS is unreleased, not part of 0.9.0 #40 was squash-merged on 2026-09-17 from a branch cut before 0.9.0 (2026-09-10), and its entry landed under 0.9.0's Added the same way, without a conflict. 0.9.0 shipped without the setting. Moved under [Unreleased], text unchanged. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7423d3d..4644c3e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,19 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad parity, date tables cross-checked against CLDR), but no native Canadian French speaker has read the copy. Corrections are welcome and easy to merge — see CONTRIBUTING. +- **`FRAME_ANCESTORS`: embed the admin UI in your own console.** Space-separated origins + (`https://console.example.com 'self'`); when set, `/admin/` sends + `Content-Security-Policy: frame-ancestors `. The public booking pages are + untouched and still deny framing outright — this is about the console, not the pages + that take card details. + + Two deliberate refusals. An entry that is not `https://host[:port]` or `'self'` stops + the app booting rather than being ignored, because a browser drops a source list it + cannot parse, which would leave the admin UI *more* embeddable than the setting being + unset. And no `X-Frame-Options` is sent beside it: that header has no allow-list form, + so the only value it could carry is `SAMEORIGIN`, which browsers honour instead of the + CSP and would break the embedding this exists for. + ### Fixed - **The Zoom setup text no longer promises that an unpublished app works for "your own team".** Zoom only lets users inside the Zoom account that owns an unpublished app @@ -64,19 +77,6 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad pool could satisfy are all excluded, so the explanation never appears attached to the wrong cause. Three new/changed keys in all eight locales. -- **`FRAME_ANCESTORS`: embed the admin UI in your own console.** Space-separated origins - (`https://console.example.com 'self'`); when set, `/admin/` sends - `Content-Security-Policy: frame-ancestors `. The public booking pages are - untouched and still deny framing outright — this is about the console, not the pages - that take card details. - - Two deliberate refusals. An entry that is not `https://host[:port]` or `'self'` stops - the app booting rather than being ignored, because a browser drops a source list it - cannot parse, which would leave the admin UI *more* embeddable than the setting being - unset. And no `X-Frame-Options` is sent beside it: that header has no allow-list form, - so the only value it could carry is `SAMEORIGIN`, which browsers honour instead of the - CSP and would break the embedding this exists for. - ### Fixed - **Constraint violations are recognised by SQLite's error code rather than by its English message.** Thirteen call sites asked `strings.Contains(err.Error(), "UNIQUE From 89c1e396c9b1caadd03b34bee68e1523d1ccc5f8 Mon Sep 17 00:00:00 2001 From: Distronode <254259913+distronode-com@users.noreply.github.com> Date: Wed, 16 Sep 2026 22:21:16 -0400 Subject: [PATCH 022/250] changelog: sign-out-everywhere is unreleased, not part of 0.9.0 The branch was cut before 0.9.0, when its entry sat under [Unreleased]. 0.9.0 renamed that section, and merging main moved the entry with it without a conflict, so it read as something 0.9.0 shipped. Moved back under [Unreleased], text unchanged. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8d6ff84..d687ec23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,18 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Added +- **Sign out everywhere.** `POST /v1/auth/sessions/revoke-all` ends every session you + have except the one you asked from, so losing a laptop no longer means waiting out a + 30-day cookie. Pass `{"user_id": "..."}` and an admin can do the same for someone + else: an admin may revoke a member, only the owner may revoke another admin, and the + owner's own sessions can only be ended by the owner. + + It also revokes that person's MCP OAuth tokens, which is the part that makes it an + offboarding tool rather than a convenience. A connected agent authenticates with a + bearer token and not the session cookie, so ending the sessions alone would have left + it holding exactly the access that was just withdrawn. + ### Fixed - **The Zoom setup text no longer promises that an unpublished app works for "your own team".** Zoom only lets users inside the Zoom account that owns an unpublished app @@ -34,17 +46,6 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad `-copy-2`, `-copy-3`, …) slug, and keeps `price_cents`/`currency` verbatim: zeroing a copied price is how a paid meeting quietly starts selling for nothing. Bookings are not copied. -- **Sign out everywhere.** `POST /v1/auth/sessions/revoke-all` ends every session you - have except the one you asked from, so losing a laptop no longer means waiting out a - 30-day cookie. Pass `{"user_id": "..."}` and an admin can do the same for someone - else: an admin may revoke a member, only the owner may revoke another admin, and the - owner's own sessions can only be ended by the owner. - - It also revokes that person's MCP OAuth tokens, which is the part that makes it an - offboarding tool rather than a convenience. A connected agent authenticates with a - bearer token and not the session cookie, so ending the sessions alone would have left - it holding exactly the access that was just withdrawn. - - **Empty days and minimum-notice gaps now explain themselves** on all three booking surfaces (booking page, manage/reschedule page, embed widget). Closes [#20](https://github.com/Calnode/calnode/issues/20). From c22fcc29b533a74a6280ad049a216b479913d7ad Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 17 Sep 2026 14:47:18 +1200 Subject: [PATCH 023/250] fix(caldav): discover and check every calendar, not just the first (#42) Discovery picked one VEVENT collection and ListCalendars reported only that; conflict checks never read any other collection even when selected. Now discovery returns all collections (seeded with server-side names), ListCalendars lists them live with a stored-selection fallback, and conflict checks REPORT every selected collection. The picker destination (Book) is clearable and the Check/Book headers say what they mean. --- frontend/src/routes/calendar/+page.svelte | 28 ++- internal/caldav/caldav.go | 20 +- internal/caldav/caldav_test.go | 174 +++++++++++++++++- internal/caldav/calendars.go | 101 +++++++++- internal/caldav/discovery.go | 102 +++++++--- .../db/migrations/00059_caldav_home_url.sql | 10 + 6 files changed, 376 insertions(+), 59 deletions(-) create mode 100644 internal/db/migrations/00059_caldav_home_url.sql diff --git a/frontend/src/routes/calendar/+page.svelte b/frontend/src/routes/calendar/+page.svelte index 67fec4f5..1b0f4231 100644 --- a/frontend/src/routes/calendar/+page.svelte +++ b/frontend/src/routes/calendar/+page.svelte @@ -159,12 +159,23 @@ } } - // Exclusive within this account's list. The backend clears the flag across every other + // Exclusive within this account's list, but clearable: selecting the current + // destination again removes it (plain radios can't express "none", and the + // backend accepts a save with no destination — writes then fall back to the + // account's bound calendar). The backend clears the flag across every other // account when it saves, so the UI only has to keep this list consistent. function pickDestination(chosen: CalendarPick) { pickerCals = pickerCals.map((c) => ({ ...c, is_destination: c.id === chosen.id })); } + function toggleDestination(chosen: CalendarPick) { + if (chosen.is_destination) { + pickerCals = pickerCals.map((c) => ({ ...c, is_destination: false })); + } else { + pickDestination(chosen); + } + } + async function savePicker(c: CalendarConnection) { pickerSaving = true; pickerErr = ''; @@ -319,12 +330,12 @@ {:else}

    Tick the calendars to check for conflicts, and choose the one bookings are - written into. + written into (select it again to clear the choice).

    Check - Book + Destination Calendar
    {#each pickerCals as cal (cal.id)} @@ -333,13 +344,14 @@ - + - + pickDestination(cal)} - aria-label="Write bookings into {cal.name}" /> + onchange={() => toggleDestination(cal)} + aria-label="Write bookings into {cal.name} (select again to clear)" /> {cal.name} diff --git a/internal/caldav/caldav.go b/internal/caldav/caldav.go index cf143e75..d37e0cf0 100644 --- a/internal/caldav/caldav.go +++ b/internal/caldav/caldav.go @@ -208,9 +208,9 @@ func (c *Client) conflictConns(ctx context.Context, userID string) ([]conn, erro return nil, err } // Resolve selection + decrypt after the cursor is closed (single-connection DB pool; the - // ConflictCalendarIDs query would deadlock against an open cursor). CalDAV binds one - // calendar per connection, so the sub-calendar picker is simply an on/off toggle: an empty - // result means the user deselected it. + // ConflictCalendarIDs query would deadlock against an open cursor). One connection row + // can bind several selected collections (the picker), so every selected URL gets its + // own REPORT below; an empty result means the user deselected the whole account. var conns []conn for _, d := range data { calIDs, err := calendar.ConflictCalendarIDs(ctx, c.db, "caldav", userID, d.username, d.calURL) @@ -225,7 +225,9 @@ func (c *Client) conflictConns(ctx context.Context, userID string) ([]conn, erro c.logger.Warn("caldav: skipping connection with bad credentials", "user_id", userID, "error", err) continue } - conns = append(conns, conn{id: d.id, username: d.username, password: string(pw), calURL: d.calURL}) + for _, calURL := range calIDs { + conns = append(conns, conn{id: d.id, username: d.username, password: string(pw), calURL: calURL}) + } } return conns, nil } @@ -234,8 +236,8 @@ func (c *Client) conflictConns(ctx context.Context, userID string) ([]conn, erro // a user can connect several. On a new connection: check_conflicts=1, and it becomes the // destination only if the user has none yet. On a re-connect (row already exists for this // account): the existing check_conflicts/is_destination flags are preserved and only the -// password + calendar URL are refreshed. Mirrors gcal.saveToken. -func (c *Client) saveConnection(ctx context.Context, userID, accountEmail, password, calURL string) error { +// password + calendar URL (+ home URL) are refreshed. Mirrors gcal.saveToken. +func (c *Client) saveConnection(ctx context.Context, userID, accountEmail, password, calURL, homeURL string) error { pwEnc, err := c.encrypt([]byte(password)) if err != nil { return err @@ -261,9 +263,9 @@ func (c *Client) saveConnection(ctx context.Context, userID, accountEmail, passw if _, err := tx.ExecContext(ctx, ` INSERT INTO calendar_connections (id, user_id, provider, account_email, access_token_enc, calendar_id, - check_conflicts, is_destination, created_at) - VALUES (?, ?, 'caldav', ?, ?, ?, ?, ?, ?)`, - uid.New(), userID, accountEmail, pwEnc, calURL, checkConflicts, isDest, now); err != nil { + check_conflicts, is_destination, caldav_home_url, created_at) + VALUES (?, ?, 'caldav', ?, ?, ?, ?, ?, ?, ?)`, + uid.New(), userID, accountEmail, pwEnc, calURL, checkConflicts, isDest, homeURL, now); err != nil { return fmt.Errorf("caldav: save insert: %w", err) } return tx.Commit() diff --git a/internal/caldav/caldav_test.go b/internal/caldav/caldav_test.go index ab24ed7a..fee684fa 100644 --- a/internal/caldav/caldav_test.go +++ b/internal/caldav/caldav_test.go @@ -81,10 +81,10 @@ func TestSaveConnection_multiAccountDestinationInvariants(t *testing.T) { ctx := context.Background() seedUser(t, c.db, "u1") - if err := c.saveConnection(ctx, "u1", "a@icloud.com", "pw1", "https://x/cal/a/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@icloud.com", "pw1", "https://x/cal/a/", "https://x/home/"); err != nil { t.Fatalf("save a: %v", err) } - if err := c.saveConnection(ctx, "u1", "b@icloud.com", "pw2", "https://x/cal/b/"); err != nil { + if err := c.saveConnection(ctx, "u1", "b@icloud.com", "pw2", "https://x/cal/b/", "https://x/home/"); err != nil { t.Fatalf("save b: %v", err) } @@ -103,7 +103,7 @@ func TestSaveConnection_multiAccountDestinationInvariants(t *testing.T) { if err := svc.SetDestination(ctx, "u1", "caldav", "b@icloud.com"); err != nil { t.Fatalf("set dest b: %v", err) } - if err := c.saveConnection(ctx, "u1", "b@icloud.com", "pw2-rotated", "https://x/cal/b/"); err != nil { + if err := c.saveConnection(ctx, "u1", "b@icloud.com", "pw2-rotated", "https://x/cal/b/", "https://x/home/"); err != nil { t.Fatalf("re-save b: %v", err) } if dest := destEmail(t, c.db, "u1"); dest != "b@icloud.com" { @@ -114,15 +114,20 @@ func TestSaveConnection_multiAccountDestinationInvariants(t *testing.T) { } } -// A fake CalDAV server: answers the three discovery PROPFINDs, a calendar-query REPORT, and -// records PUT/DELETE so write-back can be asserted. -func fakeServer(t *testing.T, putBody, deletePath *string) *httptest.Server { +// A fake CalDAV server: answers the three discovery PROPFINDs, a calendar-query REPORT, +// and records PUT/DELETE so write-back can be asserted. The home exposes two VEVENT +// calendars (work, personal) plus a tasks-only collection that must be filtered out. +// REPORT targets are appended to reportPaths so multi-calendar conflict checks can be +// asserted. +func fakeServer(t *testing.T, putBody, deletePath *string, reportPaths *[]string) *httptest.Server { t.Helper() const principal = `/HTTP/1.1 200 OK/principals/user/` const home = `/principals/user/HTTP/1.1 200 OK/calendars/user/` const collections = ` /calendars/user/HTTP/1.1 200 OK /calendars/user/work/HTTP/1.1 200 OKCalendar + /calendars/user/personal/HTTP/1.1 200 OKPersonal + /calendars/user/tasks/HTTP/1.1 200 OKReminders ` // One busy event, one TRANSPARENT (ignored), one CANCELLED (ignored). const report = `/calendars/user/work/ev1.icsHTTP/1.1 200 OKBEGIN:VCALENDAR @@ -144,6 +149,14 @@ DTSTART:20260625T130000Z DTEND:20260625T140000Z STATUS:CANCELLED END:VEVENT +END:VCALENDAR` + const personalReport = `/calendars/user/personal/ev9.icsHTTP/1.1 200 OKBEGIN:VCALENDAR +BEGIN:VEVENT +UID:personal-busy@x +DTSTART:20260625T150000Z +DTEND:20260625T160000Z +SUMMARY:Personal busy +END:VEVENT END:VCALENDAR` return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -158,8 +171,17 @@ END:VCALENDAR` ) -// Connect validates the given CalDAV credentials by discovering the user's default calendar -// collection, then stores the connection (encrypting the app password). Returns the resolved -// account email and calendar URL. The serverURL is a base (a Presets value or a user-supplied -// Nextcloud/custom URL); discovery resolves the rest. An auth failure or a server with no -// VEVENT-capable calendar is surfaced as an error so the connect form can show it. +// Connect validates the given CalDAV credentials by discovering the user's calendar +// collections, then stores the connection (encrypting the app password) bound to the +// default collection. Every discovered collection is seeded into connection_calendars +// so the calendar picker lists them all with their server-side names. Returns the +// resolved account email and calendar URL. The serverURL is a base (a Presets value or +// a user-supplied Nextcloud/custom URL); discovery resolves the rest. An auth failure +// or a server with no VEVENT-capable calendar is surfaced as an error so the connect +// form can show it. func (c *Client) Connect(ctx context.Context, userID, serverURL, username, password string) (accountEmail, calURL string, err error) { username = strings.TrimSpace(username) if username == "" || password == "" || strings.TrimSpace(serverURL) == "" { return "", "", fmt.Errorf("caldav: server URL, username and app password are all required") } - calURL, err = c.discoverCalendar(ctx, strings.TrimSpace(serverURL), username, password) + home, cals, err := c.discoverCalendars(ctx, strings.TrimSpace(serverURL), username, password) if err != nil { return "", "", err } + calURL = preferDefault(cals) accountEmail = strings.ToLower(username) - if err := c.saveConnection(ctx, userID, accountEmail, password, calURL); err != nil { + if err := c.saveConnection(ctx, userID, accountEmail, password, calURL, home); err != nil { + return "", "", err + } + if err := c.seedDiscoveredCalendars(ctx, userID, accountEmail, calURL, cals); err != nil { return "", "", err } return accountEmail, calURL, nil } -// discoverCalendar walks principal → calendar-home → calendar collections and returns the URL -// of the first VEVENT-capable calendar collection. -func (c *Client) discoverCalendar(ctx context.Context, serverURL, username, password string) (string, error) { +// preferDefault picks the bound collection out of the discovered set: a calendar +// literally named/pathed "calendar" wins when present, else the first one. Discovery +// guarantees at least one entry. +func preferDefault(cals []discoveredCalendar) string { + first := cals[0].URL + for _, cal := range cals { + if strings.EqualFold(cal.Name, "Calendar") || strings.Contains(strings.ToLower(cal.URL), "/calendar") { + return cal.URL + } + } + return first +} + +// discoverCalendars walks principal → calendar-home → calendar collections and returns +// the home URL plus every VEVENT-capable collection, with server-side display names. +func (c *Client) discoverCalendars(ctx context.Context, serverURL, username, password string) (home string, cals []discoveredCalendar, err error) { // 1. current-user-principal — try the base URL, then the RFC 5785 well-known path. principal, base, err := c.findPrincipal(ctx, serverURL, username, password) if err != nil { - return "", err + return "", nil, err } // 2. calendar-home-set on the principal. ms, homeReqURL, err := c.propfind(ctx, principal, username, password, "0", propCalendarHomeSet) if err != nil { - return "", err + return "", nil, err } - var home string for _, r := range ms.Responses { if h := r.okProp().CalendarHomeSet.Href; h != "" { home = resolveRef(homeReqURL, h) @@ -74,12 +102,11 @@ func (c *Client) discoverCalendar(ctx context.Context, serverURL, username, pass home = principal } - // 3. list calendar collections (Depth 1) and pick the first that supports VEVENT. + // 3. list calendar collections (Depth 1), keeping every VEVENT-capable one. ms, homeReqURL, err = c.propfind(ctx, home, username, password, "1", propCalendarCollections) if err != nil { - return "", err + return "", nil, err } - var firstCal string for _, r := range ms.Responses { p := r.okProp() if p.ResourceType.Calendar == nil { @@ -89,19 +116,44 @@ func (c *Client) discoverCalendar(ctx context.Context, serverURL, username, pass continue // e.g. a tasks/reminders or birthdays calendar } u := resolveRef(homeReqURL, r.Href) - if firstCal == "" { - firstCal = u - } - // Prefer a calendar literally named/pathed "calendar" as the default when present. - if strings.EqualFold(p.DisplayName, "Calendar") || strings.Contains(strings.ToLower(u), "/calendar") { - return u, nil + name := strings.TrimSpace(p.DisplayName) + if name == "" { + name = path.Base(strings.TrimSuffix(u, "/")) + if name == "" || name == "." || name == "/" { + name = "Calendar" + } } + cals = append(cals, discoveredCalendar{URL: u, Name: name}) } - if firstCal == "" { + if len(cals) == 0 { _ = base - return "", fmt.Errorf("caldav: no writable calendar found on the server") + return "", nil, fmt.Errorf("caldav: no writable calendar found on the server") + } + return home, cals, nil +} + +// seedDiscoveredCalendars records every discovered collection in connection_calendars +// so the calendar picker lists them all immediately with server-side names. The bound +// (default) collection is seeded conflict-checked, preserving the pre-picker behaviour +// where a fresh connection checks its one calendar; the rest start unchecked for the +// user to tick. Names refresh on every (re-)connect; the user's check_conflicts / +// is_destination flags are preserved (only name is overwritten on conflict) — a +// reconnect never resets the picker. +func (c *Client) seedDiscoveredCalendars(ctx context.Context, userID, accountEmail, boundCalURL string, cals []discoveredCalendar) error { + for _, cal := range cals { + check := 0 + if cal.URL == boundCalURL { + check = 1 + } + if _, err := c.db.ExecContext(ctx, ` + INSERT INTO connection_calendars (id, user_id, provider, account_email, calendar_id, name, check_conflicts, is_destination) + VALUES (?, ?, 'caldav', ?, ?, ?, ?, 0) + ON CONFLICT(user_id, provider, account_email, calendar_id) DO UPDATE SET name = excluded.name`, + uid.New(), userID, accountEmail, cal.URL, cal.Name, check); err != nil { + return fmt.Errorf("caldav: seed calendars: %w", err) + } } - return firstCal, nil + return nil } // findPrincipal resolves current-user-principal, trying the base URL first and then the diff --git a/internal/db/migrations/00059_caldav_home_url.sql b/internal/db/migrations/00059_caldav_home_url.sql new file mode 100644 index 00000000..47a51bb6 --- /dev/null +++ b/internal/db/migrations/00059_caldav_home_url.sql @@ -0,0 +1,10 @@ +-- +goose Up +-- CalDAV calendar-home URL per connection. Discovery resolves principal -> +-- calendar-home -> collections once at connect time; the home URL is needed later +-- to re-list every collection (ListCalendars) without the server base URL, which +-- is not stored. Existing connections get NULL and keep the previous behaviour +-- (the single bound calendar) until reconnected. +ALTER TABLE calendar_connections ADD COLUMN caldav_home_url TEXT; + +-- +goose Down +-- SQLite doesn't support DROP COLUMN before v3.35; leave the column in place. From d4cb4f2448de6643b44381afb7bbd935a825695c Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 17 Sep 2026 16:13:08 +1200 Subject: [PATCH 024/250] docs(zoom): multi-member playbook and settings-page warning (#35) An unpublished Zoom app only authorizes same-account users, and Zoom refuses outsiders before Calnode is involved, so member connect failures are policy, not a bug. Document the ranked options (built-in video first) and say so on the settings page, where the old step 2 implied any team member could connect. --- docs/ZOOM.md | 47 +++++++++++++++++++ .../src/routes/settings/zoom/+page.svelte | 12 ++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 docs/ZOOM.md diff --git a/docs/ZOOM.md b/docs/ZOOM.md new file mode 100644 index 00000000..def2f247 --- /dev/null +++ b/docs/ZOOM.md @@ -0,0 +1,47 @@ +# Zoom integration + +One Zoom OAuth app per Calnode instance (entered in **Settings → Zoom**), then each +host connects their **own** Zoom account through that app from the **Calendar** page. +Bookings with a Zoom location get a real meeting link minted under the assigned host's +account. The settings page shows the exact Redirect URL and required scope +(`meeting:write`); the app can stay unpublished for a single-account team. + +## Multi-member teams: read this before inviting people + +Zoom — not Calnode — decides who may authorize your app. An **unpublished** app can +only be authorized by users on the **same Zoom account** as the app owner. A member on +a different Zoom account clicks Connect and Zoom itself refuses; no callback, token, +or error ever reaches Calnode, so there is nothing to retry or work around in settings. + +Your options, ranked honestly: + +1. **Use the video already in the box.** Built-in LiveKit needs no per-user OAuth, no + Zoom app, and no publication — see [VIDEO.md](VIDEO.md). For most teams hitting this + wall, this is the answer: it converts "Zoom won't let us" into "we don't need Zoom". +2. **Same Zoom account.** If everyone already belongs to one Zoom organization, join the + accounts and the unpublished app works for all members instantly. The price is real: + joined accounts lose independence (the admin can see usage and enforce settings) and + paid features need a license per head from the account owner. +3. **Publish the app.** Zoom Marketplace review (technical design docs, security + controls, vulnerability testing). Built for vendors shipping a product, not for a + team running its own scheduler. Only take this path if you are productizing Calnode. +4. **Stopgap: Zoom's beta share link.** Lets up to 100 external users authorize for up + to 90 days (4 weeks + extensions). A bridge, not a home — afterwards, publish or + lose access. + +What does **not** work: re-entering credentials, reinstalling, different hosting +(Docker vs Railway vs Render all behave identically), or having the member confirm +they own an active Zoom account. The refusal happens on Zoom's consent page under all +of them. + +## Note for contributors + +Per-member BYO Zoom apps (each host registers their own app) would technically work — +a member always authorizes their own app — and a PR doing it would be welcome if built +within these bounds: the instance app stays the default and fallback; per-user +credentials live entirely inside `internal/zoom` (storage + client routing) with no +changes to booking or meeting-mint flows; secrets use the existing envelope encryption. +That said, it is explicitly **not on the maintainers' roadmap**: it is a big chunk of +work that asks the least technical users to do the most technical thing (register a +Zoom Marketplace app each), while LiveKit already covers the need with zero +configuration. If you build it, build it within the bounds above. diff --git a/frontend/src/routes/settings/zoom/+page.svelte b/frontend/src/routes/settings/zoom/+page.svelte index 8a9c4328..7e3cff95 100644 --- a/frontend/src/routes/settings/zoom/+page.svelte +++ b/frontend/src/routes/settings/zoom/+page.svelte @@ -60,7 +60,10 @@ 2
    Choose a General App (User-managed OAuth). You can keep it - unpublished — your own team's Zoom users can still connect. + unpublished — but only Zoom users on the same Zoom account + as the app owner can then connect. Members on other Zoom accounts are refused by Zoom + itself (see docs/ZOOM.md + for the options).
  • @@ -130,6 +133,13 @@

    {redirectURI} +
    + Multi-member limit: only Zoom users on the same Zoom + account as this app's owner can connect an unpublished app — members elsewhere are + refused by Zoom before Calnode is involved. Options: + docs/ZOOM.md + (built-in video needs no Zoom app at all). +
    {/if}
    From 45c3d3d3e3e1784f71c729f81a39487db5d8d465 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Fri, 18 Sep 2026 14:04:08 +1200 Subject: [PATCH 025/250] Use OpenCode Go DeepSeek 4.1 Flash for Pullfrog --- .github/workflows/pullfrog.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pullfrog.yml b/.github/workflows/pullfrog.yml index 92aac378..90c75951 100644 --- a/.github/workflows/pullfrog.yml +++ b/.github/workflows/pullfrog.yml @@ -29,6 +29,7 @@ jobs: uses: pullfrog/pullfrog@v0 with: prompt: ${{ inputs.prompt }} + model: opencode-go/deepseek-v4.1-flash env: # add at least one provider API key ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }} From 4de3d124fbe2fa5a708ddd6f34bea01dada68284 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:28:10 +0200 Subject: [PATCH 026/250] fix(calendar): prefer destination provider for meeting generation --- docs/ARCHITECTURE.md | 2 + internal/calendar/calendar.go | 2 +- .../calendar/destination_provider_test.go | 46 +++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 internal/calendar/destination_provider_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 58defaab..6e5dd274 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -449,6 +449,8 @@ committed booking) — which is why the reconciler (§11) exists. ## 10. Calendar integration (provider abstraction) +The connected-provider lookup prefers the destination connection. A conflict-only connection must not select the provider used when deciding how to generate a meeting link. + Calnode talks to calendars through a **provider abstraction**, not a single vendor: - **`internal/calendar`** defines the `Provider` interface (Name, InvitesGuests, diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index afaade9c..dfec7d8b 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -136,7 +136,7 @@ func (s *Service) providerForDestination(ctx context.Context, userID string) Pro func (s *Service) Connected(ctx context.Context, userID string) (bool, string, error) { var name string err := s.db.QueryRowContext(ctx, - `SELECT provider FROM calendar_connections WHERE user_id = ? LIMIT 1`, userID).Scan(&name) + `SELECT provider FROM calendar_connections WHERE user_id = ? ORDER BY is_destination DESC, created_at ASC LIMIT 1`, userID).Scan(&name) if err == sql.ErrNoRows { return false, "", nil } diff --git a/internal/calendar/destination_provider_test.go b/internal/calendar/destination_provider_test.go new file mode 100644 index 00000000..dd5e726b --- /dev/null +++ b/internal/calendar/destination_provider_test.go @@ -0,0 +1,46 @@ +package calendar + +import ( + "context" + "testing" + + "github.com/calnode/calnode/internal/db" +) + +func TestConnectedPrefersDestinationOverOlderCalDAV(t *testing.T) { + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`INSERT INTO users (id, email, name, iana_timezone, is_admin, created_at) + VALUES ('host', 'host@example.com', 'Host', 'Europe/Amsterdam', 0, '2026-09-20T00:00:00Z')`); err != nil { + t.Fatal(err) + } + for _, provider := range []string{"caldav", "google"} { + destination := 0 + if provider == "google" { + destination = 1 + } + if _, err := database.Exec(`INSERT INTO calendar_connections + (id, user_id, provider, access_token_enc, calendar_id, check_conflicts, is_destination, created_at) + VALUES (?, 'host', ?, 'encrypted', 'primary', 1, ?, '2026-09-20T00:00:00Z')`, provider, provider, destination); err != nil { + t.Fatal(err) + } + } + svc := NewService(database) + connected, provider, err := svc.Connected(context.Background(), "host") + if err != nil || !connected || provider != "google" { + t.Fatalf("connected=%v provider=%q error=%v; want Google destination", connected, provider, err) + } + if err := svc.SetDestination(context.Background(), "host", "caldav", ""); err != nil { + t.Fatal(err) + } + _, provider, err = svc.Connected(context.Background(), "host") + if err != nil || provider != "caldav" { + t.Fatalf("provider=%q error=%v; want changed destination", provider, err) + } +} From 0877f7a6948d1f2f1dfa24bfe61f058f50c3420c Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:33:05 +0200 Subject: [PATCH 027/250] fix(calendar): report incomplete availability checks --- docs/ARCHITECTURE.md | 2 ++ internal/caldav/caldav.go | 6 +----- internal/caldav/freebusy.go | 6 ++---- internal/calendar/calendar.go | 16 +------------- internal/calendar/microsoft/freebusy.go | 7 +----- internal/calendar/microsoft/microsoft.go | 4 +--- internal/gcal/freebusy.go | 20 ++++++++---------- internal/gcal/freebusy_test.go | 27 +++++++++++++++++++----- internal/gcal/gcal.go | 8 +------ 9 files changed, 40 insertions(+), 56 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 58defaab..cc78f654 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -449,6 +449,8 @@ committed booking) — which is why the reconciler (§11) exists. ## 10. Calendar integration (provider abstraction) +Availability checks return an error if any selected conflict calendar cannot be checked. Partial provider responses and unreadable busy periods are not treated as free time. An unavailable calendar can therefore temporarily prevent booking; reconnect it or deselect it from conflict checks to restore availability. + Calnode talks to calendars through a **provider abstraction**, not a single vendor: - **`internal/calendar`** defines the `Provider` interface (Name, InvitesGuests, diff --git a/internal/caldav/caldav.go b/internal/caldav/caldav.go index d37e0cf0..9dabe073 100644 --- a/internal/caldav/caldav.go +++ b/internal/caldav/caldav.go @@ -182,9 +182,6 @@ func (c *Client) loadConn(ctx context.Context, userID string, checkConflicts, is return cn, true, nil } -// conflictConns returns every CalDAV connection for the user with check_conflicts = 1, so a -// user can connect several CalDAV accounts and have them all checked. Decrypt failures on one -// row are logged and skipped (fail-open). func (c *Client) conflictConns(ctx context.Context, userID string) ([]conn, error) { rows, err := c.db.QueryContext(ctx, ` SELECT id, COALESCE(account_email,''), access_token_enc, calendar_id @@ -222,8 +219,7 @@ func (c *Client) conflictConns(ctx context.Context, userID string) ([]conn, erro } pw, err := c.decrypt(d.pwEnc) if err != nil { - c.logger.Warn("caldav: skipping connection with bad credentials", "user_id", userID, "error", err) - continue + return nil, err } for _, calURL := range calIDs { conns = append(conns, conn{id: d.id, username: d.username, password: string(pw), calURL: calURL}) diff --git a/internal/caldav/freebusy.go b/internal/caldav/freebusy.go index 186d1984..d7439b77 100644 --- a/internal/caldav/freebusy.go +++ b/internal/caldav/freebusy.go @@ -32,8 +32,7 @@ const calendarQueryTmpl = ` // FreeBusy returns the union of busy intervals across every CalDAV account the user has // connected with check_conflicts = 1. Each account is queried with a CalDAV calendar-query -// REPORT; transparent and cancelled events don't block. Fail-open per account: a connection -// that errors is logged and skipped (a flaky calendar never blocks availability). +// REPORT; transparent and cancelled events don't block. func (c *Client) FreeBusy(ctx context.Context, userID string, from, to time.Time) ([]slots.Interval, error) { conns, err := c.conflictConns(ctx, userID) if err != nil { @@ -47,8 +46,7 @@ func (c *Client) FreeBusy(ctx context.Context, userID string, from, to time.Time for _, cn := range conns { iv, err := c.freeBusyForConn(ctx, cn, body) if err != nil { - c.logger.Warn("caldav: freebusy connection failed", "user_id", userID, "calendar", cn.calURL, "error", err) - continue + return nil, err } out = append(out, iv...) } diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index afaade9c..09dbf14b 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -348,29 +348,15 @@ func (s *Service) InvitesGuests(ctx context.Context, userID string) bool { return false } -// FreeBusy returns the UNION of busy intervals for the user across EVERY connected provider -// (each provider internally unions its own connected accounts with check_conflicts = 1). This -// is what lets a user connect multiple calendars and have them all checked. Fail-open: a -// provider that errors is skipped; an error is returned only if every provider failed (so a -// flaky calendar never blocks availability or a booking). func (s *Service) FreeBusy(ctx context.Context, userID string, from, to time.Time) ([]slots.Interval, error) { var out []slots.Interval - var firstErr error - anyOK := false for _, p := range s.providers { iv, err := p.FreeBusy(ctx, userID, from, to) if err != nil { - if firstErr == nil { - firstErr = err - } - continue + return nil, err } - anyOK = true out = append(out, iv...) } - if !anyOK && firstErr != nil { - return nil, firstErr - } return out, nil } diff --git a/internal/calendar/microsoft/freebusy.go b/internal/calendar/microsoft/freebusy.go index 14083075..2122ae18 100644 --- a/internal/calendar/microsoft/freebusy.go +++ b/internal/calendar/microsoft/freebusy.go @@ -32,10 +32,6 @@ type calendarViewResp struct { NextLink string `json:"@odata.nextLink"` } -// FreeBusy returns the UNION of busy intervals for userID in [from, to) across every -// connected Microsoft account with check_conflicts = 1 (every event in the window counts as -// busy). Returns (nil, nil) if the user has no such connection. Fail-open: an account that -// errors is logged and skipped. func (c *Client) FreeBusy(ctx context.Context, userID string, from, to time.Time) ([]slots.Interval, error) { conns, err := c.freeBusyConnections(ctx, userID) if err != nil { @@ -45,8 +41,7 @@ func (c *Client) FreeBusy(ctx context.Context, userID string, from, to time.Time for _, fc := range conns { intervals, err := c.freeBusyForConn(ctx, fc, from, to) if err != nil { - c.logger.Warn("microsoft: freebusy for connection failed, skipping", "user_id", userID, "error", err) - continue + return nil, err } out = append(out, intervals...) } diff --git a/internal/calendar/microsoft/microsoft.go b/internal/calendar/microsoft/microsoft.go index 6194e0a2..8005fa7b 100644 --- a/internal/calendar/microsoft/microsoft.go +++ b/internal/calendar/microsoft/microsoft.go @@ -290,7 +290,6 @@ func (c *Client) httpClient(ctx context.Context, userID string, checkConflicts, // freeBusyConnections returns an authorized client for EVERY Microsoft connection the user // has with check_conflicts = 1 (so several connected Microsoft accounts are all checked). -// Bad-credential rows are logged and skipped (fail-open). // msFBConn is one conflict-check account's authorized client plus which calendars to read. // useDefault means query /me/calendarView (the account's default calendar) — the pre-picker // behaviour, used when the user hasn't selected sub-calendars; otherwise calIDs holds the @@ -336,8 +335,7 @@ func (c *Client) freeBusyConnections(ctx context.Context, userID string) ([]msFB } hc, err := c.buildClient(ctx, userID, d.accessEnc, d.refreshEnc, d.calID, d.expiryStr, d.accountEmail) if err != nil { - c.logger.Warn("microsoft: skipping connection with bad credentials", "user_id", userID, "error", err) - continue + return nil, err } // Unconfigured accounts fall back to the stored "primary" placeholder id, which is not a // real Graph calendar id — read the default calendar view for those. diff --git a/internal/gcal/freebusy.go b/internal/gcal/freebusy.go index 4e6a547f..23f0e27e 100644 --- a/internal/gcal/freebusy.go +++ b/internal/gcal/freebusy.go @@ -19,18 +19,14 @@ type freeBusyReq struct { type freeBusyResp struct { Calendars map[string]struct { - Busy []struct { + Errors []json.RawMessage `json:"errors"` + Busy []struct { Start string `json:"start"` End string `json:"end"` } `json:"busy"` } `json:"calendars"` } -// FreeBusy returns the UNION of Google Calendar busy intervals for userID in [from, to) -// across every connected Google account with check_conflicts = 1 (so all of a user's -// connected calendars are honoured, not just one). Returns (nil, nil) if the user has no such -// connection. Fail-open: a single account that errors is logged and skipped, so a flaky -// connection never blocks availability or a booking. func (c *Client) FreeBusy(ctx context.Context, userID string, from, to time.Time) ([]slots.Interval, error) { conns, err := c.freeBusyConnections(ctx, userID) if err != nil { @@ -40,8 +36,7 @@ func (c *Client) FreeBusy(ctx context.Context, userID string, from, to time.Time for _, conn := range conns { intervals, err := c.freeBusyForConn(ctx, conn, from, to) if err != nil { - c.logger.Warn("gcal: freebusy for connection failed, skipping", "user_id", userID, "error", err) - continue + return nil, err } out = append(out, intervals...) } @@ -84,13 +79,16 @@ func (c *Client) freeBusyForConn(ctx context.Context, conn fbConn, from, to time return nil, fmt.Errorf("gcal: freeBusy decode: %w", err) } var out []slots.Interval - for _, cal := range fbr.Calendars { + for _, id := range conn.calIDs { + cal, ok := fbr.Calendars[id] + if !ok || len(cal.Errors) > 0 { + return nil, fmt.Errorf("gcal: calendar busy status unavailable") + } for _, b := range cal.Busy { s, err1 := time.Parse(time.RFC3339, b.Start) e, err2 := time.Parse(time.RFC3339, b.End) if err1 != nil || err2 != nil { - c.logger.Warn("gcal: skipping unparseable busy interval", "start", b.Start, "end", b.End) - continue + return nil, fmt.Errorf("gcal: invalid busy interval") } out = append(out, slots.Interval{Start: s, End: e}) } diff --git a/internal/gcal/freebusy_test.go b/internal/gcal/freebusy_test.go index bc365712..b162b8a3 100644 --- a/internal/gcal/freebusy_test.go +++ b/internal/gcal/freebusy_test.go @@ -138,9 +138,7 @@ func TestFreeBusy_notConnected_returnsNil(t *testing.T) { } } -func TestFreeBusy_nonOK_failsOpen(t *testing.T) { - // A connection returning non-200 is skipped (fail-open), not surfaced as an error — - // a flaky calendar must never block availability or a booking. +func TestFreeBusy_nonOK_rejectsBookingCheck(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.Error(w, "unauthorized", http.StatusUnauthorized) })) @@ -151,8 +149,8 @@ func TestFreeBusy_nonOK_failsOpen(t *testing.T) { saveAndConnectClient(t, c, "user-1", "primary", "bad-token") got, err := c.FreeBusy(context.Background(), "user-1", time.Now(), time.Now().Add(time.Hour)) - if err != nil { - t.Errorf("fail-open: expected nil error, got %v", err) + if err == nil { + t.Error("expected an error from failed calendar check") } if len(got) != 0 { t.Errorf("expected no busy intervals from a failed connection, got %d", len(got)) @@ -179,3 +177,22 @@ func TestFreeBusy_onlyCheckConflictsConnections(t *testing.T) { t.Errorf("got intervals from check_conflicts=0 connection; want nil") } } + +func TestFreeBusy_rejectsIncompleteCalendarResponse(t *testing.T) { + for _, body := range []string{ + `{"calendars":{}}`, + `{"calendars":{"primary":{"errors":[{"reason":"notFound"}],"busy":[]}}}`, + `{"calendars":{"primary":{"busy":[{"start":"invalid","end":"2026-06-15T10:00:00Z"}]}}}`, + } { + t.Run(body, func(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Write([]byte(body)) })) + defer srv.Close() + c := newTestClient(t) + c.apiBase = srv.URL + saveAndConnectClient(t, c, "user-1", "primary", "token") + if _, err := c.FreeBusy(context.Background(), "user-1", time.Now(), time.Now().Add(time.Hour)); err == nil { + t.Fatal("expected calendar check failure") + } + }) + } +} diff --git a/internal/gcal/gcal.go b/internal/gcal/gcal.go index 29b13e0b..5deb5559 100644 --- a/internal/gcal/gcal.go +++ b/internal/gcal/gcal.go @@ -225,11 +225,6 @@ type fbConn struct { calIDs []string } -// freeBusyConnections returns an authorized client for EVERY Google connection the user has -// with check_conflicts = 1 (so a user can connect several Google accounts and have them all -// checked for conflicts), each paired with the set of that account's calendars to check for -// conflicts (per-account sub-calendar selection). Decrypt failures on one row are logged and -// skipped (fail-open); an account whose calendars are all deselected is dropped. func (c *Client) freeBusyConnections(ctx context.Context, userID string) ([]fbConn, error) { rows, err := c.db.QueryContext(ctx, ` SELECT access_token_enc, COALESCE(refresh_token_enc,''), calendar_id, COALESCE(expiry_at,''), COALESCE(account_email,'') @@ -265,8 +260,7 @@ func (c *Client) freeBusyConnections(ctx context.Context, userID string) ([]fbCo } hc, err := c.buildClient(ctx, userID, d.accessEnc, d.refreshEnc, d.calID, d.expiryStr, d.accountEmail) if err != nil { - c.logger.Warn("gcal: skipping connection with bad credentials", "user_id", userID, "error", err) - continue + return nil, fmt.Errorf("gcal: load conflict calendar credentials: %w", err) } conns = append(conns, fbConn{hc: hc, calIDs: calIDs}) } From 0391583c8f9b7a6aeb11c26da7f8a1f5c7810754 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:33:10 +0200 Subject: [PATCH 028/250] fix(booking): check local bookings across a shared calendar --- docs/ARCHITECTURE.md | 2 + internal/booking/service.go | 12 ++++- internal/booking/shared_calendar_test.go | 67 ++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 internal/booking/shared_calendar_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 58defaab..0d0b638e 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -449,6 +449,8 @@ committed booking) — which is why the reconciler (§11) exists. ## 10. Calendar integration (provider abstraction) +Bookings also check pending local bookings owned by other accounts that use the same selected conflict calendar. This check runs inside the booking transaction, before asynchronous calendar creation can finish. Calendar identity currently includes the provider, account email, and calendar ID. + Calnode talks to calendars through a **provider abstraction**, not a single vendor: - **`internal/calendar`** defines the `Provider` interface (Name, InvitesGuests, diff --git a/internal/booking/service.go b/internal/booking/service.go index 665dc1f5..8f4043d0 100644 --- a/internal/booking/service.go +++ b/internal/booking/service.go @@ -285,9 +285,17 @@ func hostBusy(ctx context.Context, tx *sql.Tx, hostID, start, end, excludeBookin err := tx.QueryRowContext(ctx, ` SELECT COUNT(*) FROM bookings b JOIN booking_hosts bh ON bh.booking_id = b.id - WHERE bh.user_id = ? AND b.status != 'cancelled' AND b.id != ? + WHERE (bh.user_id = ? OR EXISTS ( + SELECT 1 FROM connection_calendars checked + JOIN connection_calendars destination + ON destination.provider = checked.provider + AND destination.account_email = checked.account_email + AND destination.calendar_id = checked.calendar_id + WHERE checked.user_id = ? AND checked.check_conflicts = 1 + AND destination.user_id = bh.user_id AND destination.is_destination = 1 + )) AND b.status != 'cancelled' AND b.id != ? AND b.start_at < ? AND b.end_at > ?`, - hostID, excludeBookingID, end, start).Scan(&n) + hostID, hostID, excludeBookingID, end, start).Scan(&n) return n > 0, err } diff --git a/internal/booking/shared_calendar_test.go b/internal/booking/shared_calendar_test.go new file mode 100644 index 00000000..5fd12c06 --- /dev/null +++ b/internal/booking/shared_calendar_test.go @@ -0,0 +1,67 @@ +package booking_test + +import ( + "context" + "errors" + "sync" + "testing" + + "github.com/calnode/calnode/internal/booking" +) + +func TestSharedCalendarAtomicConflict(t *testing.T) { + database := newTestDB(t) + svc := booking.New(database) + hosts := []string{seedHost(t, database), seedHost(t, database)} + events := []string{seedEventType(t, database, hosts[0]), seedEventType(t, database, hosts[1])} + for _, host := range hosts { + _, err := database.Exec(`INSERT INTO connection_calendars (id,user_id,provider,account_email,calendar_id,check_conflicts,is_destination) VALUES (?,?,'google','shared@example.com','primary',1,1)`, host, host) + if err != nil { + t.Fatal(err) + } + } + start := make(chan struct{}) + results := make(chan error, 2) + ids := make(chan string, 2) + var wg sync.WaitGroup + for i := range hosts { + wg.Add(1) + go func(i int) { + defer wg.Done() + <-start + b, err := svc.Create(context.Background(), booking.CreateParams{EventTypeID: events[i], HostIDs: []string{hosts[i]}, StartAt: slot(9, 0), EndAt: slot(9, 30), Organizer: booking.Attendee{Name: "Test", Email: "test@example.com", IANATimezone: "UTC"}}) + results <- err + if b != nil { + ids <- b.ID + } + }(i) + } + close(start) + wg.Wait() + close(results) + successes, conflicts := 0, 0 + for err := range results { + if err == nil { + successes++ + } else if errors.Is(err, booking.ErrDoubleBooked) { + conflicts++ + } else { + t.Fatal(err) + } + } + if successes != 1 || conflicts != 1 { + t.Fatalf("successes=%d conflicts=%d", successes, conflicts) + } + if err := svc.CancelByID(context.Background(), <-ids, "test cleanup"); err != nil { + t.Fatal(err) + } + for i := range hosts { + b, err := svc.Create(context.Background(), booking.CreateParams{EventTypeID: events[i], HostIDs: []string{hosts[i]}, StartAt: slot(9, 0), EndAt: slot(9, 30), Organizer: booking.Attendee{Name: "Test", Email: "test@example.com", IANATimezone: "UTC"}}) + if err != nil { + t.Fatal(err) + } + if err := svc.CancelByID(context.Background(), b.ID, "test cleanup"); err != nil { + t.Fatal(err) + } + } +} From 93ddf1b42c1343664b177b738be2ed81bfefdfa0 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:33:14 +0200 Subject: [PATCH 029/250] feat(mailer): support a separate TCP relay address --- DEPLOY.md | 4 +++ internal/mailer/smtp.go | 15 ++++++++- internal/mailer/smtp_relay_test.go | 52 ++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 internal/mailer/smtp_relay_test.go diff --git a/DEPLOY.md b/DEPLOY.md index d16e3fba..f18a4746 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -354,3 +354,7 @@ first event type + availability. | Email `550 domain not verified` | From address domain isn't verified with your email provider. | | Logo broken in email when testing locally | Gmail's image proxy can't reach `localhost` — only loads from a public URL. | | Litestream `InvalidAccessKeyId` / 403, log shows `endpoint=""` | `LITESTREAM_ENDPOINT` unset (or the running build predates the endpoint/region config) → Litestream defaults to AWS. Set the **account** endpoint (no bucket) + `region=auto` for R2, and redeploy so the config is live. | + +### SMTP through a TCP relay + +Set `EMAIL_SMTP_CONNECT_HOST` and `EMAIL_SMTP_CONNECT_PORT` to dial a TCP relay instead of the configured SMTP address. Each unset value falls back to the SMTP host or port. The original SMTP host remains the TLS server name and authentication identity; certificate verification stays enabled. These overrides apply to both environment and database SMTP settings. The relay must forward the SMTP connection without terminating TLS. diff --git a/internal/mailer/smtp.go b/internal/mailer/smtp.go index 26a478b2..34350dc0 100644 --- a/internal/mailer/smtp.go +++ b/internal/mailer/smtp.go @@ -11,6 +11,7 @@ import ( "net" "net/mail" "net/smtp" + "os" "strings" "time" @@ -35,6 +36,8 @@ var defaultSMTPTimeout = 30 * time.Second // SMTP sends email via an SMTP server. type SMTP struct { + connectHost string + connectPort string host string port string username string @@ -49,7 +52,17 @@ type SMTP struct { // startTLS selects port-587 STARTTLS mode. Both false means plain SMTP // (suitable for a local relay on port 25). func NewSMTP(host, port, username, password string, implicitTLS, startTLS bool, from, fromName string) *SMTP { + connectHost := os.Getenv("EMAIL_SMTP_CONNECT_HOST") + if connectHost == "" { + connectHost = host + } + connectPort := os.Getenv("EMAIL_SMTP_CONNECT_PORT") + if connectPort == "" { + connectPort = port + } return &SMTP{ + connectHost: connectHost, + connectPort: connectPort, host: host, port: port, username: username, @@ -81,7 +94,7 @@ func newDialers(deadline time.Time, host string) (net.Dialer, tls.Dialer) { } func (s *SMTP) Send(ctx context.Context, msg Message) error { - addr := net.JoinHostPort(s.host, s.port) + addr := net.JoinHostPort(s.connectHost, s.connectPort) raw := s.buildRaw(msg) // Bounds the whole conversation, not just the dial (see defaultSMTPTimeout). diff --git a/internal/mailer/smtp_relay_test.go b/internal/mailer/smtp_relay_test.go new file mode 100644 index 00000000..99841a92 --- /dev/null +++ b/internal/mailer/smtp_relay_test.go @@ -0,0 +1,52 @@ +package mailer + +import ( + "context" + "crypto/tls" + "errors" + "net" + "testing" + "time" +) + +func TestSMTPRelayPreservesTLSIdentity(t *testing.T) { + listener, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + defer listener.Close() + host, port, err := net.SplitHostPort(listener.Addr().String()) + if err != nil { + t.Fatal(err) + } + t.Setenv("EMAIL_SMTP_CONNECT_HOST", host) + t.Setenv("EMAIL_SMTP_CONNECT_PORT", port) + names := make(chan string, 1) + go func() { + conn, err := listener.Accept() + if err != nil { + return + } + defer conn.Close() + conn.SetDeadline(time.Now().Add(3 * time.Second)) + server := tls.Server(conn, &tls.Config{GetConfigForClient: func(hello *tls.ClientHelloInfo) (*tls.Config, error) { + names <- hello.ServerName + return nil, errors.New("test rejects TLS handshake") + }}) + _ = server.Handshake() + }() + sender := NewSMTP("smtp.example.com", "465", "", "", true, false, "from@example.com", "Test") + ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second) + defer cancel() + if err := sender.Send(ctx, Message{To: []string{"to@example.com"}, Subject: "test"}); err == nil { + t.Fatal("accepted a rejected TLS handshake") + } + select { + case name := <-names: + if name != "smtp.example.com" { + t.Fatalf("TLS server name = %q", name) + } + case <-ctx.Done(): + t.Fatal("did not connect to relay") + } +} From 3bb9e1786f5ab4723d57b08541ee0ad5a0f35275 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:37:09 +0200 Subject: [PATCH 030/250] fix(booking): recheck external calendars before creating a booking --- docs/ARCHITECTURE.md | 2 + internal/handler/booking_calendar_check.go | 68 +++++++++++++++++++ .../handler/booking_calendar_check_test.go | 58 ++++++++++++++++ internal/handler/booking_handler.go | 10 +++ 4 files changed, 138 insertions(+) create mode 100644 internal/handler/booking_calendar_check.go create mode 100644 internal/handler/booking_calendar_check_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 58defaab..c88f5508 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -377,6 +377,8 @@ them - the most common "why can't I see those times". ## 9. Booking lifecycle +New public and assistant bookings recheck selected external calendars before committing. This includes the event buffers and each required host; round-robin routing filters busy candidates and busy optional guests are omitted. A failed provider check rejects the request. The external check and database write cannot share a transaction. Rescheduling still uses the existing validation path. + `internal/booking/service.go` (transactions) + `internal/handler/booking_handler.go` (HTTP + async side effects). diff --git a/internal/handler/booking_calendar_check.go b/internal/handler/booking_calendar_check.go new file mode 100644 index 00000000..7f4e4089 --- /dev/null +++ b/internal/handler/booking_calendar_check.go @@ -0,0 +1,68 @@ +package handler + +import ( + "context" + "time" +) + +func (h *Handler) calendarFreeHosts(ctx context.Context, et *bookableEventType, candidates, required, optional []string, start, end time.Time) ([]string, []string, error) { + gc := h.getCal() + if gc == nil { + return candidates, optional, nil + } + ctx, cancel := context.WithTimeout(ctx, 15*time.Second) + defer cancel() + free := map[string]bool{} + check := func(id string) (bool, error) { + if ok, seen := free[id]; seen { + return ok, nil + } + busy, err := gc.FreeBusy(ctx, id, start.Add(-time.Duration(et.BufferBeforeMinutes)*time.Minute), end.Add(time.Duration(et.BufferAfterMinutes)*time.Minute)) + if err != nil { + return false, err + } + for _, iv := range busy { + if iv.Start.Before(end.Add(time.Duration(et.BufferAfterMinutes)*time.Minute)) && iv.End.After(start.Add(-time.Duration(et.BufferBeforeMinutes)*time.Minute)) { + free[id] = false + return false, nil + } + } + free[id] = true + return true, nil + } + for _, id := range required { + ok, err := check(id) + if err != nil { + return nil, nil, err + } + if !ok { + return nil, nil, errSlotUnavailable + } + } + available := make([]string, 0, len(candidates)) + for _, id := range candidates { + ok, err := check(id) + if err != nil { + return nil, nil, err + } + if ok { + available = append(available, id) + } else if et.RoutingMode != "round_robin" { + return nil, nil, errSlotUnavailable + } + } + if len(available) == 0 { + return nil, nil, errSlotUnavailable + } + guests := make([]string, 0, len(optional)) + for _, id := range optional { + ok, err := check(id) + if err != nil { + return nil, nil, err + } + if ok { + guests = append(guests, id) + } + } + return available, guests, nil +} diff --git a/internal/handler/booking_calendar_check_test.go b/internal/handler/booking_calendar_check_test.go new file mode 100644 index 00000000..7d39f373 --- /dev/null +++ b/internal/handler/booking_calendar_check_test.go @@ -0,0 +1,58 @@ +package handler_test + +import ( + "context" + "errors" + "fmt" + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/slots" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" +) + +type conflictCalendar struct { + calendar.Provider + busy []slots.Interval + err error +} + +func (p conflictCalendar) Name() string { return "google" } +func (p conflictCalendar) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return p.busy, p.err +} + +func TestBookingRejectsExternalCalendarConflicts(t *testing.T) { + start := time.Date(2026, 6, 15, 9, 0, 0, 0, time.UTC) + for _, tc := range []struct { + name string + provider conflictCalendar + }{ + {"busy", conflictCalendar{busy: []slots.Interval{{Start: start, End: start.Add(time.Hour)}}}}, + {"unavailable", conflictCalendar{err: errors.New("provider unavailable")}}, + } { + t.Run(tc.name, func(t *testing.T) { + h, database, key, _ := setupWorkspaceWithDB(t) + slug, _ := seedEventTypeHTTP(t, h, key) + svc := calendar.NewService(database) + svc.Register(tc.provider) + h.SetCalendar(svc) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T09:00:00Z","name":"Test","email":"test@example.com"}`, slug))) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + if rec.Code != http.StatusConflict { + t.Fatalf("status %d: %s", rec.Code, rec.Body) + } + var n int + if err := database.QueryRow(`SELECT COUNT(*) FROM bookings`).Scan(&n); err != nil { + t.Fatal(err) + } + if n != 0 { + t.Fatalf("created %d bookings", n) + } + }) + } +} diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index c695305e..83353c5c 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -510,6 +510,10 @@ func (h *Handler) createBookingForSlug(ctx context.Context, slug string, startAt if err := h.validateBookingTime(ctx, et, et.RoutingMode, candidates, required, startAt.UTC(), endAt); err != nil { return nil, err } + candidates, optional, err = h.calendarFreeHosts(ctx, et, candidates, required, optional, startAt.UTC(), endAt) + if err != nil { + return nil, err + } b, err := h.bookingSvc.Create(ctx, booking.CreateParams{ EventTypeID: et.ID, HostIDs: candidates, @@ -793,6 +797,12 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { return } + candidates, optional, err = h.calendarFreeHosts(r.Context(), et, candidates, required, optional, startAt.UTC(), endAt) + if err != nil { + h.logger.WarnContext(r.Context(), "booking calendar check rejected", "error", err) + h.writeError(w, http.StatusConflict, "this slot is no longer available; please select another time") + return + } b, err := h.bookingSvc.Create(r.Context(), booking.CreateParams{ EventTypeID: et.ID, HostIDs: candidates, From da9db93544da0302628cc53e3376ccd509f0e995 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:37:14 +0200 Subject: [PATCH 031/250] fix(profile): include Europe/Amsterdam in the timezone picker --- frontend/src/lib/prefs.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/lib/prefs.ts b/frontend/src/lib/prefs.ts index 383f0014..1be44414 100644 --- a/frontend/src/lib/prefs.ts +++ b/frontend/src/lib/prefs.ts @@ -74,6 +74,7 @@ export const TIMEZONES = [ 'Europe/London', 'Europe/Paris', 'Europe/Berlin', + 'Europe/Amsterdam', 'America/New_York', 'America/Chicago', 'America/Denver', From 94fe43423aca11fa51dd1a5ed2b0382cad23e1b7 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:44:01 +0200 Subject: [PATCH 032/250] feat(event-types): transfer ownership without changing the booking URL --- docs/ARCHITECTURE.md | 2 + .../routes/event-types/[slug]/+page.svelte | 30 ++++++++ internal/handler/event_type_transfer.go | 70 +++++++++++++++++++ internal/handler/event_type_transfer_test.go | 63 +++++++++++++++++ internal/server/server.go | 1 + 5 files changed, 166 insertions(+) create mode 100644 internal/handler/event_type_transfer.go create mode 100644 internal/handler/event_type_transfer_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 58defaab..455a955d 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -200,6 +200,8 @@ the platform/recovery secret doesn't expose secrets. ## 7. Routing — the host-roles model +An administrator who owns an event can transfer it to an active required host with `POST /v1/event-types/{slug}/transfer`. The request supplies `expected_owner_id` and `new_owner_id`. Upcoming bookings prevent transfer. The event ID, slug, and historical booking hosts are preserved. Event-specific availability rules move to the new owner; global availability and calendar connections do not. + An event type owns a **host list** (`event_type_hosts`): each row = (user, role, priority), role ∈ **required | rotation | optional**. The editor authors these roles through **two plain questions** rather than a mode picker — *who can host?* diff --git a/frontend/src/routes/event-types/[slug]/+page.svelte b/frontend/src/routes/event-types/[slug]/+page.svelte index e905e2ac..fa3ef7a9 100644 --- a/frontend/src/routes/event-types/[slug]/+page.svelte +++ b/frontend/src/routes/event-types/[slug]/+page.svelte @@ -108,6 +108,23 @@ let rotationHosts = $state([]); let togetherHosts = $state([]); let hostsLoaded = $state(false); + let transferOwner = $state(''); + let transferring = $state(false); + let transferHosts = $state([]); + async function transferEvent() { + if (!transferOwner || !$currentUser) return; + transferring = true; + try { + await api.post(`/v1/event-types/${slug}/transfer`, { expected_owner_id: $currentUser.id, new_owner_id: transferOwner }); + toast.success('Event transferred'); + await goto(`${base}/event-types`); + } catch (error) { + toast.error(error instanceof Error ? error.message : 'Could not transfer event'); + } finally { + transferring = false; + } + } + let members = $state([]); let teams = $state([]); @@ -120,6 +137,7 @@ try { const res = await api.get<{ items: EventTypeHost[] }>(`/v1/event-types/${slug}/hosts`); const items = res.items ?? []; + transferHosts = items.filter(h => h.role === 'required' && h.user_id !== $currentUser?.id); const toHost = (h: EventTypeHost): Host => ({ user_id: h.user_id, name: h.name, email: h.email }); rotationHosts = items.filter((h) => h.role === 'rotation').map(toHost); togetherHosts = items @@ -1057,6 +1075,18 @@
    {/if} +{#if activeTab === 'hosts' && $currentUser?.is_admin} +
    + +

    Choose a saved required host. The booking URL stays the same. Transfer is available only when there are no upcoming bookings. Calendar connections and global availability stay with each account.

    + + +
    +{/if} + {#if activeTab === 'questions'} {/if} diff --git a/internal/handler/event_type_transfer.go b/internal/handler/event_type_transfer.go new file mode 100644 index 00000000..8fbcfab9 --- /dev/null +++ b/internal/handler/event_type_transfer.go @@ -0,0 +1,70 @@ +package handler + +import ( + "encoding/json" + "net/http" +) + +func (h *Handler) TransferEventType(w http.ResponseWriter, r *http.Request) { + user, ok := h.requireAdmin(w, r) + if !ok { + return + } + r.Body = http.MaxBytesReader(w, r.Body, 4096) + var body struct { + ExpectedOwnerID string `json:"expected_owner_id"` + NewOwnerID string `json:"new_owner_id"` + } + if err := json.NewDecoder(r.Body).Decode(&body); err != nil || body.ExpectedOwnerID != user.ID || body.NewOwnerID == "" || body.NewOwnerID == user.ID { + h.writeError(w, http.StatusBadRequest, "expected current owner and a different new owner are required") + return + } + tx, err := h.db.BeginTx(r.Context(), nil) + if err != nil { + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + defer tx.Rollback() + var id string + err = tx.QueryRowContext(r.Context(), `SELECT id FROM event_types WHERE slug = ? AND user_id = ? AND archived_at IS NULL`, r.PathValue("slug"), body.ExpectedOwnerID).Scan(&id) + if err != nil { + h.writeError(w, http.StatusConflict, "event ownership changed or event not found") + return + } + var eligible int + err = tx.QueryRowContext(r.Context(), `SELECT COUNT(*) FROM event_type_hosts h JOIN users u ON u.id=h.user_id WHERE h.event_type_id=? AND h.user_id=? AND h.role='required' AND u.archived_at IS NULL`, id, body.NewOwnerID).Scan(&eligible) + if err != nil { + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if eligible != 1 { + h.writeError(w, http.StatusConflict, "new owner must be an active required host") + return + } + var active int + err = tx.QueryRowContext(r.Context(), `SELECT COUNT(*) FROM bookings WHERE event_type_id=? AND status!='cancelled' AND end_at > strftime('%Y-%m-%dT%H:%M:%SZ','now')`, id).Scan(&active) + if err != nil { + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if active > 0 { + h.writeError(w, http.StatusConflict, "transfer requires no upcoming bookings") + return + } + _, err = tx.ExecContext(r.Context(), `UPDATE availability_rules SET user_id=? WHERE event_type_id=? AND user_id=?`, body.NewOwnerID, id, body.ExpectedOwnerID) + if err != nil { + h.writeError(w, http.StatusConflict, "event availability conflicts with new owner rules") + return + } + _, err = tx.ExecContext(r.Context(), `UPDATE event_types SET user_id=? WHERE id=? AND user_id=?`, body.NewOwnerID, id, body.ExpectedOwnerID) + if err != nil { + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if err = tx.Commit(); err != nil { + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + h.logger.InfoContext(r.Context(), "event ownership transferred", "event_type_id", id, "previous_owner", user.ID, "new_owner", body.NewOwnerID) + h.writeJSON(w, http.StatusOK, map[string]any{"id": id, "slug": r.PathValue("slug"), "owner_id": body.NewOwnerID}) +} diff --git a/internal/handler/event_type_transfer_test.go b/internal/handler/event_type_transfer_test.go new file mode 100644 index 00000000..6969bbc7 --- /dev/null +++ b/internal/handler/event_type_transfer_test.go @@ -0,0 +1,63 @@ +package handler_test + +import ( + "fmt" + "net/http" + "net/http/httptest" + "testing" +) + +func TestTransferEventTypePreservesIdentityAndRequiresCurrentOwner(t *testing.T) { + h, database, key, owner := setupWorkspaceWithDB(t) + slug, id := seedEventTypeHTTP(t, h, key) + _, err := database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin) VALUES ('new-owner','new@example.com','New','Europe/Amsterdam',0)`) + if err != nil { + t.Fatal(err) + } + transfer := func() *httptest.ResponseRecorder { + req := authReq(http.MethodPost, "/v1/event-types/"+slug+"/transfer", fmt.Sprintf(`{"expected_owner_id":%q,"new_owner_id":"new-owner"}`, owner), key) + req.SetPathValue("slug", slug) + rec := httptest.NewRecorder() + h.RequireAuth(h.TransferEventType)(rec, req) + return rec + } + if rec := transfer(); rec.Code != http.StatusConflict { + t.Fatalf("unassigned host transfer: %d %s", rec.Code, rec.Body) + } + if rec := putHosts(t, h, slug, key, `{"hosts":[{"user_id":"new-owner","role":"required","priority":0}]}`); rec.Code != http.StatusOK { + t.Fatalf("assign: %d", rec.Code) + } + _, err = database.Exec(`INSERT INTO availability_rules (id,user_id,event_type_id,day_of_week,start_time,end_time) VALUES ('rule',?,?,1,'09:00','20:00')`, owner, id) + if err != nil { + t.Fatal(err) + } + _, err = database.Exec(`INSERT INTO bookings (id,event_type_id,host_id,start_at,end_at,status) VALUES ('upcoming',?,?,'2099-01-01T09:00:00Z','2099-01-01T09:15:00Z','confirmed')`, id, owner) + if err != nil { + t.Fatal(err) + } + if rec := transfer(); rec.Code != http.StatusConflict { + t.Fatalf("upcoming booking: %d", rec.Code) + } + if _, err = database.Exec(`UPDATE bookings SET status='cancelled' WHERE id='upcoming'`); err != nil { + t.Fatal(err) + } + if rec := transfer(); rec.Code != http.StatusOK { + t.Fatalf("transfer: %d %s", rec.Code, rec.Body) + } + var gotID, gotOwner, ruleOwner string + if err := database.QueryRow(`SELECT id,user_id FROM event_types WHERE slug=?`, slug).Scan(&gotID, &gotOwner); err != nil { + t.Fatal(err) + } + if gotID != id || gotOwner != "new-owner" { + t.Fatalf("identity: %s %s", gotID, gotOwner) + } + if err := database.QueryRow(`SELECT user_id FROM availability_rules WHERE id='rule'`).Scan(&ruleOwner); err != nil { + t.Fatal(err) + } + if ruleOwner != "new-owner" { + t.Fatalf("rule owner: %s", ruleOwner) + } + if rec := transfer(); rec.Code != http.StatusConflict { + t.Fatalf("stale transfer: %d", rec.Code) + } +} diff --git a/internal/server/server.go b/internal/server/server.go index 1e530481..d1d11a47 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -394,6 +394,7 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge mux.HandleFunc("PATCH /v1/event-types/{slug}", h.RequireAuth(h.PatchEventType)) mux.HandleFunc("DELETE /v1/event-types/{slug}", h.RequireAuth(h.DeleteEventType)) mux.HandleFunc("POST /v1/event-types/{slug}/duplicate", h.RequireAuth(h.DuplicateEventType)) + mux.HandleFunc("POST /v1/event-types/{slug}/transfer", h.RequireAuth(h.TransferEventType)) mux.HandleFunc("GET /v1/event-types/{slug}/hosts", h.RequireAuth(h.ListEventTypeHosts)) mux.HandleFunc("PUT /v1/event-types/{slug}/hosts", h.RequireAuth(h.SetEventTypeHosts)) testEmailRL := RateLimit(10, time.Minute) From 6419181c1bd9801307437933ec5df149e1f18169 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:44:08 +0200 Subject: [PATCH 033/250] feat(booking): add a per-user booking accent color --- docs/ARCHITECTURE.md | 2 + frontend/src/lib/api.ts | 1 + .../src/routes/settings/profile/+page.svelte | 12 +++- .../db/migrations/00060_booking_accent.sql | 5 ++ internal/handler/book.go | 42 +++++++----- internal/handler/booking_accent.go | 28 ++++++++ .../handler/booking_accent_internal_test.go | 13 ++++ internal/handler/booking_accent_test.go | 22 +++++++ internal/handler/embed.js | 2 + internal/handler/manage_handler.go | 56 ++++++++-------- internal/handler/setup.go | 65 ++++++++++++------- internal/handler/templates/book.html | 2 +- internal/handler/templates/booking.css | 2 + internal/handler/templates/manage.html | 2 +- 14 files changed, 186 insertions(+), 68 deletions(-) create mode 100644 internal/db/migrations/00060_booking_accent.sql create mode 100644 internal/handler/booking_accent.go create mode 100644 internal/handler/booking_accent_internal_test.go create mode 100644 internal/handler/booking_accent_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 58defaab..b3a39f8f 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -713,6 +713,8 @@ as the desired state: ## 15. Frontend toolchain & conventions +Each account can set `booking_accent` in its profile. The default preserves the dark booking controls. Booking pages, management pages, and the embed widget use the event owner's color, with a contrasting text color chosen by luminance. The profile API accepts only six-digit hex colors. + - Svelte 5, SvelteKit 2 (adapter-static SPA), Vite 8 (Rolldown), Tailwind v4 (`@tailwindcss/vite`), shadcn-svelte (nova style) + bits-ui, tailwind-variants 3, **tailwind-merge v3** (must match Tailwind v4 — v2 mis-merges v4 classes; memory diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 89b63a16..9a884435 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -1,4 +1,5 @@ export type User = { + booking_accent: string; id: string; email: string; name: string; diff --git a/frontend/src/routes/settings/profile/+page.svelte b/frontend/src/routes/settings/profile/+page.svelte index 429cde91..e68da97d 100644 --- a/frontend/src/routes/settings/profile/+page.svelte +++ b/frontend/src/routes/settings/profile/+page.svelte @@ -23,6 +23,7 @@ let fileInput = $state(undefined); let name = $state(''); + let booking_accent = $state('#111827'); let timezone = $state('UTC'); let time_format = $state<'12h' | '24h'>('12h'); let week_start = $state(1); @@ -74,6 +75,7 @@ onMount(() => loadingFlag.run(async () => { user = await api.get('/v1/users/me'); name = user.name ?? ''; + booking_accent = user.booking_accent; timezone = user.timezone; time_format = user.time_format ?? '12h'; week_start = user.week_start ?? 1; @@ -122,7 +124,7 @@ async function save() { await savingFlag.run(async () => { const updated = await api.patch('/v1/users/me', { - name, timezone, time_format, week_start, date_format, + name, timezone, time_format, week_start, date_format, booking_accent, }); currentUser.set(updated); prefs.set(prefsFromUser(updated)); @@ -182,6 +184,14 @@ +
    + +
    + + {booking_accent} +
    +

    Used on your booking pages.

    +
    diff --git a/internal/db/migrations/00060_booking_accent.sql b/internal/db/migrations/00060_booking_accent.sql new file mode 100644 index 00000000..7f97e068 --- /dev/null +++ b/internal/db/migrations/00060_booking_accent.sql @@ -0,0 +1,5 @@ +-- +goose Up +ALTER TABLE users ADD COLUMN booking_accent TEXT NOT NULL DEFAULT '#111827'; + +-- +goose Down +ALTER TABLE users DROP COLUMN booking_accent; diff --git a/internal/handler/book.go b/internal/handler/book.go index cb5ef2b1..717cc45c 100644 --- a/internal/handler/book.go +++ b/internal/handler/book.go @@ -44,15 +44,17 @@ type bookQuestion struct { } type bookPageData struct { - Slug string - Name string - Description template.HTML - DurationLabel string - HostName string - HostInitial string - AvatarURL string - Hosts []hostDisplay // faces for the info panel (1 = single, >1 = group stack) - HostsLabel string // "Alex, Sam & 2 others" for the group case + AccentColor string + AccentForeground string + Slug string + Name string + Description template.HTML + DurationLabel string + HostName string + HostInitial string + AvatarURL string + Hosts []hostDisplay // faces for the info panel (1 = single, >1 = group stack) + HostsLabel string // "Alex, Sam & 2 others" for the group case // SoleHostName is the host's name when this event type has exactly one, and "" when // it has several. It is what lets an empty day read "Alex has no available times on // …": a group label ("Alex, Sam & 2 others") in that sentence would need a plural @@ -319,16 +321,17 @@ func (h *Handler) PublicEventType(w http.ResponseWriter, r *http.Request) { hostName, avatarURL, routingMode, currency string durMins, maxDays, minNotice, priceCents int msgGreeting sql.NullString + accentColor string ) err := h.db.QueryRowContext(r.Context(), ` SELECT et.id, et.name, COALESCE(et.description, ''), et.duration_minutes, et.location_type, COALESCE(et.location_value, ''), et.max_future_days, et.min_notice_minutes, et.routing_mode, u.name, COALESCE(u.avatar_url, ''), - et.price_cents, et.currency, et.msg_greeting + et.price_cents, et.currency, et.msg_greeting, u.booking_accent FROM event_types et JOIN users u ON u.id = et.user_id WHERE et.slug = ? AND et.is_active = 1 AND et.is_public = 1`, - slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting) + slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting, &accentColor) if errors.Is(err, sql.ErrNoRows) { h.writeError(w, http.StatusNotFound, "event type not found") return @@ -387,10 +390,12 @@ func (h *Handler) PublicEventType(w http.ResponseWriter, r *http.Request) { // doesn't have to rebuild it from duration_minutes (it used to hardcode " min", // which both skipped translation and disagreed with the pages for >= 60 min). // duration_minutes stays for clients that want the raw number. - "duration_label": durationLabel(durMins, loc), - "location_type": locType, - "location_label": locationLabel(locType, locValue, loc), - "max_future_days": maxDays, + "duration_label": durationLabel(durMins, loc), + "location_type": locType, + "booking_accent": accentColor, + "booking_accent_foreground": accentForeground(accentColor), + "location_label": locationLabel(locType, locValue, loc), + "max_future_days": maxDays, // min_notice_label is the translated minimum-notice duration ("4 hours"), empty // when the event type sets none. The widget needs it here because the /slots call // it makes later carries no language of its own, and min_notice_minutes alone @@ -429,16 +434,17 @@ func (h *Handler) BookPage(w http.ResponseWriter, r *http.Request) { priceCents int currency string msgGreeting sql.NullString + accentColor string ) err := h.db.QueryRowContext(r.Context(), ` SELECT et.id, et.name, COALESCE(et.description, ''), et.duration_minutes, et.location_type, COALESCE(et.location_value, ''), et.max_future_days, et.min_notice_minutes, et.routing_mode, u.name, COALESCE(u.avatar_url, ''), - et.price_cents, et.currency, et.msg_greeting + et.price_cents, et.currency, et.msg_greeting, u.booking_accent FROM event_types et JOIN users u ON u.id = et.user_id WHERE et.slug = ? AND et.is_active = 1 AND et.is_public = 1`, - slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting) + slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting, &accentColor) if errors.Is(err, sql.ErrNoRows) { http.Error(w, "Page not found", http.StatusNotFound) @@ -500,6 +506,8 @@ func (h *Handler) BookPage(w http.ResponseWriter, r *http.Request) { i18nJSON, _ := loc.JSON() data := bookPageData{ + AccentColor: accentColor, + AccentForeground: accentForeground(accentColor), Slug: slug, Name: name, Description: renderMarkdown(description), diff --git a/internal/handler/booking_accent.go b/internal/handler/booking_accent.go new file mode 100644 index 00000000..ad939733 --- /dev/null +++ b/internal/handler/booking_accent.go @@ -0,0 +1,28 @@ +package handler + +import ( + "math" + "strconv" +) + +func accentForeground(color string) string { + if len(color) != 7 { + return "#ffffff" + } + value, err := strconv.ParseUint(color[1:], 16, 32) + if err != nil { + return "#ffffff" + } + linear := func(v uint64) float64 { + c := float64(v) / 255 + if c <= 0.04045 { + return c / 12.92 + } + return math.Pow((c+0.055)/1.055, 2.4) + } + luminance := 0.2126*linear(value>>16) + 0.7152*linear((value>>8)&255) + 0.0722*linear(value&255) + if luminance > 0.179 { + return "#000000" + } + return "#ffffff" +} diff --git a/internal/handler/booking_accent_internal_test.go b/internal/handler/booking_accent_internal_test.go new file mode 100644 index 00000000..9a417bed --- /dev/null +++ b/internal/handler/booking_accent_internal_test.go @@ -0,0 +1,13 @@ +package handler + +import "testing" + +func TestBookingAccentReadableForeground(t *testing.T) { + for _, tc := range []struct{ color, foreground string }{ + {"#111827", "#ffffff"}, {"#ffe500", "#000000"}, {"#ffffff", "#000000"}, {"#000000", "#ffffff"}, {"invalid", "#ffffff"}, + } { + if got := accentForeground(tc.color); got != tc.foreground { + t.Errorf("%s: got %s, want %s", tc.color, got, tc.foreground) + } + } +} diff --git a/internal/handler/booking_accent_test.go b/internal/handler/booking_accent_test.go new file mode 100644 index 00000000..1f212479 --- /dev/null +++ b/internal/handler/booking_accent_test.go @@ -0,0 +1,22 @@ +package handler_test + +import "testing" + +func TestProfileBookingAccent(t *testing.T) { + h, db, key, userID := setupWorkspaceWithDB(t) + for _, body := range []string{`{"booking_accent":"red"}`, `{"booking_accent":"#fff;background:red"}`} { + if rec := patchMe(t, h, body, key); rec.Code != 400 { + t.Fatalf("invalid accent accepted: %s", rec.Body) + } + } + if rec := patchMe(t, h, `{"booking_accent":"#FFE500"}`, key); rec.Code != 200 { + t.Fatal(rec.Body) + } + var accent string + if err := db.QueryRow(`SELECT booking_accent FROM users WHERE id = ?`, userID).Scan(&accent); err != nil { + t.Fatal(err) + } + if accent != "#ffe500" { + t.Fatalf("stored accent %q", accent) + } +} diff --git a/internal/handler/embed.js b/internal/handler/embed.js index f9f1c279..97b9fc49 100644 --- a/internal/handler/embed.js +++ b/internal/handler/embed.js @@ -221,6 +221,8 @@ api('/v1/event-types/' + encodeURIComponent(this.slug) + '/questions'), ]); this.info = r[0]; + this.style.setProperty('--booking-accent', this.info.booking_accent || '#111827'); + this.style.setProperty('--booking-accent-text', this.info.booking_accent_foreground || '#ffffff'); this.locale = this.info.locale || ''; this.i18n = this.info.i18n || {}; this.dow = dowLabels(this.locale); diff --git a/internal/handler/manage_handler.go b/internal/handler/manage_handler.go index 412df064..abd6b5b7 100644 --- a/internal/handler/manage_handler.go +++ b/internal/handler/manage_handler.go @@ -26,13 +26,15 @@ var manageTmpl = template.Must(template.Must(template.New("manage").Funcs(templa }).Parse(sharedPartialsSrc)).Parse(manageTmplSrc)) type managePageData struct { - Token string - BookingID string - EventTypeName string - EventTypeSlug string - HostName string - HostInitial string - AvatarURL string + AccentColor string + AccentForeground string + Token string + BookingID string + EventTypeName string + EventTypeSlug string + HostName string + HostInitial string + AvatarURL string // SoleHostName is the host's name when this booking has exactly one, else "" — see // bookPageData.SoleHostName. HostName can be a group label ("Alex, Sam & 2 others"), // which no "%s has no available times" sentence can use grammatically. @@ -95,13 +97,13 @@ func (h *Handler) ManagePage(w http.ResponseWriter, r *http.Request) { var etName, etSlug, locType, locValue string var durMins, maxDays, minNotice int - var hostName string + var hostName, accentColor string if err := h.db.QueryRowContext(r.Context(), ` SELECT et.name, et.slug, et.duration_minutes, et.max_future_days, et.min_notice_minutes, - et.location_type, COALESCE(et.location_value,''), u.name + et.location_type, COALESCE(et.location_value,''), u.name, u.booking_accent FROM event_types et JOIN users u ON u.id = et.user_id WHERE et.id = ?`, b.EventTypeID). - Scan(&etName, &etSlug, &durMins, &maxDays, &minNotice, &locType, &locValue, &hostName); err != nil { + Scan(&etName, &etSlug, &durMins, &maxDays, &minNotice, &locType, &locValue, &hostName, &accentColor); err != nil { h.logger.ErrorContext(r.Context(), "manage page: load event type", "error", err) http.Error(w, "Internal server error", http.StatusInternalServerError) return @@ -133,22 +135,24 @@ func (h *Handler) ManagePage(w http.ResponseWriter, r *http.Request) { } data := managePageData{ - Token: token, - BookingID: b.ID, - EventTypeName: etName, - EventTypeSlug: etSlug, - HostName: hostName, - HostInitial: hostInitial, - AvatarURL: avatarURL, - SoleHostName: soleHost, - MinNoticeLabel: noticeLabel(minNotice, loc), - DurationLabel: durationLabel(durMins, loc), - LocationLabel: locationLabel(locType, locValue, loc), - MaxFutureDays: maxDays, - DurationMinutes: durMins, - CurrentStartISO: b.StartAt.UTC().Format(time.RFC3339), - OrganizerTZ: orgTZ, - Status: b.Status, + AccentColor: accentColor, + AccentForeground: accentForeground(accentColor), + Token: token, + BookingID: b.ID, + EventTypeName: etName, + EventTypeSlug: etSlug, + HostName: hostName, + HostInitial: hostInitial, + AvatarURL: avatarURL, + SoleHostName: soleHost, + MinNoticeLabel: noticeLabel(minNotice, loc), + DurationLabel: durationLabel(durMins, loc), + LocationLabel: locationLabel(locType, locValue, loc), + MaxFutureDays: maxDays, + DurationMinutes: durMins, + CurrentStartISO: b.StartAt.UTC().Format(time.RFC3339), + OrganizerTZ: orgTZ, + Status: b.Status, } h.renderManage(w, r, data, loc) } diff --git a/internal/handler/setup.go b/internal/handler/setup.go index ba99c9da..5ad79de7 100644 --- a/internal/handler/setup.go +++ b/internal/handler/setup.go @@ -5,6 +5,7 @@ import ( "encoding/hex" "encoding/json" "net/http" + "regexp" "strings" "time" @@ -104,17 +105,23 @@ func (h *Handler) Setup(w http.ResponseWriter, r *http.Request) { // GetMe handles GET /v1/users/me. func (h *Handler) GetMe(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) + var accent string + if err := h.db.QueryRowContext(r.Context(), `SELECT booking_accent FROM users WHERE id = ?`, user.ID).Scan(&accent); err != nil { + h.writeError(w, http.StatusInternalServerError, "could not load profile") + return + } out := map[string]any{ - "id": user.ID, - "email": user.Email, - "name": user.Name, - "timezone": user.IANATZ, - "time_format": user.TimeFormat, - "week_start": user.WeekStart, - "date_format": user.DateFormat, - "is_admin": user.IsAdmin, - "is_owner": user.IsOwner, - "role": user.Role(), + "booking_accent": accent, + "id": user.ID, + "email": user.Email, + "name": user.Name, + "timezone": user.IANATZ, + "time_format": user.TimeFormat, + "week_start": user.WeekStart, + "date_format": user.DateFormat, + "is_admin": user.IsAdmin, + "is_owner": user.IsOwner, + "role": user.Role(), // Notification preferences "notify_confirmation": user.NotifyConfirmation, "notify_cancellation": user.NotifyCancellation, @@ -137,6 +144,7 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { var req struct { Name *string `json:"name"` + BookingAccent *string `json:"booking_accent"` Timezone *string `json:"timezone"` TimeFormat *string `json:"time_format"` WeekStart *int `json:"week_start"` @@ -154,6 +162,18 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { return } + var accent string + if err := h.db.QueryRowContext(r.Context(), `SELECT booking_accent FROM users WHERE id = ?`, user.ID).Scan(&accent); err != nil { + h.writeError(w, http.StatusInternalServerError, "could not load profile") + return + } + if req.BookingAccent != nil { + if !regexp.MustCompile(`^#[0-9a-fA-F]{6}$`).MatchString(*req.BookingAccent) { + h.writeError(w, http.StatusBadRequest, "booking_accent must be a six-digit hex color") + return + } + accent = strings.ToLower(*req.BookingAccent) + } current := struct { Name string Timezone string @@ -246,11 +266,11 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { if _, err := h.db.ExecContext(r.Context(), ` UPDATE users SET - name = ?, iana_timezone = ?, time_format = ?, week_start = ?, date_format = ?, + booking_accent = ?, name = ?, iana_timezone = ?, time_format = ?, week_start = ?, date_format = ?, notify_confirmation = ?, notify_cancellation = ?, notify_reschedule = ?, notify_reminder = ?, notify_host_booking = ?, notify_host_cancel = ?, notify_host_reschedule = ? WHERE id = ?`, - current.Name, current.Timezone, current.TimeFormat, current.WeekStart, current.DateFormat, + accent, current.Name, current.Timezone, current.TimeFormat, current.WeekStart, current.DateFormat, boolToInt(current.NotifyConfirmation), boolToInt(current.NotifyCancellation), boolToInt(current.NotifyReschedule), boolToInt(current.NotifyReminder), boolToInt(current.NotifyHostBooking), boolToInt(current.NotifyHostCancel), @@ -262,16 +282,17 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { } out := map[string]any{ - "id": user.ID, - "email": user.Email, - "name": current.Name, - "timezone": current.Timezone, - "time_format": current.TimeFormat, - "week_start": current.WeekStart, - "date_format": current.DateFormat, - "is_admin": user.IsAdmin, - "is_owner": user.IsOwner, - "role": user.Role(), + "booking_accent": accent, + "id": user.ID, + "email": user.Email, + "name": current.Name, + "timezone": current.Timezone, + "time_format": current.TimeFormat, + "week_start": current.WeekStart, + "date_format": current.DateFormat, + "is_admin": user.IsAdmin, + "is_owner": user.IsOwner, + "role": user.Role(), // Notification preferences "notify_confirmation": current.NotifyConfirmation, "notify_cancellation": current.NotifyCancellation, diff --git a/internal/handler/templates/book.html b/internal/handler/templates/book.html index 4145bedb..b481b327 100644 --- a/internal/handler/templates/book.html +++ b/internal/handler/templates/book.html @@ -78,7 +78,7 @@ } - + {{template "demoBanner" .}} {{/* GTM
    + {#if isOnlineMeeting(form.location_type)} + + {/if}

    Location

    diff --git a/internal/booking/booking.go b/internal/booking/booking.go index 84131af4..1ac2aa45 100644 --- a/internal/booking/booking.go +++ b/internal/booking/booking.go @@ -23,6 +23,7 @@ type Booking struct { Status string CancellationReason string LocationValue string + LocationType string CreatedAt time.Time UpdatedAt time.Time PaymentStatus string // none | pending | paid | refunded @@ -71,6 +72,7 @@ type CreateParams struct { StartAt time.Time EndAt time.Time LocationValue string + LocationType string Organizer Attendee Answers []Answer // MaxActivePerInvitee caps how many active (upcoming, non-cancelled) bookings diff --git a/internal/booking/service.go b/internal/booking/service.go index 665dc1f5..56ba6187 100644 --- a/internal/booking/service.go +++ b/internal/booking/service.go @@ -138,9 +138,9 @@ func (s *Service) Create(ctx context.Context, p CreateParams) (*Booking, error) _, err = tx.ExecContext(ctx, ` INSERT INTO bookings - (id, event_type_id, host_id, start_at, end_at, status, location_value, created_at, updated_at) - VALUES (?, ?, ?, ?, ?, 'confirmed', ?, ?, ?)`, - bookingID, p.EventTypeID, chosenHost, startStr, endStr, p.LocationValue, now, now) + (id, event_type_id, host_id, start_at, end_at, status, location_value, location_type, created_at, updated_at) + VALUES (?, ?, ?, ?, ?, 'confirmed', ?, ?, ?, ?)`, + bookingID, p.EventTypeID, chosenHost, startStr, endStr, p.LocationValue, p.LocationType, now, now) if err != nil { if db.IsUniqueViolation(err) { return nil, ErrDoubleBooked @@ -201,6 +201,7 @@ func (s *Service) Create(ctx context.Context, p CreateParams) (*Booking, error) EndAt: p.EndAt.UTC(), Status: "confirmed", LocationValue: p.LocationValue, + LocationType: p.LocationType, CreatedAt: nowT, UpdatedAt: nowT, }, nil @@ -271,7 +272,7 @@ func (s *Service) CancelByID(ctx context.Context, id, reason string) error { const bookingColumns = `id, event_type_id, host_id, start_at, end_at, status, COALESCE(cancellation_reason, ''), COALESCE(location_value, ''), created_at, updated_at, - payment_status, amount_paid_cents, amount_paid_currency` + payment_status, amount_paid_cents, amount_paid_currency, location_type` // hostBusy reports whether hostID has any non-cancelled booking overlapping // [start, end) — the double-booking invariant every write path (Create, Reschedule, @@ -628,7 +629,7 @@ func scanBooking(s scanner) (*Booking, error) { &startStr, &endStr, &b.Status, &b.CancellationReason, &b.LocationValue, &createdStr, &updatedStr, - &b.PaymentStatus, &b.AmountPaidCents, &b.AmountPaidCurrency, + &b.PaymentStatus, &b.AmountPaidCents, &b.AmountPaidCurrency, &b.LocationType, ) if err == sql.ErrNoRows { return nil, ErrNotFound diff --git a/internal/db/migrations/00061_telephone_booking_choice.sql b/internal/db/migrations/00061_telephone_booking_choice.sql new file mode 100644 index 00000000..4fc2dc77 --- /dev/null +++ b/internal/db/migrations/00061_telephone_booking_choice.sql @@ -0,0 +1,7 @@ +-- +goose Up +ALTER TABLE event_types ADD COLUMN allow_phone_call INTEGER NOT NULL DEFAULT 0; +ALTER TABLE bookings ADD COLUMN location_type TEXT NOT NULL DEFAULT ''; + +-- +goose Down +ALTER TABLE bookings DROP COLUMN location_type; +ALTER TABLE event_types DROP COLUMN allow_phone_call; diff --git a/internal/handler/book.go b/internal/handler/book.go index cb5ef2b1..aa7802f8 100644 --- a/internal/handler/book.go +++ b/internal/handler/book.go @@ -44,6 +44,7 @@ type bookQuestion struct { } type bookPageData struct { + PhoneChoice bool Slug string Name string Description template.HTML @@ -319,16 +320,17 @@ func (h *Handler) PublicEventType(w http.ResponseWriter, r *http.Request) { hostName, avatarURL, routingMode, currency string durMins, maxDays, minNotice, priceCents int msgGreeting sql.NullString + allowPhoneCall bool ) err := h.db.QueryRowContext(r.Context(), ` SELECT et.id, et.name, COALESCE(et.description, ''), et.duration_minutes, et.location_type, COALESCE(et.location_value, ''), et.max_future_days, et.min_notice_minutes, et.routing_mode, u.name, COALESCE(u.avatar_url, ''), - et.price_cents, et.currency, et.msg_greeting + et.price_cents, et.currency, et.msg_greeting, et.allow_phone_call FROM event_types et JOIN users u ON u.id = et.user_id WHERE et.slug = ? AND et.is_active = 1 AND et.is_public = 1`, - slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting) + slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting, &allowPhoneCall) if errors.Is(err, sql.ErrNoRows) { h.writeError(w, http.StatusNotFound, "event type not found") return @@ -387,10 +389,11 @@ func (h *Handler) PublicEventType(w http.ResponseWriter, r *http.Request) { // doesn't have to rebuild it from duration_minutes (it used to hardcode " min", // which both skipped translation and disagreed with the pages for >= 60 min). // duration_minutes stays for clients that want the raw number. - "duration_label": durationLabel(durMins, loc), - "location_type": locType, - "location_label": locationLabel(locType, locValue, loc), - "max_future_days": maxDays, + "duration_label": durationLabel(durMins, loc), + "location_type": locType, + "allow_phone_call": allowPhoneCall && onlineMeetingLocation(locType), + "location_label": locationLabel(locType, locValue, loc), + "max_future_days": maxDays, // min_notice_label is the translated minimum-notice duration ("4 hours"), empty // when the event type sets none. The widget needs it here because the /slots call // it makes later carries no language of its own, and min_notice_minutes alone @@ -415,30 +418,31 @@ func (h *Handler) BookPage(w http.ResponseWriter, r *http.Request) { slug := r.PathValue("slug") var ( - etID string - name string - description string - durMins int - locType string - locValue string - maxDays int - minNotice int - hostName string - avatarURL string - routingMode string - priceCents int - currency string - msgGreeting sql.NullString + etID string + name string + description string + durMins int + locType string + locValue string + maxDays int + minNotice int + hostName string + avatarURL string + routingMode string + priceCents int + currency string + msgGreeting sql.NullString + allowPhoneCall bool ) err := h.db.QueryRowContext(r.Context(), ` SELECT et.id, et.name, COALESCE(et.description, ''), et.duration_minutes, et.location_type, COALESCE(et.location_value, ''), et.max_future_days, et.min_notice_minutes, et.routing_mode, u.name, COALESCE(u.avatar_url, ''), - et.price_cents, et.currency, et.msg_greeting + et.price_cents, et.currency, et.msg_greeting, et.allow_phone_call FROM event_types et JOIN users u ON u.id = et.user_id WHERE et.slug = ? AND et.is_active = 1 AND et.is_public = 1`, - slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting) + slug).Scan(&etID, &name, &description, &durMins, &locType, &locValue, &maxDays, &minNotice, &routingMode, &hostName, &avatarURL, &priceCents, ¤cy, &msgGreeting, &allowPhoneCall) if errors.Is(err, sql.ErrNoRows) { http.Error(w, "Page not found", http.StatusNotFound) @@ -500,6 +504,7 @@ func (h *Handler) BookPage(w http.ResponseWriter, r *http.Request) { i18nJSON, _ := loc.JSON() data := bookPageData{ + PhoneChoice: allowPhoneCall && onlineMeetingLocation(locType), Slug: slug, Name: name, Description: renderMarkdown(description), diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index c695305e..478046b7 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -424,6 +424,7 @@ var errPaymentRequired = errors.New("this event requires payment; please book on // the direct booking page (book.go) always had. A future caller now gets both is_active // and is_public enforced by construction, not by remembering to add the check. type bookableEventType struct { + AllowPhoneCall bool ID string UserID string Name string @@ -456,12 +457,12 @@ func (h *Handler) loadBookableEventType(ctx context.Context, slug string) (*book var isActive, isPublic, showTaken int err := h.db.QueryRowContext(ctx, ` SELECT id, user_id, name, duration_minutes, slot_interval_minutes, - location_type, location_value, routing_mode, rr_strategy, + location_type, location_value, allow_phone_call, routing_mode, rr_strategy, buffer_before_minutes, buffer_after_minutes, min_notice_minutes, max_future_days, is_active, is_public, show_taken_slots, max_active_bookings, price_cents, currency FROM event_types WHERE slug = ?`, slug). Scan(&et.ID, &et.UserID, &et.Name, &et.DurationMinutes, &et.SlotIntervalMinutes, - &et.LocationType, &et.LocationValue, &et.RoutingMode, &et.RRStrategy, + &et.LocationType, &et.LocationValue, &et.AllowPhoneCall, &et.RoutingMode, &et.RRStrategy, &et.BufferBeforeMinutes, &et.BufferAfterMinutes, &et.MinNoticeMinutes, &et.MaxFutureDays, &isActive, &isPublic, &showTaken, &et.MaxActiveBookings, &et.PriceCents, &et.Currency) if err != nil || isActive == 0 || isPublic == 0 { @@ -520,6 +521,7 @@ func (h *Handler) createBookingForSlug(ctx context.Context, slug string, startAt StartAt: startAt.UTC(), EndAt: endAt, LocationValue: locValue, + LocationType: et.LocationType, Organizer: organizer, Answers: answers, MaxActivePerInvitee: et.MaxActiveBookings, @@ -555,6 +557,7 @@ type bookingJSON struct { Status string `json:"status"` CancellationReason string `json:"cancellation_reason,omitempty"` LocationValue string `json:"location_value,omitempty"` + LocationType string `json:"location_type,omitempty"` CreatedAt string `json:"created_at"` UpdatedAt string `json:"updated_at"` PaymentStatus string `json:"payment_status,omitempty" jsonschema:"payment state for paid event types: paid, refunded, or pending; absent for free bookings"` @@ -581,6 +584,7 @@ func toBookingJSON(b *booking.Booking) bookingJSON { Status: b.Status, CancellationReason: b.CancellationReason, LocationValue: b.LocationValue, + LocationType: b.LocationType, CreatedAt: b.CreatedAt.UTC().Format(time.RFC3339), UpdatedAt: b.UpdatedAt.UTC().Format(time.RFC3339), } @@ -642,6 +646,7 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { StartAt string `json:"start_at"` Name string `json:"name"` Email string `json:"email"` + Phone string `json:"phone"` Timezone string `json:"timezone"` // Language is the resolved page locale code (e.g. "es") the client already knows — // sent explicitly rather than re-derived from Accept-Language/cookie server-side, @@ -776,6 +781,15 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { // Resolve candidate hosts by routing mode: rotation hosts for round-robin, // required hosts otherwise. Archived hosts are excluded by resolveEventTypeHosts. + req.Phone = strings.TrimSpace(req.Phone) + if req.Phone != "" { + if !et.AllowPhoneCall || !onlineMeetingLocation(et.LocationType) || len(req.Phone) > 40 || !validPhone(req.Phone) { + h.writeError(w, http.StatusBadRequest, "invalid telephone number") + return + } + et.LocationType = "phone" + locValue = "tel:" + req.Phone + } hosts, err := h.resolveEventTypeHosts(r.Context(), et.ID) if err != nil { h.logger.ErrorContext(r.Context(), "create booking: resolve hosts", "error", err) @@ -803,6 +817,7 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { StartAt: startAt.UTC(), EndAt: endAt, LocationValue: locValue, + LocationType: et.LocationType, Organizer: booking.Attendee{ Name: req.Name, Email: req.Email, @@ -958,6 +973,9 @@ func (h *Handler) hostBookingData(ctx context.Context, base mailer.BookingData, // createHostEventsAndNotify), since only the calendar API call itself produces it. func (h *Handler) mintMeetingLink(ctx context.Context, b *booking.Booking, in bookingConfirmationInput, bData *mailer.BookingData, hosts []assignedHost) (meetURL string, autoGenMeet bool, livekitHostURL string) { gc := h.getCal() + if in.LocationType == "phone" { + meetURL = b.LocationValue + } if gc != nil && onlineMeetingLocation(in.LocationType) { if _, primaryProvider, perr := gc.Connected(ctx, primaryHost(hosts).UserID); perr == nil { autoGenMeet = providerMintsPlatform(in.LocationType, primaryProvider) diff --git a/internal/handler/booking_phone_test.go b/internal/handler/booking_phone_test.go new file mode 100644 index 00000000..f6aa11d6 --- /dev/null +++ b/internal/handler/booking_phone_test.go @@ -0,0 +1,104 @@ +package handler_test + +import ( + "context" + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" + + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/slots" +) + +type telephoneCalendar struct { + calendar.Provider + events chan calendar.CreateEventParams +} + +func (p telephoneCalendar) Name() string { return "google" } +func (p telephoneCalendar) InvitesGuests() bool { return true } +func (p telephoneCalendar) HasDestination(context.Context, string) (bool, error) { return true, nil } +func (p telephoneCalendar) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return nil, nil +} +func (p telephoneCalendar) CreateEvent(_ context.Context, _ string, in calendar.CreateEventParams) (string, string, string, error) { + p.events <- in + return "event-id", "", "primary", nil +} + +func TestBookingTelephoneChoice(t *testing.T) { + for _, tc := range []struct { + name, phone, locationType, location string + status int + meet bool + }{ + {"telephone", "+31 6 12345678", "phone", "tel:+31 6 12345678", 201, false}, + {"meet", "", "google_meet", "", 201, true}, + {"invalid", "call me", "", "", 400, false}, + {"disabled", "+31 6 12345678", "", "", 400, false}, + } { + t.Run(tc.name, func(t *testing.T) { + h, db, key, userID := setupWorkspaceWithDB(t) + _, eventID := seedEventTypeHTTP(t, h, key) + if _, err := db.Exec(`UPDATE event_types SET slug = 'studiozoek-kennismaking', location_type = 'google_meet', allow_phone_call = 1 WHERE id = ?`, eventID); err != nil { + t.Fatal(err) + } + if _, err := db.Exec(`INSERT INTO calendar_connections (id,user_id,provider,access_token_enc,calendar_id,is_destination) VALUES ('conn',?,'google','test','primary',1)`, userID); err != nil { + t.Fatal(err) + } + if tc.name == "disabled" { + if _, err := db.Exec(`UPDATE event_types SET allow_phone_call = 0 WHERE id = ?`, eventID); err != nil { + t.Fatal(err) + } + } + p := telephoneCalendar{events: make(chan calendar.CreateEventParams, 1)} + svc := calendar.NewService(db) + svc.Register(p) + h.SetCalendar(svc) + body := fmt.Sprintf(`{"event_type_slug":"studiozoek-kennismaking","start_at":"2026-06-15T09:00:00Z","name":"Test","email":"test@example.com","phone":%q}`, tc.phone) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(body)) + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + if rec.Code != tc.status { + t.Fatalf("status %d: %s", rec.Code, rec.Body) + } + if tc.status != 201 { + var count int + db.QueryRow(`SELECT COUNT(*) FROM bookings`).Scan(&count) + if count != 0 { + t.Fatal("invalid number created a booking") + } + return + } + var response struct { + ID string `json:"id"` + LocationType string `json:"location_type"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &response); err != nil { + t.Fatal(err) + } + if response.LocationType != tc.locationType { + t.Fatalf("response location type %q", response.LocationType) + } + var locType, loc string + if err := db.QueryRow(`SELECT location_type, location_value FROM bookings WHERE id = ?`, response.ID).Scan(&locType, &loc); err != nil { + t.Fatal(err) + } + if locType != tc.locationType || loc != tc.location { + t.Fatalf("stored location %q %q", locType, loc) + } + select { + case event := <-p.events: + if event.AddMeet != tc.meet || event.Location != tc.location { + t.Fatalf("calendar AddMeet=%v location=%q", event.AddMeet, event.Location) + } + case <-time.After(3 * time.Second): + t.Fatal("calendar event was not created") + } + }) + } +} diff --git a/internal/handler/calendar_reconcile.go b/internal/handler/calendar_reconcile.go index 5ff52c11..c215722d 100644 --- a/internal/handler/calendar_reconcile.go +++ b/internal/handler/calendar_reconcile.go @@ -160,7 +160,7 @@ func (h *Handler) reconcileCreations(ctx context.Context, gc *calendar.Service) } var items []missing rows, err := h.db.QueryContext(ctx, ` - SELECT bh.booking_id, bh.user_id, bh.is_primary, et.name, et.location_type, + SELECT bh.booking_id, bh.user_id, bh.is_primary, et.name, COALESCE(NULLIF(b.location_type, ''), et.location_type), COALESCE(b.location_value, ''), COALESCE(o.name, ''), COALESCE(o.email, ''), COALESCE(o.locale, ''), b.start_at, b.end_at FROM booking_hosts bh diff --git a/internal/handler/embed.js b/internal/handler/embed.js index f9f1c279..378213a8 100644 --- a/internal/handler/embed.js +++ b/internal/handler/embed.js @@ -561,6 +561,8 @@ var email = el('input', { type: 'email', required: 'required', autocomplete: 'email', placeholder: t(this.i18n, 'email_placeholder') }); form.appendChild(el('div', { class: 'field' }, [el('label', { text: t(this.i18n, 'name_label') }), name])); form.appendChild(el('div', { class: 'field' }, [el('label', { text: t(this.i18n, 'email_label') }), email])); + var phone = el('input', { type: 'tel', maxlength: '40', autocomplete: 'tel', id: 'phone-call-number' }); + if (this.info.allow_phone_call) form.appendChild(el('div', { class: 'field' }, [el('label', { for: 'phone-call-number', text: t(this.i18n, 'phone_call_number') }), phone])); var qInputs = []; this.questions.forEach(function (q) { var inp, field; @@ -603,7 +605,7 @@ }); fetch(BASE + '/v1/bookings', { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ event_type_slug: self.slug, start_at: slot.start, name: name.value.trim(), email: email.value.trim().toLowerCase(), timezone: TZ, language: self.locale, hp_extra: hp.value, answers: answers }), + body: JSON.stringify({ event_type_slug: self.slug, start_at: slot.start, name: name.value.trim(), email: email.value.trim().toLowerCase(), phone: phone.value.trim(), timezone: TZ, language: self.locale, hp_extra: hp.value, answers: answers }), }).then(function (r) { return r.json().then(function (data) { return { ok: r.ok, status: r.status, data: data }; }); }).then(function (res) { diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index 5c50f9cf..a49413a9 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -19,6 +19,7 @@ const ( ) type eventTypeJSON struct { + AllowPhoneCall bool `json:"allow_phone_call"` ID string `json:"id"` Slug string `json:"slug"` Name string `json:"name"` @@ -87,7 +88,7 @@ func scanEventTypeRow(s rowScanner, trailing ...any) (*eventTypeJSON, error) { dests := []any{ &et.ID, &et.Slug, &et.Name, &desc, &et.DurationMinutes, &et.SlotIntervalMinutes, - &et.LocationType, &locVal, + &et.LocationType, &locVal, &et.AllowPhoneCall, &et.RoutingMode, &et.RRStrategy, &et.BufferBeforeMinutes, &et.BufferAfterMinutes, &et.MinNoticeMinutes, &et.MaxFutureDays, &et.MaxActiveBookings, @@ -146,7 +147,7 @@ func scanEventTypeRow(s rowScanner, trailing ...any) (*eventTypeJSON, error) { const etColumns = `id, slug, name, description, duration_minutes, slot_interval_minutes, - location_type, location_value, + location_type, location_value, allow_phone_call, routing_mode, rr_strategy, buffer_before_minutes, buffer_after_minutes, min_notice_minutes, max_future_days, max_active_bookings, @@ -218,6 +219,7 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { MinNoticeMinutes *int `json:"min_notice_minutes"` MaxFutureDays *int `json:"max_future_days"` MaxActiveBookings *int `json:"max_active_bookings"` + AllowPhoneCall *bool `json:"allow_phone_call"` ShowTakenSlots *bool `json:"show_taken_slots"` } if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -306,13 +308,13 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { _, err = tx.ExecContext(r.Context(), ` INSERT INTO event_types (id, user_id, slug, name, description, duration_minutes, - slot_interval_minutes, location_type, location_value, + slot_interval_minutes, location_type, location_value, allow_phone_call, routing_mode, buffer_before_minutes, buffer_after_minutes, min_notice_minutes, max_future_days, max_active_bookings, show_taken_slots, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, id, user.ID, req.Slug, req.Name, req.Description, - req.DurationMinutes, slotInterval, locType, req.LocationValue, + req.DurationMinutes, slotInterval, locType, req.LocationValue, req.AllowPhoneCall != nil && *req.AllowPhoneCall, routingMode, bufBefore, bufAfter, minNotice, maxFuture, maxActive, showTaken, defaultMsgConfirmation, defaultMsgCancellation, defaultMsgReschedule, defaultMsgReminder) if err != nil { @@ -444,6 +446,7 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { MaxActiveBookings *int `json:"max_active_bookings"` IsActive *bool `json:"is_active"` IsPublic *bool `json:"is_public"` + AllowPhoneCall *bool `json:"allow_phone_call"` ShowTakenSlots *bool `json:"show_taken_slots"` Archived *bool `json:"archived"` MsgConfirmation *string `json:"msg_confirmation"` @@ -589,6 +592,9 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { } set("is_public", v) } + if req.AllowPhoneCall != nil { + set("allow_phone_call", *req.AllowPhoneCall) + } if req.ShowTakenSlots != nil { v := 0 if *req.ShowTakenSlots { diff --git a/internal/handler/event_type_duplicate.go b/internal/handler/event_type_duplicate.go index 3f76702b..e24ed8dd 100644 --- a/internal/handler/event_type_duplicate.go +++ b/internal/handler/event_type_duplicate.go @@ -134,7 +134,7 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { INSERT INTO event_types ( id, user_id, team_id, slug, name, description, duration_minutes, slot_interval_minutes, - location_type, location_value, + location_type, location_value, allow_phone_call, routing_mode, rr_strategy, buffer_before_minutes, buffer_after_minutes, min_notice_minutes, max_future_days, max_active_bookings, seat_limit, @@ -145,7 +145,7 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { SELECT ?, user_id, team_id, ?, name, description, duration_minutes, slot_interval_minutes, - location_type, location_value, + location_type, location_value, allow_phone_call, routing_mode, rr_strategy, buffer_before_minutes, buffer_after_minutes, min_notice_minutes, max_future_days, max_active_bookings, seat_limit, diff --git a/internal/handler/event_type_duplicate_test.go b/internal/handler/event_type_duplicate_test.go index c4485865..ecb7b465 100644 --- a/internal/handler/event_type_duplicate_test.go +++ b/internal/handler/event_type_duplicate_test.go @@ -593,7 +593,7 @@ func TestDuplicateEventType_handlesEveryEventTypeColumn(t *testing.T) { copied := map[string]bool{ "user_id": true, "team_id": true, "name": true, "description": true, "duration_minutes": true, "slot_interval_minutes": true, - "location_type": true, "location_value": true, + "location_type": true, "location_value": true, "allow_phone_call": true, "routing_mode": true, "rr_strategy": true, "buffer_before_minutes": true, "buffer_after_minutes": true, "min_notice_minutes": true, "max_future_days": true, diff --git a/internal/handler/manage_handler.go b/internal/handler/manage_handler.go index 412df064..ff660a3b 100644 --- a/internal/handler/manage_handler.go +++ b/internal/handler/manage_handler.go @@ -107,6 +107,13 @@ func (h *Handler) ManagePage(w http.ResponseWriter, r *http.Request) { return } + if b.LocationType != "" { + locType = b.LocationType + } + if b.LocationValue != "" { + locValue = b.LocationValue + } + // Show the actual assigned host(s) for this booking, not the event-type owner // (round-robin/Group route elsewhere). Falls back to the owner name above if // no booking_hosts rows exist. The avatar uses the primary host. diff --git a/internal/handler/stripe_booking.go b/internal/handler/stripe_booking.go index 06292f7e..764f2875 100644 --- a/internal/handler/stripe_booking.go +++ b/internal/handler/stripe_booking.go @@ -113,7 +113,7 @@ func (h *Handler) confirmPaidBooking(ctx context.Context, bookingID, paymentInte // Reconstruct the confirmation context from the booking's event type + organizer. var in bookingConfirmationInput if err := h.db.QueryRowContext(ctx, ` - SELECT et.name, et.slug, et.location_type, a.name, a.email, a.iana_timezone, a.locale + SELECT et.name, et.slug, COALESCE(NULLIF(b.location_type, ''), et.location_type), a.name, a.email, a.iana_timezone, a.locale FROM bookings b JOIN event_types et ON et.id = b.event_type_id JOIN booking_attendees a ON a.booking_id = b.id AND a.is_organizer = 1 diff --git a/internal/handler/templates/book.html b/internal/handler/templates/book.html index 4145bedb..49cecac2 100644 --- a/internal/handler/templates/book.html +++ b/internal/handler/templates/book.html @@ -209,6 +209,12 @@

    {{.Name}}

    .ID is the event type's own intake-question primary key (admin-configured, not attacker-controlled at booking time), and Go's html/template context-aware-escapes every {{.ID}} below regardless — there is no raw/unescaped output here. */}} + {{if .PhoneChoice}} +
    + + +
    + {{end}} {{range .Questions}}
    {{if eq .QType "checkbox"}} @@ -682,6 +688,7 @@

    {{call .T "booking_confirmed"}}

    start_at: pickedSlot.start, name: form.name.value.trim(), email: form.email.value.trim(), + phone: form.elements.phone?.value.trim() || "", timezone: TZ, language: LOCALE, hp_extra: form.hp_extra.value, @@ -739,6 +746,7 @@

    {{call .T "booking_confirmed"}}

    host_name: (booked && Array.isArray(booked.hosts)) ? booked.hosts.map(function (h) { return h.name; }).join(', ') : '', attendee_name: form.name.value.trim(), attendee_email: form.email.value.trim(), + phone: form.elements.phone?.value.trim() || "", attendee_timezone: TZ, answers: dlAnswers, is_paid: false, diff --git a/internal/i18n/locales/de.json b/internal/i18n/locales/de.json index 0252c927..bd1847bb 100644 --- a/internal/i18n/locales/de.json +++ b/internal/i18n/locales/de.json @@ -156,5 +156,6 @@ "assistant_iteration_cap": "Machen wir es einfach: Bitte wählen Sie einen Termin im Kalender unten.", "assistant_status_slots": "Verfügbarkeit wird geprüft…", "assistant_status_book": "Wird gebucht…", - "assistant_status_working": "Wird bearbeitet…" + "assistant_status_working": "Wird bearbeitet…", + "phone_call_number": "Telefonnummer (optional, für einen Anruf)" } diff --git a/internal/i18n/locales/en.json b/internal/i18n/locales/en.json index 4b6a6399..167c10e5 100644 --- a/internal/i18n/locales/en.json +++ b/internal/i18n/locales/en.json @@ -163,5 +163,6 @@ "assistant_iteration_cap": "Let's keep it simple — please pick a time from the calendar below.", "assistant_status_slots": "Checking availability…", "assistant_status_book": "Booking…", - "assistant_status_working": "Working…" + "assistant_status_working": "Working…", + "phone_call_number": "Phone number (optional, for a phone call)" } diff --git a/internal/i18n/locales/es.json b/internal/i18n/locales/es.json index e7dc5d01..bd675f0e 100644 --- a/internal/i18n/locales/es.json +++ b/internal/i18n/locales/es.json @@ -163,5 +163,6 @@ "assistant_iteration_cap": "Vamos a simplificarlo: elige un horario en el calendario de abajo.", "assistant_status_slots": "Comprobando disponibilidad…", "assistant_status_book": "Reservando…", - "assistant_status_working": "Trabajando…" + "assistant_status_working": "Trabajando…", + "phone_call_number": "Teléfono (opcional, para una llamada)" } diff --git a/internal/i18n/locales/fr.json b/internal/i18n/locales/fr.json index af348cbd..341b7ca0 100644 --- a/internal/i18n/locales/fr.json +++ b/internal/i18n/locales/fr.json @@ -156,5 +156,6 @@ "assistant_iteration_cap": "Simplifions les choses : choisissez un créneau dans le calendrier ci-dessous.", "assistant_status_slots": "Vérification des disponibilités…", "assistant_status_book": "Réservation…", - "assistant_status_working": "En cours…" + "assistant_status_working": "En cours…", + "phone_call_number": "Téléphone (facultatif, pour un appel)" } diff --git a/internal/i18n/locales/it.json b/internal/i18n/locales/it.json index a53420cb..cf877c55 100644 --- a/internal/i18n/locales/it.json +++ b/internal/i18n/locales/it.json @@ -156,5 +156,6 @@ "assistant_iteration_cap": "Semplifichiamo: scelga un orario dal calendario qui sotto.", "assistant_status_slots": "Verifica della disponibilità…", "assistant_status_book": "Prenotazione in corso…", - "assistant_status_working": "Elaborazione…" + "assistant_status_working": "Elaborazione…", + "phone_call_number": "Telefono (facoltativo, per una chiamata)" } diff --git a/internal/i18n/locales/nl.json b/internal/i18n/locales/nl.json index 85884aa9..d574659e 100644 --- a/internal/i18n/locales/nl.json +++ b/internal/i18n/locales/nl.json @@ -156,5 +156,6 @@ "assistant_iteration_cap": "Laten we het simpel houden: kies een tijd in de agenda hieronder.", "assistant_status_slots": "Beschikbaarheid controleren…", "assistant_status_book": "Boeken…", - "assistant_status_working": "Bezig…" + "assistant_status_working": "Bezig…", + "phone_call_number": "Telefoonnummer (optioneel, voor een telefoongesprek)" } diff --git a/internal/i18n/locales/pt.json b/internal/i18n/locales/pt.json index c8f43f0d..66d917d6 100644 --- a/internal/i18n/locales/pt.json +++ b/internal/i18n/locales/pt.json @@ -156,5 +156,6 @@ "assistant_iteration_cap": "Vamos simplificar: escolha um horário no calendário abaixo.", "assistant_status_slots": "A verificar a disponibilidade…", "assistant_status_book": "A marcar…", - "assistant_status_working": "A processar…" + "assistant_status_working": "A processar…", + "phone_call_number": "Telefone (opcional, para uma chamada)" } diff --git a/internal/i18n/locales/sv.json b/internal/i18n/locales/sv.json index 3cd404d8..c718acfc 100644 --- a/internal/i18n/locales/sv.json +++ b/internal/i18n/locales/sv.json @@ -156,5 +156,6 @@ "assistant_iteration_cap": "Vi tar det enkelt: välj en tid i kalendern nedan.", "assistant_status_slots": "Kontrollerar tillgängliga tider…", "assistant_status_book": "Bokar…", - "assistant_status_working": "Arbetar…" + "assistant_status_working": "Arbetar…", + "phone_call_number": "Telefonnummer (valfritt, för ett telefonsamtal)" } From a5eaa5bd699689a27bd0772ad1a6aa05b8b31bb0 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:44:16 +0200 Subject: [PATCH 035/250] feat(booking): group available times by time of day --- docs/ARCHITECTURE.md | 2 ++ internal/handler/embed.js | 25 ++++++++++++++++++++++--- internal/handler/templates/book.html | 23 ++++++++++++++++++++--- internal/handler/templates/booking.css | 8 ++++++++ internal/handler/templates/manage.html | 19 ++++++++++++++++++- internal/i18n/locales/de.json | 6 +++++- internal/i18n/locales/en.json | 6 +++++- internal/i18n/locales/es.json | 6 +++++- internal/i18n/locales/fr.json | 6 +++++- internal/i18n/locales/it.json | 6 +++++- internal/i18n/locales/nl.json | 6 +++++- internal/i18n/locales/pt.json | 6 +++++- internal/i18n/locales/sv.json | 6 +++++- 13 files changed, 110 insertions(+), 15 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 58defaab..85b10d8f 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -243,6 +243,8 @@ members. ## 8. Slot generation +Booking and rescheduling pages and the embed widget group the displayed starts into morning (before 12:00), afternoon (12:00–16:59), and evening (17:00 onward), in the selected timezone. Only groups with slots are shown. The time grid has no nested scrolling region. Taken slots remain disabled when the event opts to display them. + - Engine: `internal/slots/generate.go`. Input: `[]HostAvailability` (rules, overrides, busy intervals, **Role**), `EventConfig` (duration, interval, buffers, min-notice, max-future, `RoutingMode`), date range, booker tz, injectable `Now`. diff --git a/internal/handler/embed.js b/internal/handler/embed.js index f9f1c279..82a6526e 100644 --- a/internal/handler/embed.js +++ b/internal/handler/embed.js @@ -496,7 +496,26 @@ else if (st.day) { var list = (st.slotsByDay[st.day] || []).slice().sort(function (a, b) { return a.start < b.start ? -1 : 1; }); var listEl = el('div', { class: 'slots-list' }); - list.forEach(function (s) { + var periodFor = function (slot) { + var hour = Number(new Intl.DateTimeFormat('en-GB', {timeZone: TZ, hour: 'numeric', hourCycle: 'h23'}).format(new Date(slot.start))); + return hour < 12 ? 0 : hour < 17 ? 1 : 2; + }; + var periods = Array.from(new Set(list.map(periodFor))).sort(); + if (periods.indexOf(st.period) === -1) st.period = periods[0]; + var choices = el('div', { class: 'time-periods', role: 'group', 'aria-label': t(this.i18n, 'time_period') }); + periods.forEach(function (period) { + var button = el('button', { type: 'button', 'data-period': String(period), 'aria-pressed': String(period === st.period), text: t(self.i18n, ['time_morning', 'time_afternoon', 'time_evening'][period]) }); + button.addEventListener('click', function () { + st.period = period; + self.render(); + self.shadowRoot.querySelector('[data-period="' + period + '"]').focus(); + }); + choices.appendChild(button); + }); + var grid = el('div', { class: 'time-grid' }); + if (list.length) listEl.appendChild(choices); + listEl.appendChild(grid); + list.filter(function (s) { return periodFor(s) === st.period; }).forEach(function (s) { if (s.taken) { // Disabled rather than click-guarded: it keeps the same box as a bookable // slot and is announced as unavailable instead of read out as a plain time. @@ -506,12 +525,12 @@ 'aria-label': timeLabel(s.start, self.locale) + ' - ' + t(self.i18n, 'slot_taken'), }); d.disabled = true; - listEl.appendChild(d); + grid.appendChild(d); return; } var b = el('button', { class: 'slot-btn', text: timeLabel(s.start, self.locale) }); b.addEventListener('click', function () { self.state.slot = s; self.state.view = 'form'; self.render(); }); - listEl.appendChild(b); + grid.appendChild(b); }); if (!list.length) { // Name the day, and the host when there is one: a bare "No available times." diff --git a/internal/handler/templates/book.html b/internal/handler/templates/book.html index 4145bedb..034dfe2a 100644 --- a/internal/handler/templates/book.html +++ b/internal/handler/templates/book.html @@ -545,6 +545,11 @@

    {{call .T "booking_confirmed"}}

    el.classList.toggle('hidden', !show); } + let selectedPeriod = null; + function slotPeriod(slot) { + const hour = Number(new Intl.DateTimeFormat('en-GB', {timeZone: TZ, hour: 'numeric', hourCycle: 'h23'}).format(new Date(slot.start))); + return hour < 12 ? 0 : hour < 17 ? 1 : 2; + } function fillSlots(list, ds) { // Only when this specific day lost starts to the policy - saying it on a day the // policy did not touch would be noise attached to the wrong cause. @@ -565,10 +570,15 @@

    {{call .T "booking_confirmed"}}

    // bookable ones, and are announced as unavailable rather than read out as a plain // time. `disabled` is what actually prevents picking one; the click guard below is // the second line, not the first. - list.innerHTML = slotsCache.map((s, i) => s.taken + const periods = [...new Set(slotsCache.map(slotPeriod))].sort(); + if (!periods.includes(selectedPeriod)) selectedPeriod = periods[0]; + const labels = ['time_morning', 'time_afternoon', 'time_evening']; + const buttons = slotsCache.map((s, i) => ({s, i})).filter(({s}) => slotPeriod(s) === selectedPeriod).map(({s, i}) => s.taken ? `` : `` ).join(''); + const choices = periods.map(period => ``).join(''); + list.innerHTML = `
    ${choices}
    ${buttons}
    `; // Only meaningful for opted-in event types: when every time on the day is gone, // say so, rather than leaving a list of struck-through times to be inferred from. if (slotsCache.length && !slotsCache.some(s => !s.taken)) { @@ -613,6 +623,13 @@

    {{call .T "booking_confirmed"}}

    } $('slots-list').addEventListener('click', e => { + const period = e.target.closest('[data-period]'); + if (period) { + selectedPeriod = Number(period.dataset.period); + fillSlots($('slots-list'), toDateStr(pickedDate.getFullYear(), pickedDate.getMonth(), pickedDate.getDate())); + $('slots-list').querySelector(`[data-period="${selectedPeriod}"]`).focus(); + return; + } const btn = e.target.closest('.slot-btn'); if (!btn || btn.disabled) return; pickSlot(+btn.dataset.i); @@ -624,8 +641,8 @@

    {{call .T "booking_confirmed"}}

    if (slotsCache[i].taken) return; // never bookable, whatever route got us here pickedSlot = slotsCache[i]; renderHosts(pickedSlot.host_ids); - document.querySelectorAll('.slot-btn').forEach((b, j) => - b.classList.toggle('sel', j === i) + document.querySelectorAll('.slot-btn').forEach(b => + b.classList.toggle('sel', Number(b.dataset.i) === i) ); $('form-slot-label').textContent = `${fmtDate(pickedDate)} · ${fmtTime(pickedSlot.start)}`; showView('form-view'); diff --git a/internal/handler/templates/booking.css b/internal/handler/templates/booking.css index ab64204c..f464ee25 100644 --- a/internal/handler/templates/booking.css +++ b/internal/handler/templates/booking.css @@ -466,3 +466,11 @@ } .demo-banner strong { font-weight: 600; } .demo-banner a { color: inherit; text-decoration: underline; font-weight: 600; } + +.slots-list { max-height: none; overflow: visible; } +.time-periods { display: flex; gap: 4px; padding: 4px; background: #f3f4f6; border-radius: 8px; } +.time-periods button { flex: 1; min-width: 0; padding: 10px 4px; border: 0; border-radius: 6px; background: transparent; color: #374151; font: inherit; font-size: 12px; cursor: pointer; } +.time-periods button[aria-pressed="true"] { background: white; color: #111827; box-shadow: 0 1px 3px #0002; font-weight: 600; } +.time-periods button:focus-visible { outline: 2px solid #111827; outline-offset: 2px; } +.time-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(72px, 1fr)); gap: 8px; } +.time-grid .slot-btn { padding: 12px 4px; font-variant-numeric: tabular-nums; } diff --git a/internal/handler/templates/manage.html b/internal/handler/templates/manage.html index 67401e36..3efe6d0d 100644 --- a/internal/handler/templates/manage.html +++ b/internal/handler/templates/manage.html @@ -446,6 +446,11 @@

    {{call .T "booking_cancelled_title"}}

    if (notice) list.appendChild(hintP(notice, 'notice-hint')); } + let selectedPeriod = null; + function slotPeriod(slot) { + const hour = Number(new Intl.DateTimeFormat('en-GB', {timeZone: TZ, hour: 'numeric', hourCycle: 'h23'}).format(new Date(slot.start))); + return hour < 12 ? 0 : hour < 17 ? 1 : 2; + } function fillSlots(list, ds) { // Only when this specific day lost starts to the policy - saying it on a day the // policy did not touch would be noise attached to the wrong cause. @@ -464,10 +469,15 @@

    {{call .T "booking_cancelled_title"}}

    } // Taken entries are disabled buttons: same box as a bookable slot, announced as // unavailable. `disabled` is what prevents picking one; the click guard is backup. - list.innerHTML = slotsCache.map((s, i) => s.taken + const periods = [...new Set(slotsCache.map(slotPeriod))].sort(); + if (!periods.includes(selectedPeriod)) selectedPeriod = periods[0]; + const labels = ['time_morning', 'time_afternoon', 'time_evening']; + const buttons = slotsCache.map((s, i) => ({s, i})).filter(({s}) => slotPeriod(s) === selectedPeriod).map(({s, i}) => s.taken ? `` : `` ).join(''); + const choices = periods.map(period => ``).join(''); + list.innerHTML = `
    ${choices}
    ${buttons}
    `; if (slotsCache.length && !slotsCache.some(s => !s.taken)) { list.insertAdjacentHTML('beforeend', `

    ${t('all_times_taken')}

    `); } @@ -507,6 +517,13 @@

    {{call .T "booking_cancelled_title"}}

    } $('slots-list').addEventListener('click', e => { + const period = e.target.closest('[data-period]'); + if (period) { + selectedPeriod = Number(period.dataset.period); + fillSlots($('slots-list'), toDateStr(pickedDate.getFullYear(), pickedDate.getMonth(), pickedDate.getDate())); + $('slots-list').querySelector(`[data-period="${selectedPeriod}"]`).focus(); + return; + } const btn = e.target.closest('.slot-btn'); if (!btn || btn.disabled) return; const i = +btn.dataset.i; diff --git a/internal/i18n/locales/de.json b/internal/i18n/locales/de.json index 0252c927..5c25bda5 100644 --- a/internal/i18n/locales/de.json +++ b/internal/i18n/locales/de.json @@ -156,5 +156,9 @@ "assistant_iteration_cap": "Machen wir es einfach: Bitte wählen Sie einen Termin im Kalender unten.", "assistant_status_slots": "Verfügbarkeit wird geprüft…", "assistant_status_book": "Wird gebucht…", - "assistant_status_working": "Wird bearbeitet…" + "assistant_status_working": "Wird bearbeitet…", + "time_period": "Tageszeit", + "time_morning": "Vormittag", + "time_afternoon": "Nachmittag", + "time_evening": "Abend" } diff --git a/internal/i18n/locales/en.json b/internal/i18n/locales/en.json index 4b6a6399..1fca6f7f 100644 --- a/internal/i18n/locales/en.json +++ b/internal/i18n/locales/en.json @@ -163,5 +163,9 @@ "assistant_iteration_cap": "Let's keep it simple — please pick a time from the calendar below.", "assistant_status_slots": "Checking availability…", "assistant_status_book": "Booking…", - "assistant_status_working": "Working…" + "assistant_status_working": "Working…", + "time_period": "Time of day", + "time_morning": "Morning", + "time_afternoon": "Afternoon", + "time_evening": "Evening" } diff --git a/internal/i18n/locales/es.json b/internal/i18n/locales/es.json index e7dc5d01..8b30b838 100644 --- a/internal/i18n/locales/es.json +++ b/internal/i18n/locales/es.json @@ -163,5 +163,9 @@ "assistant_iteration_cap": "Vamos a simplificarlo: elige un horario en el calendario de abajo.", "assistant_status_slots": "Comprobando disponibilidad…", "assistant_status_book": "Reservando…", - "assistant_status_working": "Trabajando…" + "assistant_status_working": "Trabajando…", + "time_period": "Momento del día", + "time_morning": "Mañana", + "time_afternoon": "Tarde", + "time_evening": "Noche" } diff --git a/internal/i18n/locales/fr.json b/internal/i18n/locales/fr.json index af348cbd..35e25dd9 100644 --- a/internal/i18n/locales/fr.json +++ b/internal/i18n/locales/fr.json @@ -156,5 +156,9 @@ "assistant_iteration_cap": "Simplifions les choses : choisissez un créneau dans le calendrier ci-dessous.", "assistant_status_slots": "Vérification des disponibilités…", "assistant_status_book": "Réservation…", - "assistant_status_working": "En cours…" + "assistant_status_working": "En cours…", + "time_period": "Moment de la journée", + "time_morning": "Matin", + "time_afternoon": "Après-midi", + "time_evening": "Soir" } diff --git a/internal/i18n/locales/it.json b/internal/i18n/locales/it.json index a53420cb..132a63d0 100644 --- a/internal/i18n/locales/it.json +++ b/internal/i18n/locales/it.json @@ -156,5 +156,9 @@ "assistant_iteration_cap": "Semplifichiamo: scelga un orario dal calendario qui sotto.", "assistant_status_slots": "Verifica della disponibilità…", "assistant_status_book": "Prenotazione in corso…", - "assistant_status_working": "Elaborazione…" + "assistant_status_working": "Elaborazione…", + "time_period": "Momento della giornata", + "time_morning": "Mattina", + "time_afternoon": "Pomeriggio", + "time_evening": "Sera" } diff --git a/internal/i18n/locales/nl.json b/internal/i18n/locales/nl.json index 85884aa9..71348073 100644 --- a/internal/i18n/locales/nl.json +++ b/internal/i18n/locales/nl.json @@ -156,5 +156,9 @@ "assistant_iteration_cap": "Laten we het simpel houden: kies een tijd in de agenda hieronder.", "assistant_status_slots": "Beschikbaarheid controleren…", "assistant_status_book": "Boeken…", - "assistant_status_working": "Bezig…" + "assistant_status_working": "Bezig…", + "time_period": "Dagdeel", + "time_morning": "Ochtend", + "time_afternoon": "Middag", + "time_evening": "Avond" } diff --git a/internal/i18n/locales/pt.json b/internal/i18n/locales/pt.json index c8f43f0d..fd4010da 100644 --- a/internal/i18n/locales/pt.json +++ b/internal/i18n/locales/pt.json @@ -156,5 +156,9 @@ "assistant_iteration_cap": "Vamos simplificar: escolha um horário no calendário abaixo.", "assistant_status_slots": "A verificar a disponibilidade…", "assistant_status_book": "A marcar…", - "assistant_status_working": "A processar…" + "assistant_status_working": "A processar…", + "time_period": "Período do dia", + "time_morning": "Manhã", + "time_afternoon": "Tarde", + "time_evening": "Noite" } diff --git a/internal/i18n/locales/sv.json b/internal/i18n/locales/sv.json index 3cd404d8..34798ae0 100644 --- a/internal/i18n/locales/sv.json +++ b/internal/i18n/locales/sv.json @@ -156,5 +156,9 @@ "assistant_iteration_cap": "Vi tar det enkelt: välj en tid i kalendern nedan.", "assistant_status_slots": "Kontrollerar tillgängliga tider…", "assistant_status_book": "Bokar…", - "assistant_status_working": "Arbetar…" + "assistant_status_working": "Arbetar…", + "time_period": "Tid på dagen", + "time_morning": "Förmiddag", + "time_afternoon": "Eftermiddag", + "time_evening": "Kväll" } From d4e6aa943c78ce04558213fde0268ed9fdcf2fc5 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Sun, 20 Sep 2026 20:51:45 +0200 Subject: [PATCH 036/250] fix(event-types): refresh eligible transfer hosts after save --- frontend/src/routes/event-types/[slug]/+page.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/routes/event-types/[slug]/+page.svelte b/frontend/src/routes/event-types/[slug]/+page.svelte index fa3ef7a9..029229b1 100644 --- a/frontend/src/routes/event-types/[slug]/+page.svelte +++ b/frontend/src/routes/event-types/[slug]/+page.svelte @@ -395,6 +395,7 @@ return; } await loadET(); + await loadHosts(); } catch (e: any) { toast.error(e.message || 'Could not save changes'); } finally { @@ -451,8 +452,8 @@ // Connected calendar — best-effort; drives the meeting-link hint only. api.get('/v1/calendar/status').then((s) => (calStatus = s)).catch(() => {}); api.get('/v1/zoom/status').then((s) => (zoomStatus = s)).catch(() => {}); + await loadHosts(); if (hostScope === 'people') { - await loadHosts(); loadMembers(); loadTeams(); } From bfd7a5b5aee9db74457f13a747a67bd9c28f9734 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Sep 2026 18:56:45 +0000 Subject: [PATCH 037/250] @marijnbent has signed the CLA in Calnode/calnode#69 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index 22fe04c6..ac157acd 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -23,6 +23,14 @@ "created_at": "2026-09-04T08:01:07Z", "repoId": 1277491008, "pullRequestNo": 22 + }, + { + "name": "marijnbent", + "id": 11903095, + "comment_id": 5751911156, + "created_at": "2026-09-20T18:56:35Z", + "repoId": 1277491008, + "pullRequestNo": 69 } ] } \ No newline at end of file From 4b2847ed60c95a5c3e481b9f2178565b56b41e6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:04:50 +0000 Subject: [PATCH 038/250] chore(deps): bump actions/upload-artifact from 4 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 8fd2ab0b..7fc3023c 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -32,7 +32,7 @@ jobs: results_format: sarif publish_results: true - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: scorecard-sarif path: results.sarif From e60935881e678a64b66cec259843762d6968ff7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:04:54 +0000 Subject: [PATCH 039/250] chore(deps): bump golang from 1.26.6-alpine to 1.27.1-alpine Bumps golang from 1.26.6-alpine to 1.27.1-alpine. --- updated-dependencies: - dependency-name: golang dependency-version: 1.27.1-alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2fece93..605af93c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ COPY frontend/ . RUN pnpm build # ── Go build stage ───────────────────────────────────────────────────────────── -FROM golang:1.26.6-alpine AS builder +FROM golang:1.27.1-alpine AS builder RUN apk add --no-cache ca-certificates wget From 0e8618166a756a788c36047ad73e5d95735a2d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:04:55 +0000 Subject: [PATCH 040/250] chore(deps): bump golang.org/x/oauth2 from 0.36.0 to 0.37.0 Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.36.0 to 0.37.0. - [Commits](https://github.com/golang/oauth2/compare/v0.36.0...v0.37.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-version: 0.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1ea6bd5f..0b4118e5 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/yuin/goldmark v1.8.2 golang.org/x/crypto v0.56.0 golang.org/x/image v0.45.0 - golang.org/x/oauth2 v0.36.0 + golang.org/x/oauth2 v0.37.0 golang.org/x/text v0.41.0 modernc.org/sqlite v1.49.1 ) diff --git a/go.sum b/go.sum index 8a2af3f8..775f2f25 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ golang.org/x/image v0.45.0 h1:FMb1nTbH5H9vF55SriQHgFw5GnNL9Jg6L25BwXKzhB0= golang.org/x/image v0.45.0/go.mod h1:n62x/7RqlwXDvGsSU4u6IUTUf6KghUZ9Bt7cG/T9Fx4= golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk= golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40= -golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= -golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= +golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= +golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= From 4b1cbb1dfb7fd301494abc8df9f4ab5d248cb278 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:05:01 +0000 Subject: [PATCH 041/250] chore(deps): bump docker/metadata-action from 5 to 6 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5 to 6. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](https://github.com/docker/metadata-action/compare/v5...v6) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 629f3dab..9a503aa7 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -59,7 +59,7 @@ jobs: # pre-release deploy can be pinned to an immutable tag that names its commit. - name: Docker metadata id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | From a63401010a79cf8ef2bf7dd272eeec525059b049 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:05:03 +0000 Subject: [PATCH 042/250] chore(deps): bump actions/setup-node from 4 to 7 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 7. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4...v7) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 8fd2ab0b..8d7c1bfd 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -67,7 +67,7 @@ jobs: with: version: 10.32.1 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v7 with: node-version: 22 cache: pnpm diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa6a5dd2..90a9a663 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: with: version: 10.32.1 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v7 with: node-version: 22 cache: pnpm From a69623b17a9d9e444e59a67b0b059b0a566aff66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:05:11 +0000 Subject: [PATCH 043/250] chore(deps): bump docker/build-push-action from 6 to 7 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6 to 7. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6...v7) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 629f3dab..72654ffe 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -70,7 +70,7 @@ jobs: type=semver,pattern={{major}}.{{minor}} - name: Build (push on branch pushes and on tags) - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . platforms: linux/amd64,linux/arm64 From 6ce84bec025d575c382c2506a866cb75bb53a0fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:05:14 +0000 Subject: [PATCH 044/250] chore(deps): bump pnpm/action-setup from 4 to 6 Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 4 to 6. - [Release notes](https://github.com/pnpm/action-setup/releases) - [Commits](https://github.com/pnpm/action-setup/compare/v4...v6) --- updated-dependencies: - dependency-name: pnpm/action-setup dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 8fd2ab0b..8db8905c 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -63,7 +63,7 @@ jobs: with: fetch-depth: 0 # gitleaks needs full history - - uses: pnpm/action-setup@v4 + - uses: pnpm/action-setup@v6 with: version: 10.32.1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa6a5dd2..78e389ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 + - uses: pnpm/action-setup@v6 with: version: 10.32.1 From 9872e385c158cdc5597d02755529fe992dca1e12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:05:32 +0000 Subject: [PATCH 045/250] chore(deps-dev): bump @types/node from 26.0.1 to 26.6.1 in /frontend Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 26.0.1 to 26.6.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-version: 26.6.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 166 ++++++++++++++++++---------------------- 2 files changed, 77 insertions(+), 91 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d8d22e3f..dd67aa48 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -31,7 +31,7 @@ "@sveltejs/kit": "^2.70.2", "@sveltejs/vite-plugin-svelte": "^7.1.2", "@tailwindcss/vite": "^4.3.1", - "@types/node": "^26.0.1", + "@types/node": "^26.6.1", "@vitest/browser": "^4.1.10", "@vitest/browser-playwright": "^4.1.10", "bits-ui": "^2.18.1", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 98fb47d2..0fdc7882 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -29,28 +29,28 @@ importers: version: 1.20.0(svelte@5.56.3) '@sveltejs/adapter-static': specifier: ^3.0.10 - version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))) + version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))) '@sveltejs/kit': specifier: ^2.70.2 - version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@sveltejs/vite-plugin-svelte': specifier: ^7.1.2 - version: 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + version: 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@tailwindcss/vite': specifier: ^4.3.1 - version: 4.3.1(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + version: 4.3.1(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@types/node': - specifier: ^26.0.1 - version: 26.0.1 + specifier: ^26.6.1 + version: 26.6.1 '@vitest/browser': specifier: ^4.1.10 - version: 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) + version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) '@vitest/browser-playwright': specifier: ^4.1.10 - version: 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) + version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) bits-ui: specifier: ^2.18.1 - version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) playwright: specifier: ^1.61.0 version: 1.61.0 @@ -80,10 +80,10 @@ importers: version: 5.9.3 vite: specifier: ^8.0.16 - version: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) + version: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) vitest: specifier: ^4.1.10 - version: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + version: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) vitest-browser-svelte: specifier: ^2.1.1 version: 2.1.1(svelte@5.56.3)(vitest@4.1.11) @@ -454,11 +454,8 @@ packages: '@types/estree@1.0.9': resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} - '@types/node@26.0.1': - resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==} - - '@types/node@26.5.1': - resolution: {integrity: sha512-CzNm2FezW4VR/LjG6yUdiEgLE/rAQ9Slj5gCu/C2VrdcW7I0ahNZ8DRbHT7zOZ6r3ONgd/bsQIeSaoDGrd1C6g==} + '@types/node@26.6.1': + resolution: {integrity: sha512-VqGJBMCtdhqkBUCcBLvywI0NJ+KLuVzgNnlBUNFOQjqVxzo2lxLUNg1DSey8+u2u6ktswSAxg+s68QLzWHNOuA==} '@types/set-cookie-parser@2.4.10': resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} @@ -998,11 +995,11 @@ packages: resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} - tldts-core@7.4.12: - resolution: {integrity: sha512-nYNzS2WRf4QJmjzFFgAxLOBjyBxAGRbCy9PVBPaglcYyYajh40VBn+v5Ngr96ZMc7oM0+aCJdtQnNejvdBnXMQ==} + tldts-core@7.4.13: + resolution: {integrity: sha512-mbYsrih5FRtGxs3Usvl/PqwJsNpp+jsmrdFviiK02teHDG0/HebBG/pqCylje3kzgXYzuLoHJF/0mz9W53t8Xg==} - tldts@7.4.12: - resolution: {integrity: sha512-WylhSDKVeYnWXL3a+vKTaOxjnOeEGw938hImY8zoRWJjRRK/Jp1K+IihBzIONpUmW4e3WmXT6q5FW6vlESVZCA==} + tldts@7.4.13: + resolution: {integrity: sha512-iHtaIWWIbMDkCeJdTBzZFGgbluE5J+oHlb2g7+oAz1S1gpuVpabRZdQyd471Vl8UUkcz2vXSL8xZH2kyCe8tfA==} hasBin: true totalist@3.0.1: @@ -1019,8 +1016,8 @@ packages: tw-animate-css@1.4.0: resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==} - type-fest@5.9.0: - resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} + type-fest@5.10.0: + resolution: {integrity: sha512-NoSdpq/WEiAg5sjmBkmV/hfxv6HJH4NqPNrqjtSO5CwRmpsDfaf4begxW34KdJykH/l1yHtwBWQkCRdoXO8mPA==} engines: {node: '>=20'} typescript@5.9.3: @@ -1028,9 +1025,6 @@ packages: engines: {node: '>=14.17'} hasBin: true - undici-types@8.3.0: - resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} - undici-types@8.9.0: resolution: {integrity: sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==} @@ -1205,33 +1199,33 @@ snapshots: '@inquirer/ansi@2.0.8': optional: true - '@inquirer/confirm@6.3.2(@types/node@26.0.1)': + '@inquirer/confirm@6.3.2(@types/node@26.6.1)': dependencies: - '@inquirer/core': 12.0.3(@types/node@26.0.1) - '@inquirer/type': 4.1.1(@types/node@26.0.1) + '@inquirer/core': 12.0.3(@types/node@26.6.1) + '@inquirer/type': 4.1.1(@types/node@26.6.1) optionalDependencies: - '@types/node': 26.0.1 + '@types/node': 26.6.1 optional: true - '@inquirer/core@12.0.3(@types/node@26.0.1)': + '@inquirer/core@12.0.3(@types/node@26.6.1)': dependencies: '@inquirer/ansi': 2.0.8 '@inquirer/figures': 2.0.9 - '@inquirer/type': 4.1.1(@types/node@26.0.1) + '@inquirer/type': 4.1.1(@types/node@26.6.1) cli-width: 4.1.0 fast-wrap-ansi: 0.2.2 mute-stream: 3.0.0 signal-exit: 4.1.0 optionalDependencies: - '@types/node': 26.0.1 + '@types/node': 26.6.1 optional: true '@inquirer/figures@2.0.9': optional: true - '@inquirer/type@4.1.1(@types/node@26.0.1)': + '@inquirer/type@4.1.1(@types/node@26.6.1)': optionalDependencies: - '@types/node': 26.0.1 + '@types/node': 26.6.1 optional: true '@internationalized/date@3.12.2': @@ -1354,15 +1348,15 @@ snapshots: dependencies: acorn: 8.17.0 - '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))': + '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))': dependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) - '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': + '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': dependencies: '@standard-schema/spec': 1.1.0 '@sveltejs/acorn-typescript': 1.0.10(acorn@8.17.0) - '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@types/cookie': 0.6.0 acorn: 8.17.0 cookie: 0.7.2 @@ -1374,20 +1368,20 @@ snapshots: set-cookie-parser: 3.1.0 sirv: 3.0.2 svelte: 5.56.3 - vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) + vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) optionalDependencies: typescript: 5.9.3 '@sveltejs/load-config@0.2.0': {} - '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': + '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': dependencies: deepmerge: 4.3.1 magic-string: 0.30.21 obug: 2.1.3 svelte: 5.56.3 - vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) - vitefu: 1.1.3(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) + vitefu: 1.1.3(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@swc/helpers@0.5.23': dependencies: @@ -1454,12 +1448,12 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.3.1 '@tailwindcss/oxide-win32-x64-msvc': 4.3.1 - '@tailwindcss/vite@4.3.1(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': + '@tailwindcss/vite@4.3.1(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': dependencies: '@tailwindcss/node': 4.3.1 '@tailwindcss/oxide': 4.3.1 tailwindcss: 4.3.1 - vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) + vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) '@testing-library/svelte-core@1.0.0(svelte@5.56.3)': dependencies: @@ -1481,18 +1475,13 @@ snapshots: '@types/estree@1.0.9': {} - '@types/node@26.0.1': - dependencies: - undici-types: 8.3.0 - - '@types/node@26.5.1': + '@types/node@26.6.1': dependencies: undici-types: 8.9.0 - optional: true '@types/set-cookie-parser@2.4.10': dependencies: - '@types/node': 26.5.1 + '@types/node': 26.6.1 optional: true '@types/statuses@2.0.6': @@ -1500,29 +1489,29 @@ snapshots: '@types/trusted-types@2.0.7': {} - '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11)': + '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11)': dependencies: - '@vitest/browser': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) - '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@vitest/browser': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) playwright: 1.61.0 tinyrainbow: 3.1.0 - vitest: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) transitivePeerDependencies: - bufferutil - msw - utf-8-validate - vite - '@vitest/browser@4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11)': + '@vitest/browser@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11)': dependencies: '@blazediff/core': 1.9.1 - '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@vitest/utils': 4.1.11 magic-string: 0.30.21 pngjs: 7.0.0 sirv: 3.0.2 tinyrainbow: 3.1.0 - vitest: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) ws: 8.21.0 transitivePeerDependencies: - bufferutil @@ -1539,14 +1528,14 @@ snapshots: chai: 6.2.2 tinyrainbow: 3.1.0 - '@vitest/mocker@4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))': + '@vitest/mocker@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': dependencies: '@vitest/spy': 4.1.11 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - msw: 2.14.6(@types/node@26.0.1)(typescript@5.9.3) - vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) + msw: 2.14.6(@types/node@26.6.1)(typescript@5.9.3) + vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) '@vitest/pretty-format@4.1.11': dependencies: @@ -1588,15 +1577,15 @@ snapshots: axobject-query@4.1.0: {} - bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): + bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3): dependencies: '@floating-ui/core': 1.7.5 '@floating-ui/dom': 1.7.6 '@internationalized/date': 3.12.2 esm-env: 1.2.2 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) svelte: 5.56.3 - svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) tabbable: 6.4.0 transitivePeerDependencies: - '@sveltejs/kit' @@ -1785,9 +1774,9 @@ snapshots: mrmime@2.0.1: {} - msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3): + msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3): dependencies: - '@inquirer/confirm': 6.3.2(@types/node@26.0.1) + '@inquirer/confirm': 6.3.2(@types/node@26.6.1) '@mswjs/interceptors': 0.41.9 '@open-draft/deferred-promise': 3.0.0 '@types/statuses': 2.0.6 @@ -1802,7 +1791,7 @@ snapshots: statuses: 2.0.2 strict-event-emitter: 0.5.1 tough-cookie: 6.0.2 - type-fest: 5.9.0 + type-fest: 5.10.0 until-async: 3.0.2 yargs: 17.7.3 optionalDependencies: @@ -1882,14 +1871,14 @@ snapshots: esm-env: 1.2.2 svelte: 5.56.3 - runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): + runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3): dependencies: dequal: 2.0.3 esm-env: 1.2.2 lz-string: 1.5.0 svelte: 5.56.3 optionalDependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) sade@1.8.1: dependencies: @@ -1965,10 +1954,10 @@ snapshots: runed: 0.28.0(svelte@5.56.3) svelte: 5.56.3 - svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3): + svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3): dependencies: clsx: 2.1.1 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)))(svelte@5.56.3) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) style-to-object: 1.0.14 svelte: 5.56.3 transitivePeerDependencies: @@ -2023,41 +2012,38 @@ snapshots: tinyrainbow@3.1.0: {} - tldts-core@7.4.12: + tldts-core@7.4.13: optional: true - tldts@7.4.12: + tldts@7.4.13: dependencies: - tldts-core: 7.4.12 + tldts-core: 7.4.13 optional: true totalist@3.0.1: {} tough-cookie@6.0.2: dependencies: - tldts: 7.4.12 + tldts: 7.4.13 optional: true tslib@2.8.1: {} tw-animate-css@1.4.0: {} - type-fest@5.9.0: + type-fest@5.10.0: dependencies: tagged-tag: 1.0.0 optional: true typescript@5.9.3: {} - undici-types@8.3.0: {} - - undici-types@8.9.0: - optional: true + undici-types@8.9.0: {} until-async@3.0.2: optional: true - vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0): + vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0): dependencies: lightningcss: 1.32.0 picomatch: 4.0.4 @@ -2065,24 +2051,24 @@ snapshots: rolldown: 1.0.3 tinyglobby: 0.2.17 optionalDependencies: - '@types/node': 26.0.1 + '@types/node': 26.6.1 fsevents: 2.3.3 jiti: 2.7.0 - vitefu@1.1.3(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)): + vitefu@1.1.3(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)): optionalDependencies: - vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) + vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) vitest-browser-svelte@2.1.1(svelte@5.56.3)(vitest@4.1.11): dependencies: '@testing-library/svelte-core': 1.0.0(svelte@5.56.3) svelte: 5.56.3 - vitest: 4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) - vitest@4.1.11(@types/node@26.0.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)): + vitest@4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)): dependencies: '@vitest/expect': 4.1.11 - '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0)) + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@vitest/pretty-format': 4.1.11 '@vitest/runner': 4.1.11 '@vitest/snapshot': 4.1.11 @@ -2099,11 +2085,11 @@ snapshots: tinyexec: 1.2.4 tinyglobby: 0.2.17 tinyrainbow: 3.1.0 - vite: 8.0.16(@types/node@26.0.1)(jiti@2.7.0) + vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 26.0.1 - '@vitest/browser-playwright': 4.1.11(msw@2.14.6(@types/node@26.0.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.0.1)(jiti@2.7.0))(vitest@4.1.11) + '@types/node': 26.6.1 + '@vitest/browser-playwright': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) transitivePeerDependencies: - msw From 8c763449354abf62e707f62b604a91594e474d27 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Mon, 21 Sep 2026 19:09:10 +1200 Subject: [PATCH 046/250] fix(caldav): events_test passes homeURL to saveConnection Merge-resolution fix for #56: the branch predates the 6-arg saveConnection (caldav_home_url). Empty home URL preserves the PR's tested semantics; homeURL is only read by ListCalendars. --- internal/caldav/events_test.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/caldav/events_test.go b/internal/caldav/events_test.go index c57cfe09..42a3cfd4 100644 --- a/internal/caldav/events_test.go +++ b/internal/caldav/events_test.go @@ -134,10 +134,10 @@ func TestUpdateCancel_eventOnPreviousAccountUsesThatAccount(t *testing.T) { seedUser(t, c.db, "u1") srvA := newDAVServer(t, "a@a.test", "pw-a") srvB := newDAVServer(t, "b@b.test", "pw-b") - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } - if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/", ""); err != nil { t.Fatal(err) } svc := newSvc(c) @@ -174,10 +174,10 @@ func TestCancel_emptyCalendarIDResolvesOwnerByURL(t *testing.T) { seedUser(t, c.db, "u1") srvA := newDAVServer(t, "a@a.test", "pw-a") srvB := newDAVServer(t, "b@b.test", "pw-b") - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } - if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/", ""); err != nil { t.Fatal(err) } svc := newSvc(c) @@ -209,10 +209,10 @@ func TestUpdate_eventInPickedCalendarResolvesToItsAccount(t *testing.T) { seedUser(t, c.db, "u1") srvA := newDAVServer(t, "a@a.test", "pw-a") srvB := newDAVServer(t, "b@b.test", "pw-b") - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } - if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", srvB.URL+"/calendars/b/home/", ""); err != nil { t.Fatal(err) } svc := newSvc(c) @@ -308,7 +308,7 @@ func TestUpdateCancel_destinationMovedToAnotherProvider(t *testing.T) { ctx := context.Background() seedUser(t, c.db, "u1") srvA := newDAVServer(t, "a@a.test", "pw-a") - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } other := &otherProvider{} @@ -349,7 +349,7 @@ func TestUpdateCancel_owningAccountDisconnectedSendsNothing(t *testing.T) { ctx := context.Background() seedUser(t, c.db, "u1") srvA := newDAVServer(t, "a@a.test", "pw-a") - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } other := &otherProvider{} @@ -392,10 +392,10 @@ func TestUpdateCancel_ambiguousOrUnknownOwnerSendsNothing(t *testing.T) { stranger: newDAVServer(t, "a@a.test", "pw-a"), } ctx := context.Background() - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", s.srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", s.srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } - if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", s.srvB.URL+"/calendars/b/home"); err != nil { + if err := c.saveConnection(ctx, "u1", "b@b.test", "pw-b", s.srvB.URL+"/calendars/b/home", ""); err != nil { t.Fatal(err) } return s @@ -439,7 +439,7 @@ func TestUpdateCancel_ambiguousOrUnknownOwnerSendsNothing(t *testing.T) { { name: "two accounts bound to the same collection", extra: func(t *testing.T, s setup) { - if err := s.c.saveConnection(context.Background(), "u1", "delegate@a.test", "pw-d", s.srvA.URL+"/calendars/a/home/"); err != nil { + if err := s.c.saveConnection(context.Background(), "u1", "delegate@a.test", "pw-d", s.srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } }, @@ -450,7 +450,7 @@ func TestUpdateCancel_ambiguousOrUnknownOwnerSendsNothing(t *testing.T) { { name: "two accounts bound to the same collection, no calendar id", extra: func(t *testing.T, s setup) { - if err := s.c.saveConnection(context.Background(), "u1", "delegate@a.test", "pw-d", s.srvA.URL+"/calendars/a/home/"); err != nil { + if err := s.c.saveConnection(context.Background(), "u1", "delegate@a.test", "pw-d", s.srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } }, @@ -492,7 +492,7 @@ func TestUpdateCancel_serverFailureStaysRetryable(t *testing.T) { fail func(t *testing.T, c *Client, s *davServer) }{ {"server refuses the stored password", func(t *testing.T, c *Client, s *davServer) { - if err := c.saveConnection(context.Background(), "u1", "a@a.test", "revoked", s.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(context.Background(), "u1", "a@a.test", "revoked", s.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } }}, @@ -504,7 +504,7 @@ func TestUpdateCancel_serverFailureStaysRetryable(t *testing.T) { ctx := context.Background() seedUser(t, c.db, "u1") srvA := newDAVServer(t, "a@a.test", "pw-a") - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } svc := newSvc(c) @@ -530,7 +530,7 @@ func TestUpdateCancel_singleAccountUnchanged(t *testing.T) { ctx := context.Background() seedUser(t, c.db, "u1") srvA := newDAVServer(t, "a@a.test", "pw-a") - if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/"); err != nil { + if err := c.saveConnection(ctx, "u1", "a@a.test", "pw-a", srvA.URL+"/calendars/a/home/", ""); err != nil { t.Fatal(err) } svc := newSvc(c) From c5db7d832f8e1f1b358413954581feb02e6541c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:04:41 +0000 Subject: [PATCH 047/250] chore(deps): bump golang.org/x/text from 0.41.0 to 0.42.0 Bumps [golang.org/x/text](https://github.com/golang/text) from 0.41.0 to 0.42.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.41.0...v0.42.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-version: 0.42.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 0b4118e5..7b60d649 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( golang.org/x/crypto v0.56.0 golang.org/x/image v0.45.0 golang.org/x/oauth2 v0.37.0 - golang.org/x/text v0.41.0 + golang.org/x/text v0.42.0 modernc.org/sqlite v1.49.1 ) @@ -31,7 +31,7 @@ require ( github.com/sethvargo/go-retry v0.3.0 // indirect github.com/yosida95/uritemplate/v3 v3.0.2 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sync v0.22.0 // indirect + golang.org/x/sync v0.23.0 // indirect golang.org/x/sys v0.47.0 // indirect modernc.org/libc v1.72.1 // indirect modernc.org/mathutil v1.7.1 // indirect diff --git a/go.sum b/go.sum index 775f2f25..9b4d6c78 100644 --- a/go.sum +++ b/go.sum @@ -53,19 +53,19 @@ golang.org/x/crypto v0.56.0/go.mod h1:OMW5y6CY9l38uPLmxU6l6pwcXp1obtLo3e6gT7gQR2 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.45.0 h1:FMb1nTbH5H9vF55SriQHgFw5GnNL9Jg6L25BwXKzhB0= golang.org/x/image v0.45.0/go.mod h1:n62x/7RqlwXDvGsSU4u6IUTUf6KghUZ9Bt7cG/T9Fx4= -golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk= -golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40= +golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= -golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= -golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= +golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= -golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= -golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE= -golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= +golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= +golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= modernc.org/cc/v4 v4.28.1 h1:XpLbkYVQ24E8tX5u8+yWGvaxerxkR/S4zqxI8ZoSBuc= From 7b5d3b8de7fa3070c4cc4f0b9cb7e5cd4d856fc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:04:48 +0000 Subject: [PATCH 048/250] chore(deps): bump github.com/yuin/goldmark from 1.8.2 to 1.8.6 Bumps [github.com/yuin/goldmark](https://github.com/yuin/goldmark) from 1.8.2 to 1.8.6. - [Release notes](https://github.com/yuin/goldmark/releases) - [Commits](https://github.com/yuin/goldmark/compare/v1.8.2...v1.8.6) --- updated-dependencies: - dependency-name: github.com/yuin/goldmark dependency-version: 1.8.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0b4118e5..e6cb71d6 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/joho/godotenv v1.5.1 github.com/modelcontextprotocol/go-sdk v1.6.1 github.com/pressly/goose/v3 v3.27.1 - github.com/yuin/goldmark v1.8.2 + github.com/yuin/goldmark v1.8.6 golang.org/x/crypto v0.56.0 golang.org/x/image v0.45.0 golang.org/x/oauth2 v0.37.0 diff --git a/go.sum b/go.sum index 775f2f25..ba08ed72 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4= github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4= -github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE= -github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= +github.com/yuin/goldmark v1.8.6 h1:d0VcaP1sx9GkFVkoW+KtggpGi2KZ965i14b0+bDQST4= +github.com/yuin/goldmark v1.8.6/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.56.0 h1:GUh5Ii4J5jtcseSMiRqr1jXCNHoxjeV9Fmekc2oLy6Y= From 40ac670a089d852b2061e9546dec22f929f272a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:09:45 +0000 Subject: [PATCH 049/250] chore(deps): bump golang.org/x/crypto from 0.56.0 to 0.57.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.56.0 to 0.57.0. - [Commits](https://github.com/golang/crypto/compare/v0.56.0...v0.57.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.57.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index e3e5c752..5c3ca5ca 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/modelcontextprotocol/go-sdk v1.6.1 github.com/pressly/goose/v3 v3.27.1 github.com/yuin/goldmark v1.8.6 - golang.org/x/crypto v0.56.0 + golang.org/x/crypto v0.57.0 golang.org/x/image v0.45.0 golang.org/x/oauth2 v0.37.0 golang.org/x/text v0.42.0 @@ -32,7 +32,7 @@ require ( github.com/yosida95/uritemplate/v3 v3.0.2 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sync v0.23.0 // indirect - golang.org/x/sys v0.47.0 // indirect + golang.org/x/sys v0.48.0 // indirect modernc.org/libc v1.72.1 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect diff --git a/go.sum b/go.sum index 1329dd8e..4a7ee994 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ github.com/yuin/goldmark v1.8.6 h1:d0VcaP1sx9GkFVkoW+KtggpGi2KZ965i14b0+bDQST4= github.com/yuin/goldmark v1.8.6/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -golang.org/x/crypto v0.56.0 h1:GUh5Ii4J5jtcseSMiRqr1jXCNHoxjeV9Fmekc2oLy6Y= -golang.org/x/crypto v0.56.0/go.mod h1:OMW5y6CY9l38uPLmxU6l6pwcXp1obtLo3e6gT7gQR2I= +golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= +golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.45.0 h1:FMb1nTbH5H9vF55SriQHgFw5GnNL9Jg6L25BwXKzhB0= golang.org/x/image v0.45.0/go.mod h1:n62x/7RqlwXDvGsSU4u6IUTUf6KghUZ9Bt7cG/T9Fx4= @@ -59,8 +59,8 @@ golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= -golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= -golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= +golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= From 5fb553324f36d92cd54f29ebf04c16a9badad760 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:12:39 +0000 Subject: [PATCH 050/250] chore(deps): bump github.com/modelcontextprotocol/go-sdk Bumps [github.com/modelcontextprotocol/go-sdk](https://github.com/modelcontextprotocol/go-sdk) from 1.6.1 to 1.8.0. - [Release notes](https://github.com/modelcontextprotocol/go-sdk/releases) - [Commits](https://github.com/modelcontextprotocol/go-sdk/compare/v1.6.1...v1.8.0) --- updated-dependencies: - dependency-name: github.com/modelcontextprotocol/go-sdk dependency-version: 1.8.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 3 ++- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5c3ca5ca..b7741ca6 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.26.6 require ( github.com/disintegration/imaging v1.6.2 github.com/joho/godotenv v1.5.1 - github.com/modelcontextprotocol/go-sdk v1.6.1 + github.com/modelcontextprotocol/go-sdk v1.8.0 github.com/pressly/goose/v3 v3.27.1 github.com/yuin/goldmark v1.8.6 golang.org/x/crypto v0.57.0 @@ -33,6 +33,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/sync v0.23.0 // indirect golang.org/x/sys v0.48.0 // indirect + golang.org/x/time v0.15.0 // indirect modernc.org/libc v1.72.1 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect diff --git a/go.sum b/go.sum index 4a7ee994..25d90611 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLG github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY= github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= -github.com/modelcontextprotocol/go-sdk v1.6.1 h1:0zOSupjKUxPKSocPT1Wtago+mUHU2/uZ4xSOY0FGReU= -github.com/modelcontextprotocol/go-sdk v1.6.1/go.mod h1:kzm3kzFL1/+AziGOE0nUs3gvPoNxMCvkxokMkuFapXQ= +github.com/modelcontextprotocol/go-sdk v1.8.0 h1:KIvahhYqwtbeniWVPs3TcXEA7b8jEtwfBpOTAI+Urx4= +github.com/modelcontextprotocol/go-sdk v1.8.0/go.mod h1:dL7u98E/zjJTGzEq+j30jQ8K2k1mb6LeAH4inEcSGts= github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -64,6 +64,8 @@ golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= +golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= +golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= From c9ab7691916d030b394a36d3702e5bc2e25e6df0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:14:36 +0000 Subject: [PATCH 051/250] chore(deps-dev): bump svelte from 5.56.3 to 5.57.0 in /frontend Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 5.56.3 to 5.57.0. - [Release notes](https://github.com/sveltejs/svelte/releases) - [Changelog](https://github.com/sveltejs/svelte/blob/main/packages/svelte/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte/commits/svelte@5.57.0/packages/svelte) --- updated-dependencies: - dependency-name: svelte dependency-version: 5.57.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 159 ++++++++++++++++++++++------------------ 2 files changed, 88 insertions(+), 73 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index dd67aa48..166f9420 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -37,7 +37,7 @@ "bits-ui": "^2.18.1", "playwright": "^1.61.0", "shadcn-svelte": "1.3.0", - "svelte": "^5.0.0", + "svelte": "^5.57.0", "svelte-check": "^4.7.1", "svelte-sonner": "^1.1.1", "tailwind-variants": "^3.2.2", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 0fdc7882..7bd3e765 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -26,16 +26,16 @@ importers: version: 3.12.2 '@lucide/svelte': specifier: ^1.20.0 - version: 1.20.0(svelte@5.56.3) + version: 1.20.0(svelte@5.57.0) '@sveltejs/adapter-static': specifier: ^3.0.10 - version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))) + version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))) '@sveltejs/kit': specifier: ^2.70.2 - version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@sveltejs/vite-plugin-svelte': specifier: ^7.1.2 - version: 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + version: 7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@tailwindcss/vite': specifier: ^4.3.1 version: 4.3.1(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) @@ -50,22 +50,22 @@ importers: version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) bits-ui: specifier: ^2.18.1 - version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) + version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) playwright: specifier: ^1.61.0 version: 1.61.0 shadcn-svelte: specifier: 1.3.0 - version: 1.3.0(svelte@5.56.3) + version: 1.3.0(svelte@5.57.0) svelte: - specifier: ^5.0.0 - version: 5.56.3 + specifier: ^5.57.0 + version: 5.57.0 svelte-check: specifier: ^4.7.1 - version: 4.7.1(picomatch@4.0.4)(svelte@5.56.3)(typescript@5.9.3) + version: 4.7.1(picomatch@4.0.4)(svelte@5.57.0)(typescript@5.9.3) svelte-sonner: specifier: ^1.1.1 - version: 1.1.1(svelte@5.56.3) + version: 1.1.1(svelte@5.57.0) tailwind-variants: specifier: ^3.2.2 version: 3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.1) @@ -86,7 +86,7 @@ importers: version: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) vitest-browser-svelte: specifier: ^2.1.1 - version: 2.1.1(svelte@5.56.3)(vitest@4.1.11) + version: 2.1.1(svelte@5.57.0)(vitest@4.1.11) packages: @@ -159,8 +159,8 @@ packages: resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} - '@jridgewell/sourcemap-codec@1.5.5': - resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/sourcemap-codec@1.6.0': + resolution: {integrity: sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==} '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} @@ -304,6 +304,11 @@ packages: peerDependencies: acorn: ^8.9.0 + '@sveltejs/acorn-typescript@1.0.13': + resolution: {integrity: sha512-wgKggnhZVL9Bfx1OaKKTrYY9BFRk6C8UAkQNUcIv1+llzYrIqy+RZm5HPKzn0NpEBvTVhTqB4kQyllZywsRBRQ==} + peerDependencies: + acorn: ^8.9.0 + '@sveltejs/adapter-static@3.0.10': resolution: {integrity: sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew==} peerDependencies: @@ -463,9 +468,6 @@ packages: '@types/statuses@2.0.6': resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==} - '@types/trusted-types@2.0.7': - resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==} - '@vitest/browser-playwright@4.1.11': resolution: {integrity: sha512-riLBxPqwnJ0lWs2DN2WeUfYeKLoAjbP2Xx8cLQdSddzMi20sksIa6K2mPz79DyMZKKVKH2ksOC2yJvtNcZg8cg==} peerDependencies: @@ -511,6 +513,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + acorn@8.18.0: + resolution: {integrity: sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==} + engines: {node: '>=0.4.0'} + hasBin: true + ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -598,6 +605,9 @@ packages: devalue@5.8.1: resolution: {integrity: sha512-4CXDYRBGqN+57wVJkuXBYmpAVUSg3L6JAQa/DFqm238G73E1wuyc/JhGQJzN7vUf/CMphYau2zXbfWzDR5aTEw==} + devalue@5.9.2: + resolution: {integrity: sha512-po4PAY5c53tw5XMocSnf8A/5OHhbbUftpr93aEN6BBoAdntUmK7vu7wOATqvt7cXO7m1Cl4gMVn6p7n6n4mj0w==} + emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -615,8 +625,8 @@ packages: esm-env@1.2.2: resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==} - esrap@2.2.11: - resolution: {integrity: sha512-gPdx+I+BjYEinNMQaBXFjbaJVyoPMU4ZODg5mE+M4DqVG9VusAVHHjcBX+zqyITlI0DIARwDMMzZwAWj36dRoQ==} + esrap@2.3.7: + resolution: {integrity: sha512-n2nf7fZR3c9yXf0BPEuHuXqT+KW0SJVj4cN5FMEkpCZ3scLjOQWpiccyCxVzCC2q1wubTghuEGzngJY/7Ah0Ow==} peerDependencies: '@typescript-eslint/types': ^8.2.0 peerDependenciesMeta: @@ -949,8 +959,8 @@ packages: peerDependencies: svelte: ^5.30.2 - svelte@5.56.3: - resolution: {integrity: sha512-w7JvrM5IFl5cmfbY0TLik9o7mjRUJmRMhOR51tBPu708Gr/MjbGs7VnJnr/B0CaXeI4vtnOh7RKxDr0cwhMdDA==} + svelte@5.57.0: + resolution: {integrity: sha512-NdbDn7fl4be1ViUG0oq/lvG6OZy3oENolV2ONjiqqsfVoeAfzaQAKUcEX3MrQod/Bebv1PgwET9rfXhgn9s4Kg==} engines: {node: '>=18'} tabbable@6.4.0: @@ -1162,8 +1172,8 @@ packages: resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==} engines: {node: '>=12'} - zimmerframe@1.1.4: - resolution: {integrity: sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==} + zimmerframe@1.1.5: + resolution: {integrity: sha512-msJxIvYDYcoNL+PJsu+7qmpDWsYmAxTY+2TNYXXF0hzBzBk0BMecOqDOG/EckUoKCuKwObfbugIl8QpqHDXeFA==} snapshots: @@ -1234,7 +1244,7 @@ snapshots: '@jridgewell/gen-mapping@0.3.13': dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 '@jridgewell/trace-mapping': 0.3.31 '@jridgewell/remapping@2.3.5': @@ -1244,16 +1254,16 @@ snapshots: '@jridgewell/resolve-uri@3.1.2': {} - '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/sourcemap-codec@1.6.0': {} '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 - '@lucide/svelte@1.20.0(svelte@5.56.3)': + '@lucide/svelte@1.20.0(svelte@5.57.0)': dependencies: - svelte: 5.56.3 + svelte: 5.57.0 '@mswjs/interceptors@0.41.9': dependencies: @@ -1348,15 +1358,19 @@ snapshots: dependencies: acorn: 8.17.0 - '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))': + '@sveltejs/acorn-typescript@1.0.13(acorn@8.18.0)': dependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + acorn: 8.18.0 - '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': + '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))': + dependencies: + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + + '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': dependencies: '@standard-schema/spec': 1.1.0 '@sveltejs/acorn-typescript': 1.0.10(acorn@8.17.0) - '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) '@types/cookie': 0.6.0 acorn: 8.17.0 cookie: 0.7.2 @@ -1367,19 +1381,19 @@ snapshots: mrmime: 2.0.1 set-cookie-parser: 3.1.0 sirv: 3.0.2 - svelte: 5.56.3 + svelte: 5.57.0 vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) optionalDependencies: typescript: 5.9.3 '@sveltejs/load-config@0.2.0': {} - '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': + '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': dependencies: deepmerge: 4.3.1 magic-string: 0.30.21 obug: 2.1.3 - svelte: 5.56.3 + svelte: 5.57.0 vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) vitefu: 1.1.3(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) @@ -1455,9 +1469,9 @@ snapshots: tailwindcss: 4.3.1 vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) - '@testing-library/svelte-core@1.0.0(svelte@5.56.3)': + '@testing-library/svelte-core@1.0.0(svelte@5.57.0)': dependencies: - svelte: 5.56.3 + svelte: 5.57.0 '@tybys/wasm-util@0.10.2': dependencies: @@ -1487,8 +1501,6 @@ snapshots: '@types/statuses@2.0.6': optional: true - '@types/trusted-types@2.0.7': {} - '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11)': dependencies: '@vitest/browser': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) @@ -1563,6 +1575,8 @@ snapshots: acorn@8.17.0: {} + acorn@8.18.0: {} + ansi-regex@5.0.1: optional: true @@ -1577,15 +1591,15 @@ snapshots: axobject-query@4.1.0: {} - bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3): + bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): dependencies: '@floating-ui/core': 1.7.5 '@floating-ui/dom': 1.7.6 '@internationalized/date': 3.12.2 esm-env: 1.2.2 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) - svelte: 5.56.3 - svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) + svelte: 5.57.0 + svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) tabbable: 6.4.0 transitivePeerDependencies: - '@sveltejs/kit' @@ -1635,6 +1649,8 @@ snapshots: devalue@5.8.1: {} + devalue@5.9.2: {} + emoji-regex@8.0.0: optional: true @@ -1650,9 +1666,9 @@ snapshots: esm-env@1.2.2: {} - esrap@2.2.11: + esrap@2.3.7: dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 estree-walker@3.0.3: dependencies: @@ -1768,7 +1784,7 @@ snapshots: magic-string@0.30.21: dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 mri@1.2.0: {} @@ -1866,19 +1882,19 @@ snapshots: '@rolldown/binding-win32-arm64-msvc': 1.0.3 '@rolldown/binding-win32-x64-msvc': 1.0.3 - runed@0.28.0(svelte@5.56.3): + runed@0.28.0(svelte@5.57.0): dependencies: esm-env: 1.2.2 - svelte: 5.56.3 + svelte: 5.57.0 - runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3): + runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): dependencies: dequal: 2.0.3 esm-env: 1.2.2 lz-string: 1.5.0 - svelte: 5.56.3 + svelte: 5.57.0 optionalDependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) sade@1.8.1: dependencies: @@ -1889,12 +1905,12 @@ snapshots: set-cookie-parser@3.1.2: optional: true - shadcn-svelte@1.3.0(svelte@5.56.3): + shadcn-svelte@1.3.0(svelte@5.57.0): dependencies: commander: 14.0.3 node-fetch-native: 1.6.7 postcss: 8.5.28 - svelte: 5.56.3 + svelte: 5.57.0 tailwind-merge: 3.6.0 siginfo@2.0.0: {} @@ -1936,7 +1952,7 @@ snapshots: dependencies: inline-style-parser: 0.2.7 - svelte-check@4.7.1(picomatch@4.0.4)(svelte@5.56.3)(typescript@5.9.3): + svelte-check@4.7.1(picomatch@4.0.4)(svelte@5.57.0)(typescript@5.9.3): dependencies: '@jridgewell/trace-mapping': 0.3.31 '@sveltejs/load-config': 0.2.0 @@ -1944,43 +1960,42 @@ snapshots: fdir: 6.5.0(picomatch@4.0.4) picocolors: 1.1.1 sade: 1.8.1 - svelte: 5.56.3 + svelte: 5.57.0 typescript: 5.9.3 transitivePeerDependencies: - picomatch - svelte-sonner@1.1.1(svelte@5.56.3): + svelte-sonner@1.1.1(svelte@5.57.0): dependencies: - runed: 0.28.0(svelte@5.56.3) - svelte: 5.56.3 + runed: 0.28.0(svelte@5.57.0) + svelte: 5.57.0 - svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3): + svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): dependencies: clsx: 2.1.1 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.56.3) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) style-to-object: 1.0.14 - svelte: 5.56.3 + svelte: 5.57.0 transitivePeerDependencies: - '@sveltejs/kit' - svelte@5.56.3: + svelte@5.57.0: dependencies: '@jridgewell/remapping': 2.3.5 - '@jridgewell/sourcemap-codec': 1.5.5 - '@sveltejs/acorn-typescript': 1.0.10(acorn@8.17.0) + '@jridgewell/sourcemap-codec': 1.6.0 + '@sveltejs/acorn-typescript': 1.0.13(acorn@8.18.0) '@types/estree': 1.0.9 - '@types/trusted-types': 2.0.7 - acorn: 8.17.0 + acorn: 8.18.0 aria-query: 5.3.1 axobject-query: 4.1.0 clsx: 2.1.1 - devalue: 5.8.1 + devalue: 5.9.2 esm-env: 1.2.2 - esrap: 2.2.11 + esrap: 2.3.7 is-reference: 3.0.3 locate-character: 3.0.0 magic-string: 0.30.21 - zimmerframe: 1.1.4 + zimmerframe: 1.1.5 transitivePeerDependencies: - '@typescript-eslint/types' @@ -2059,10 +2074,10 @@ snapshots: optionalDependencies: vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) - vitest-browser-svelte@2.1.1(svelte@5.56.3)(vitest@4.1.11): + vitest-browser-svelte@2.1.1(svelte@5.57.0)(vitest@4.1.11): dependencies: - '@testing-library/svelte-core': 1.0.0(svelte@5.56.3) - svelte: 5.56.3 + '@testing-library/svelte-core': 1.0.0(svelte@5.57.0) + svelte: 5.57.0 vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) vitest@4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)): @@ -2124,4 +2139,4 @@ snapshots: yargs-parser: 21.1.1 optional: true - zimmerframe@1.1.4: {} + zimmerframe@1.1.5: {} From c4371fa53858d6ad89bb866366d5a05ae1cbeae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:27:07 +0000 Subject: [PATCH 052/250] chore(deps): bump modernc.org/sqlite from 1.49.1 to 1.59.0 Bumps [modernc.org/sqlite](https://gitlab.com/cznic/sqlite) from 1.49.1 to 1.59.0. - [Changelog](https://gitlab.com/cznic/sqlite/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/cznic/sqlite/compare/v1.49.1...v1.59.0) --- updated-dependencies: - dependency-name: modernc.org/sqlite dependency-version: 1.59.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index b7741ca6..5228dacc 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( golang.org/x/image v0.45.0 golang.org/x/oauth2 v0.37.0 golang.org/x/text v0.42.0 - modernc.org/sqlite v1.49.1 + modernc.org/sqlite v1.59.0 ) require ( @@ -22,7 +22,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/google/jsonschema-go v0.4.3 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/mattn/go-isatty v0.0.21 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/mfridman/interpolate v0.0.2 // indirect github.com/ncruces/go-strftime v1.0.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect @@ -34,7 +34,7 @@ require ( golang.org/x/sync v0.23.0 // indirect golang.org/x/sys v0.48.0 // indirect golang.org/x/time v0.15.0 // indirect - modernc.org/libc v1.72.1 // indirect + modernc.org/libc v1.75.7 // indirect modernc.org/mathutil v1.7.1 // indirect - modernc.org/memory v1.11.0 // indirect + modernc.org/memory v1.12.1 // indirect ) diff --git a/go.sum b/go.sum index 25d90611..bdfc41fd 100644 --- a/go.sum +++ b/go.sum @@ -12,16 +12,16 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/jsonschema-go v0.4.3 h1:/DBOLZTfDow7pe2GmaJNhltueGTtDKICi8V8p+DQPd0= github.com/google/jsonschema-go v0.4.3/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE= -github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= -github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 h1:LMLX+LgTNWpfvCBdFebv6EsYotImrt/Ppc5cXIriCSo= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs= -github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY= github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= github.com/modelcontextprotocol/go-sdk v1.8.0 h1:KIvahhYqwtbeniWVPs3TcXEA7b8jEtwfBpOTAI+Urx4= @@ -70,30 +70,30 @@ golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -modernc.org/cc/v4 v4.28.1 h1:XpLbkYVQ24E8tX5u8+yWGvaxerxkR/S4zqxI8ZoSBuc= -modernc.org/cc/v4 v4.28.1/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= -modernc.org/ccgo/v4 v4.33.0 h1:dspBCm75jsj8Y/ufwAMVfe375L2iYdMyQ2QG/v3hL54= -modernc.org/ccgo/v4 v4.33.0/go.mod h1:+RhXBoRYzRwaH21mV/aj6XvQRDtfjcZfAlPMsQo8CR0= +modernc.org/cc/v4 v4.29.2 h1:h6+9ciCnPKutf4I03CvheAvDLX7+IHlqR6Iy6J+cgd8= +modernc.org/cc/v4 v4.29.2/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= +modernc.org/ccgo/v4 v4.35.0 h1:F+TUsmw09QxLzmi3aeYYGxjAXarmZaKgj3mKQHNaA8w= +modernc.org/ccgo/v4 v4.35.0/go.mod h1:qrVGs9S3Sr2Ztcg9ve+kTAYMp5a3YvWjo+SoN06kJ5I= modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= -modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo= -modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/gc/v3 v3.1.5 h1:21ldfPfRYE31Tb7B3mwAK8gy1AxP4+dKjrOQPfqakoc= +modernc.org/gc/v3 v3.1.5/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= -modernc.org/libc v1.72.1 h1:db1xwJ6u1kE3KHTFTTbe2GCrczHPKzlURP0aDC4NGD0= -modernc.org/libc v1.72.1/go.mod h1:HRMiC/PhPGLIPM7GzAFCbI+oSgE3dhZ8FWftmRrHVlY= +modernc.org/libc v1.75.7 h1:o3DTP9/0p9pKmY2WCKQaySW6wIiZhNM7wc2lUoyhfew= +modernc.org/libc v1.75.7/go.mod h1:bO5o2ztHxBb2rjz0PgdHN0sSMw57CgxGFLZ3Qd/QpVQ= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= -modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= -modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/memory v1.12.1 h1:nFMiWrpStgZczNl6XI9GnIk/rWhYIyHGUaR04pGbp9g= +modernc.org/memory v1.12.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg= modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.49.1 h1:dYGHTKcX1sJ+EQDnUzvz4TJ5GbuvhNJa8Fg6ElGx73U= -modernc.org/sqlite v1.49.1/go.mod h1:m0w8xhwYUVY3H6pSDwc3gkJ/irZT/0YEXwBlhaxQEew= +modernc.org/sqlite v1.59.0 h1:X1es1GpqBlS/5T+vbM4HLUdaa8OtQx468DF2vrx+38A= +modernc.org/sqlite v1.59.0/go.mod h1:+paeT2A3iPRHkQDwG7oA6Tk0zQd5woMEI8q7orfry8k= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= From 1a9fce347074a2896b8d3da45fb3b48f91b23147 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Mon, 21 Sep 2026 10:30:56 +0200 Subject: [PATCH 053/250] fix(mailer): pass relay configuration explicitly through mailer setup --- .env.example | 2 + DEPLOY.md | 3 +- docs/ARCHITECTURE.md | 1 + internal/config/config.go | 36 +++++---- internal/config/smtp_relay_test.go | 13 +++ internal/handler/email_settings.go | 45 ++++++++--- internal/handler/handler.go | 2 + internal/mailer/smtp.go | 5 +- internal/mailer/smtp_dial_test.go | 2 +- internal/mailer/smtp_relay_test.go | 123 ++++++++++++++++++++--------- internal/mailer/smtp_test.go | 6 +- internal/server/server.go | 12 +-- internal/server/smtp_relay_test.go | 107 +++++++++++++++++++++++++ 13 files changed, 281 insertions(+), 76 deletions(-) create mode 100644 internal/config/smtp_relay_test.go create mode 100644 internal/server/smtp_relay_test.go diff --git a/.env.example b/.env.example index 978db08e..90ff278b 100644 --- a/.env.example +++ b/.env.example @@ -60,6 +60,8 @@ MICROSOFT_TENANT=common # SMTP (optional — emails are skipped if not set) EMAIL_SMTP_HOST= EMAIL_SMTP_PORT=587 +EMAIL_SMTP_CONNECT_HOST= +EMAIL_SMTP_CONNECT_PORT= EMAIL_SMTP_USER= EMAIL_SMTP_PASS= EMAIL_FROM_ADDRESS=bookings@localhost diff --git a/DEPLOY.md b/DEPLOY.md index f18a4746..9956f710 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -30,6 +30,7 @@ This guide covers a generic Docker deploy and a step-by-step **Railway** deploy | `DATABASE_URL` | no | `sqlite://./data/calnode.db` | Point at the persistent volume, e.g. `sqlite:///data/calnode.db`. | | `PORT` | no | `3000` | The app listens on `$PORT`. Many platforms inject their own (Railway injects `8080`) — let them. | | `EMAIL_SMTP_HOST` / `_PORT` / `_USER` / `_PASS` | no¹ | — / `587` | SMTP. Can also be set later in Settings → Email (DB-stored, encrypted). | +| `EMAIL_SMTP_CONNECT_HOST` / `EMAIL_SMTP_CONNECT_PORT` | no | SMTP host / port | TCP relay address, loaded at startup. Applies to environment and database SMTP settings; TLS and authentication still use the SMTP host. | | `EMAIL_SMTP_TLS` / `_STARTTLS` | no | `false` | `STARTTLS` for 587, implicit `TLS` for 465. | | `EMAIL_FROM_ADDRESS` / `EMAIL_FROM_NAME` | no | `bookings@localhost` / `Calnode` | The From identity. | | `GOOGLE_CLIENT_ID` / `GOOGLE_CLIENT_SECRET` | no | — | Google sign-in + calendar. Can also be set in Settings → Google OAuth. | @@ -357,4 +358,4 @@ first event type + availability. ### SMTP through a TCP relay -Set `EMAIL_SMTP_CONNECT_HOST` and `EMAIL_SMTP_CONNECT_PORT` to dial a TCP relay instead of the configured SMTP address. Each unset value falls back to the SMTP host or port. The original SMTP host remains the TLS server name and authentication identity; certificate verification stays enabled. These overrides apply to both environment and database SMTP settings. The relay must forward the SMTP connection without terminating TLS. +Set `EMAIL_SMTP_CONNECT_HOST` and `EMAIL_SMTP_CONNECT_PORT` to dial a TCP relay instead of the configured SMTP address. Each unset value falls back to the SMTP host or port. The original SMTP host remains the TLS server name and authentication identity; certificate verification stays enabled. These overrides are loaded at startup and apply to both environment and database SMTP settings, including settings reloads and test emails. Restart after changing the relay environment variables. An active relay is logged when the SMTP mailer is configured. The relay must forward the SMTP connection without terminating TLS. diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index b870dfc6..5a51f6a8 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -643,6 +643,7 @@ as the desired state: genuinely broken SMTP config. Explicit credentials state intent. `GET /v1/settings/email` returns the live `transport`, and the admin UI badges it, so filled-in SMTP fields are never mistaken for SMTP delivery. +- **TCP relay:** `EMAIL_SMTP_CONNECT_HOST` / `EMAIL_SMTP_CONNECT_PORT` are loaded by `internal/config` and passed through `SMTPConfig` / `BuildMailer` at boot and settings reload. They change only the dial address; TLS and authentication keep the original SMTP host. Active overrides are logged. - **The dial must stay bounded.** `defaultSMTPTimeout` once applied only via `conn.SetDeadline`, which runs *after* the dial returns, leaving the dial itself bounded by the OS SYN-retry limit (~2 min). Against a packet-dropping host that stalls the job diff --git a/internal/config/config.go b/internal/config/config.go index bf63157e..6cb178e3 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -20,14 +20,16 @@ type Config struct { LogLevel slog.Level // Email / SMTP - SMTPHost string - SMTPPort string - SMTPUser string - SMTPPass string - SMTPTLS bool // implicit TLS (port 465) - SMTPStartTLS bool // STARTTLS (port 587) - EmailFrom string - EmailFromName string + SMTPConnectHost string + SMTPConnectPort string + SMTPHost string + SMTPPort string + SMTPUser string + SMTPPass string + SMTPTLS bool // implicit TLS (port 465) + SMTPStartTLS bool // STARTTLS (port 587) + EmailFrom string + EmailFromName string // Google OAuth (calendar + sign-in) GoogleClientID string @@ -108,14 +110,16 @@ func Load() *Config { DatabaseURL: getEnv("DATABASE_URL", "sqlite://./data/calnode.db"), BaseURL: getEnv("BASE_URL", "http://localhost:3000"), - SMTPHost: getEnv("EMAIL_SMTP_HOST", ""), - SMTPPort: getEnv("EMAIL_SMTP_PORT", "587"), - SMTPUser: getEnv("EMAIL_SMTP_USER", ""), - SMTPPass: getEnv("EMAIL_SMTP_PASS", ""), - SMTPTLS: getBool("EMAIL_SMTP_TLS", false), - SMTPStartTLS: getBool("EMAIL_SMTP_STARTTLS", false), - EmailFrom: getEnv("EMAIL_FROM_ADDRESS", "bookings@localhost"), - EmailFromName: getEnv("EMAIL_FROM_NAME", "Calnode"), + SMTPConnectHost: getEnv("EMAIL_SMTP_CONNECT_HOST", ""), + SMTPConnectPort: getEnv("EMAIL_SMTP_CONNECT_PORT", ""), + SMTPHost: getEnv("EMAIL_SMTP_HOST", ""), + SMTPPort: getEnv("EMAIL_SMTP_PORT", "587"), + SMTPUser: getEnv("EMAIL_SMTP_USER", ""), + SMTPPass: getEnv("EMAIL_SMTP_PASS", ""), + SMTPTLS: getBool("EMAIL_SMTP_TLS", false), + SMTPStartTLS: getBool("EMAIL_SMTP_STARTTLS", false), + EmailFrom: getEnv("EMAIL_FROM_ADDRESS", "bookings@localhost"), + EmailFromName: getEnv("EMAIL_FROM_NAME", "Calnode"), GoogleClientID: getEnv("GOOGLE_CLIENT_ID", ""), GoogleClientSecret: getEnv("GOOGLE_CLIENT_SECRET", ""), diff --git a/internal/config/smtp_relay_test.go b/internal/config/smtp_relay_test.go new file mode 100644 index 00000000..ebb9d540 --- /dev/null +++ b/internal/config/smtp_relay_test.go @@ -0,0 +1,13 @@ +package config + +import "testing" + +func TestLoadSMTPConnectAddress(t *testing.T) { + t.Setenv("EMAIL_SMTP_HOST", "smtp.example.com") + t.Setenv("EMAIL_SMTP_CONNECT_HOST", "relay.example.com") + t.Setenv("EMAIL_SMTP_CONNECT_PORT", "2525") + cfg := Load() + if cfg.SMTPHost != "smtp.example.com" || cfg.SMTPConnectHost != "relay.example.com" || cfg.SMTPConnectPort != "2525" { + t.Fatal("SMTP identity and relay address were not loaded separately") + } +} diff --git a/internal/handler/email_settings.go b/internal/handler/email_settings.go index b8adc731..80a13bc7 100644 --- a/internal/handler/email_settings.go +++ b/internal/handler/email_settings.go @@ -6,6 +6,7 @@ import ( "encoding/json" "errors" "fmt" + "net" "net/http" "strconv" "time" @@ -17,14 +18,16 @@ import ( // SMTPConfig holds decrypted email settings loaded from the DB. // Used by server.go to build the initial mailer on startup. type SMTPConfig struct { - Host string - Port string - User string - Pass string - TLS bool - StartTLS bool - From string - FromName string + ConnectHost string + ConnectPort string + Host string + Port string + User string + Pass string + TLS bool + StartTLS bool + From string + FromName string // ResendAPIKey, when set, switches delivery to Resend's HTTPS API instead of SMTP. ResendAPIKey string @@ -40,6 +43,28 @@ const ( TransportSMTP EmailTransport = "smtp" ) +func (h *Handler) SetSMTPConnectAddress(host, port string) { + h.smtpConnectHost = host + h.smtpConnectPort = port +} + +func (h *Handler) BuildMailer(cfg SMTPConfig) (mailer.Mailer, EmailTransport) { + cfg.ConnectHost = h.smtpConnectHost + cfg.ConnectPort = h.smtpConnectPort + m, transport := BuildMailer(cfg) + if transport == TransportSMTP && (cfg.ConnectHost != "" || cfg.ConnectPort != "") { + host, port := cfg.ConnectHost, cfg.ConnectPort + if host == "" { + host = cfg.Host + } + if port == "" { + port = cfg.Port + } + h.logger.Info("mailer: SMTP relay active", "connect_address", net.JoinHostPort(host, port), "smtp_host", cfg.Host) + } + return m, transport +} + // BuildMailer picks the delivery transport for a config, and is the single place that // decision is made - both boot and the settings-save path call it, so they cannot drift. // @@ -57,7 +82,7 @@ func BuildMailer(cfg SMTPConfig) (mailer.Mailer, EmailTransport) { case cfg.ResendAPIKey != "": return mailer.NewResend(cfg.ResendAPIKey, cfg.From, cfg.FromName), TransportResend case cfg.Host != "": - return mailer.NewSMTP(cfg.Host, cfg.Port, cfg.User, cfg.Pass, + return mailer.NewSMTP(cfg.Host, cfg.Port, cfg.ConnectHost, cfg.ConnectPort, cfg.User, cfg.Pass, cfg.TLS, cfg.StartTLS, cfg.From, cfg.FromName), TransportSMTP default: return &mailer.Noop{}, TransportNone @@ -311,7 +336,7 @@ func (h *Handler) PatchEmailSettings(w http.ResponseWriter, r *http.Request) { if cfg == nil { h.live.Swap(&mailer.Noop{}) } else { - m, transport := BuildMailer(*cfg) + m, transport := h.BuildMailer(*cfg) h.live.Swap(m) h.logger.InfoContext(r.Context(), "mailer: reconfigured", "transport", string(transport)) } diff --git a/internal/handler/handler.go b/internal/handler/handler.go index 6adbb088..05898e14 100644 --- a/internal/handler/handler.go +++ b/internal/handler/handler.go @@ -25,6 +25,8 @@ type Handler struct { logger *slog.Logger bookingSvc *booking.Service mailer mailer.Mailer + smtpConnectHost string + smtpConnectPort string live *mailer.Live // non-nil in production; nil in tests using a direct stub encKey [32]byte // AES-256 key for encrypting secrets stored in the DB calMu sync.RWMutex diff --git a/internal/mailer/smtp.go b/internal/mailer/smtp.go index 3f9a4637..b15e5511 100644 --- a/internal/mailer/smtp.go +++ b/internal/mailer/smtp.go @@ -11,7 +11,6 @@ import ( "net" "net/mail" "net/smtp" - "os" "strings" "time" @@ -51,12 +50,10 @@ type SMTP struct { // NewSMTP constructs an SMTP sender. implicitTLS selects port-465 mode; // startTLS selects port-587 STARTTLS mode. Both false means plain SMTP // (suitable for a local relay on port 25). -func NewSMTP(host, port, username, password string, implicitTLS, startTLS bool, from, fromName string) *SMTP { - connectHost := os.Getenv("EMAIL_SMTP_CONNECT_HOST") +func NewSMTP(host, port, connectHost, connectPort, username, password string, implicitTLS, startTLS bool, from, fromName string) *SMTP { if connectHost == "" { connectHost = host } - connectPort := os.Getenv("EMAIL_SMTP_CONNECT_PORT") if connectPort == "" { connectPort = port } diff --git a/internal/mailer/smtp_dial_test.go b/internal/mailer/smtp_dial_test.go index 2c32bdd0..90bbbe6a 100644 --- a/internal/mailer/smtp_dial_test.go +++ b/internal/mailer/smtp_dial_test.go @@ -43,7 +43,7 @@ func TestSend_unreachableHostFailsPromptly(t *testing.T) { defaultSMTPTimeout = 500 * time.Millisecond t.Cleanup(func() { defaultSMTPTimeout = orig }) - s := NewSMTP("203.0.113.1", "587", "user", "pass", false, true, "from@example.com", "From") + s := NewSMTP("203.0.113.1", "587", "", "", "user", "pass", false, true, "from@example.com", "From") done := make(chan error, 1) start := time.Now() diff --git a/internal/mailer/smtp_relay_test.go b/internal/mailer/smtp_relay_test.go index 99841a92..333a06ed 100644 --- a/internal/mailer/smtp_relay_test.go +++ b/internal/mailer/smtp_relay_test.go @@ -1,52 +1,103 @@ package mailer import ( + "bufio" "context" "crypto/tls" "errors" + "fmt" "net" + "strings" "testing" "time" ) func TestSMTPRelayPreservesTLSIdentity(t *testing.T) { - listener, err := net.Listen("tcp", "127.0.0.1:0") - if err != nil { - t.Fatal(err) + for _, startTLS := range []bool{false, true} { + t.Run(fmt.Sprintf("startTLS=%v", startTLS), func(t *testing.T) { + listener, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + defer listener.Close() + host, port, err := net.SplitHostPort(listener.Addr().String()) + if err != nil { + t.Fatal(err) + } + names := make(chan string, 1) + serverResult := make(chan error, 1) + go func() { + conn, err := listener.Accept() + if err != nil { + serverResult <- err + return + } + defer conn.Close() + if err := conn.SetDeadline(time.Now().Add(3 * time.Second)); err != nil { + serverResult <- err + return + } + if startTLS { + reader := bufio.NewReader(conn) + for _, step := range []struct{ reply, command string }{ + {"220 smtp.example.com ready\r\n", "EHLO "}, + {"250-smtp.example.com\r\n250 STARTTLS\r\n", "STARTTLS\r\n"}, + } { + if _, err := fmt.Fprint(conn, step.reply); err != nil { + serverResult <- err + return + } + line, err := reader.ReadString('\n') + if err != nil || !strings.HasPrefix(line, step.command) { + serverResult <- fmt.Errorf("command %q: %v", line, err) + return + } + } + if _, err := fmt.Fprint(conn, "220 begin TLS\r\n"); err != nil { + serverResult <- err + return + } + } + server := tls.Server(conn, &tls.Config{GetConfigForClient: func(hello *tls.ClientHelloInfo) (*tls.Config, error) { + names <- hello.ServerName + return nil, errors.New("test rejects TLS handshake") + }}) + if err := server.Handshake(); err == nil { + serverResult <- errors.New("handshake unexpectedly succeeded") + return + } + serverResult <- nil + }() + sender := NewSMTP("smtp.example.com", "465", host, port, "", "", !startTLS, startTLS, "from@example.com", "Test") + ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second) + defer cancel() + if err := sender.Send(ctx, Message{To: []string{"to@example.com"}, Subject: "test"}); err == nil { + t.Fatal("accepted a rejected TLS handshake") + } + select { + case name := <-names: + if name != "smtp.example.com" { + t.Fatalf("TLS server name = %q", name) + } + case <-ctx.Done(): + t.Fatal("did not connect to relay") + } + if err := <-serverResult; err != nil { + t.Fatal(err) + } + }) } - defer listener.Close() - host, port, err := net.SplitHostPort(listener.Addr().String()) - if err != nil { - t.Fatal(err) - } - t.Setenv("EMAIL_SMTP_CONNECT_HOST", host) - t.Setenv("EMAIL_SMTP_CONNECT_PORT", port) - names := make(chan string, 1) - go func() { - conn, err := listener.Accept() - if err != nil { - return - } - defer conn.Close() - conn.SetDeadline(time.Now().Add(3 * time.Second)) - server := tls.Server(conn, &tls.Config{GetConfigForClient: func(hello *tls.ClientHelloInfo) (*tls.Config, error) { - names <- hello.ServerName - return nil, errors.New("test rejects TLS handshake") - }}) - _ = server.Handshake() - }() - sender := NewSMTP("smtp.example.com", "465", "", "", true, false, "from@example.com", "Test") - ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second) - defer cancel() - if err := sender.Send(ctx, Message{To: []string{"to@example.com"}, Subject: "test"}); err == nil { - t.Fatal("accepted a rejected TLS handshake") - } - select { - case name := <-names: - if name != "smtp.example.com" { - t.Fatalf("TLS server name = %q", name) +} + +func TestSMTPConnectAddressDefaults(t *testing.T) { + for _, tc := range []struct{ host, port, wantHost, wantPort string }{ + {"", "", "smtp.example.com", "465"}, + {"relay.example.com", "", "relay.example.com", "465"}, + {"", "2525", "smtp.example.com", "2525"}, + } { + s := NewSMTP("smtp.example.com", "465", tc.host, tc.port, "", "", true, false, "from@example.com", "Test") + if s.connectHost != tc.wantHost || s.connectPort != tc.wantPort { + t.Fatalf("connect address = %s:%s, want %s:%s", s.connectHost, s.connectPort, tc.wantHost, tc.wantPort) } - case <-ctx.Done(): - t.Fatal("did not connect to relay") } } diff --git a/internal/mailer/smtp_test.go b/internal/mailer/smtp_test.go index 9b8fbf8b..1421172f 100644 --- a/internal/mailer/smtp_test.go +++ b/internal/mailer/smtp_test.go @@ -36,7 +36,7 @@ func TestSMTP_Send_timesOutOnUnresponsiveServer(t *testing.T) { t.Fatalf("split addr: %v", err) } - s := NewSMTP(host, port, "", "", false, false, "from@test.local", "Test") + s := NewSMTP(host, port, "", "", "", "", false, false, "from@test.local", "Test") // A short ctx deadline, not defaultSMTPTimeout's 30s, keeps this test fast — Send picks // whichever deadline is earlier, so this proves ctx is actually honoured end-to-end, not @@ -83,7 +83,7 @@ func TestSMTP_Send_appliesDefaultTimeoutWithNoCtxDeadline(t *testing.T) { t.Fatalf("split addr: %v", err) } - s := NewSMTP(host, port, "", "", false, false, "from@test.local", "Test") + s := NewSMTP(host, port, "", "", "", "", false, false, "from@test.local", "Test") start := time.Now() // No deadline on this ctx at all — must still fall back to defaultSMTPTimeout. @@ -129,7 +129,7 @@ func TestSMTP_Send_invalidRecipientNeverDials(t *testing.T) { if err != nil { t.Fatalf("split addr: %v", err) } - s := NewSMTP(host, port, "", "", false, false, "from@test.local", "Test") + s := NewSMTP(host, port, "", "", "", "", false, false, "from@test.local", "Test") err = s.Send(context.Background(), Message{ To: []string{"a@b.example\r\nBcc: attacker@example.com"}, diff --git a/internal/server/server.go b/internal/server/server.go index d8e46b73..882d6804 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -49,6 +49,7 @@ func BuildHandler(ctx context.Context, cfg *config.Config, db *sql.DB, logger *s } h.SetDataDir(dataDir) h.SetEncKey(cfg.EncryptionKey) + h.SetSMTPConnectAddress(cfg.SMTPConnectHost, cfg.SMTPConnectPort) h.SetDemoMode(cfg.DemoMode) h.SetDemoResetInterval(cfg.DemoResetInterval) @@ -96,16 +97,17 @@ func BuildHandler(ctx context.Context, cfg *config.Config, db *sql.DB, logger *s case dbSMTP != nil: // BuildMailer, not NewSMTP directly, so boot and the settings-save path pick the // transport by the same rule. A Resend API key here means HTTPS delivery. - m, transport := handler.BuildMailer(*dbSMTP) + m, transport := h.BuildMailer(*dbSMTP) live.Swap(m) logger.Info("mailer: configured from database", "transport", string(transport), "host", dbSMTP.Host, "port", dbSMTP.Port) case cfg.SMTPHost != "": - live.Swap(mailer.NewSMTP( - cfg.SMTPHost, cfg.SMTPPort, cfg.SMTPUser, cfg.SMTPPass, - cfg.SMTPTLS, cfg.SMTPStartTLS, cfg.EmailFrom, cfg.EmailFromName, - )) + m, _ := h.BuildMailer(handler.SMTPConfig{ + Host: cfg.SMTPHost, Port: cfg.SMTPPort, User: cfg.SMTPUser, Pass: cfg.SMTPPass, + TLS: cfg.SMTPTLS, StartTLS: cfg.SMTPStartTLS, From: cfg.EmailFrom, FromName: cfg.EmailFromName, + }) + live.Swap(m) logger.Info("mailer: configured from environment", "host", cfg.SMTPHost, "port", cfg.SMTPPort) // Seed env-var settings into DB so they appear in the UI on first boot. seedSMTPToDB(db, cfg, encKey, logger) diff --git a/internal/server/smtp_relay_test.go b/internal/server/smtp_relay_test.go new file mode 100644 index 00000000..fcc6be09 --- /dev/null +++ b/internal/server/smtp_relay_test.go @@ -0,0 +1,107 @@ +package server + +import ( + "bytes" + "context" + "crypto/tls" + "encoding/json" + "errors" + "fmt" + "log/slog" + "net" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" + + "github.com/calnode/calnode/internal/config" + "github.com/calnode/calnode/internal/db" + "github.com/calnode/calnode/internal/handler" +) + +func TestSMTPRelayAtBootAndSettingsReload(t *testing.T) { + for _, stored := range []bool{false, true} { + t.Run(fmt.Sprintf("stored=%v", stored), func(t *testing.T) { + names := make(chan string, 2) + relay := httptest.NewUnstartedServer(http.NotFoundHandler()) + relay.TLS = &tls.Config{GetConfigForClient: func(hello *tls.ClientHelloInfo) (*tls.Config, error) { + names <- hello.ServerName + return nil, errors.New("test rejects handshake") + }} + relay.StartTLS() + defer relay.Close() + host, port, err := net.SplitHostPort(relay.Listener.Addr().String()) + if err != nil { + t.Fatal(err) + } + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + var logs bytes.Buffer + logger := slog.New(slog.NewTextHandler(&logs, nil)) + seed := handler.New(database, logger) + rec := httptest.NewRecorder() + seed.Setup(rec, httptest.NewRequest(http.MethodPost, "/v1/setup", strings.NewReader(`{"name":"Host","email":"host@example.com","timezone":"UTC"}`))) + if rec.Code != http.StatusCreated { + t.Fatalf("setup: %d %s", rec.Code, rec.Body) + } + var identity struct { + APIKey string `json:"api_key"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &identity); err != nil { + t.Fatal(err) + } + patch := func(h *handler.Handler, smtpHost string) { + t.Helper() + req := httptest.NewRequest(http.MethodPatch, "/v1/settings/email", strings.NewReader(fmt.Sprintf(`{"smtp_host":%q,"smtp_port":"465","smtp_tls":true,"from_address":"from@example.com"}`, smtpHost))) + req.Header.Set("Authorization", "Bearer "+identity.APIKey) + rec := httptest.NewRecorder() + h.RequireAuth(h.PatchEmailSettings)(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("settings: %d %s", rec.Code, rec.Body) + } + } + if stored { + patch(seed, "smtp.example.com") + } + ctx, cancel := context.WithCancel(t.Context()) + h, drain := BuildHandler(ctx, &config.Config{ + BaseURL: "https://calnode.localhost", DataDir: t.TempDir(), + SMTPHost: "smtp.example.com", SMTPPort: "465", SMTPTLS: true, + EmailFrom: "from@example.com", SMTPConnectHost: host, SMTPConnectPort: port, + }, database, logger) + defer func() { cancel(); drain() }() + for _, smtpHost := range []string{"smtp.example.com", "updated.example.com"} { + if smtpHost == "updated.example.com" { + patch(h, smtpHost) + } + req := httptest.NewRequest(http.MethodPost, "/v1/settings/email/test", nil) + req.Header.Set("Authorization", "Bearer "+identity.APIKey) + rec := httptest.NewRecorder() + h.RequireAuth(h.TestEmailConnection)(rec, req) + if rec.Code != http.StatusInternalServerError { + t.Fatalf("test email: %d %s", rec.Code, rec.Body) + } + select { + case name := <-names: + if name != smtpHost { + t.Fatalf("TLS name = %q, want %q", name, smtpHost) + } + case <-time.After(time.Second): + t.Fatal("test email did not reach relay") + } + } + cancel() + drain() + if !strings.Contains(logs.String(), "SMTP relay active") || !strings.Contains(logs.String(), relay.Listener.Addr().String()) { + t.Fatal("relay configuration was not logged") + } + }) + } +} From 47cef772ffb2a583b52cde9797d465b7818e7edf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:31:22 +0000 Subject: [PATCH 054/250] chore(deps-dev): bump @lucide/svelte from 1.20.0 to 1.47.0 in /frontend Bumps [@lucide/svelte](https://github.com/lucide-icons/lucide/tree/HEAD/packages/svelte) from 1.20.0 to 1.47.0. - [Release notes](https://github.com/lucide-icons/lucide/releases) - [Commits](https://github.com/lucide-icons/lucide/commits/1.47.0/packages/svelte) --- updated-dependencies: - dependency-name: "@lucide/svelte" dependency-version: 1.47.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 166f9420..6b0ee81f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@internationalized/date": "^3.12.2", - "@lucide/svelte": "^1.20.0", + "@lucide/svelte": "^1.47.0", "@sveltejs/adapter-static": "^3.0.10", "@sveltejs/kit": "^2.70.2", "@sveltejs/vite-plugin-svelte": "^7.1.2", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 7bd3e765..9d39888d 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -25,8 +25,8 @@ importers: specifier: ^3.12.2 version: 3.12.2 '@lucide/svelte': - specifier: ^1.20.0 - version: 1.20.0(svelte@5.57.0) + specifier: ^1.47.0 + version: 1.47.0(svelte@5.57.0) '@sveltejs/adapter-static': specifier: ^3.0.10 version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))) @@ -165,8 +165,8 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@lucide/svelte@1.20.0': - resolution: {integrity: sha512-s7TKCHEtFEfflOUDPRC0WBZEjoNJHtj/aUmuWxopFe3AKecEoKvMmCaO0sBDkflok8nR0BCFsm44QF+S6/gc+w==} + '@lucide/svelte@1.47.0': + resolution: {integrity: sha512-tpuE7JIK9FzYDWsJx6PxHj9ROyCpnDxZfvHu5q5yHGKS2CFNjzSyf1o9/Ypu2A27GLvkPGqZcIMrF6idM+eQZQ==} peerDependencies: svelte: ^5 @@ -1261,7 +1261,7 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.6.0 - '@lucide/svelte@1.20.0(svelte@5.57.0)': + '@lucide/svelte@1.47.0(svelte@5.57.0)': dependencies: svelte: 5.57.0 From f909ee2c862e3f39f6c7651aa7373736e71ce46a Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Mon, 21 Sep 2026 10:32:27 +0200 Subject: [PATCH 055/250] fix(booking): align calendar checks and distinguish provider failures --- docs/ARCHITECTURE.md | 2 +- internal/handler/booking_assistant.go | 2 + internal/handler/booking_calendar_check.go | 28 +- .../handler/booking_calendar_check_test.go | 265 ++++++++++++++++-- .../handler/booking_calendar_error_test.go | 21 ++ internal/handler/booking_handler.go | 15 +- internal/handler/mcp.go | 2 + internal/handler/slots_handler.go | 51 ++-- 8 files changed, 327 insertions(+), 59 deletions(-) create mode 100644 internal/handler/booking_calendar_error_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index efcf4cfd..9f49b07f 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -399,7 +399,7 @@ them - the most common "why can't I see those times". ## 9. Booking lifecycle -New public and assistant bookings recheck selected external calendars before committing. This includes the event buffers and each required host; round-robin routing filters busy candidates and busy optional guests are omitted. A failed provider check rejects the request. The external check and database write cannot share a transaction. Rescheduling still uses the existing validation path. +New public and assistant bookings recheck selected external calendars before committing. This uses the same buffer orientation and own-event subtraction as the slots page and checks each required host; round-robin routing filters busy candidates and busy optional guests are omitted. A failed provider check rejects the request with HTTP 503 and a retry message; a busy slot returns HTTP 409. Assistant and MCP bookings keep the same distinction. The external check and database write cannot share a transaction. Rescheduling still uses the existing validation path. Google Meet and Teams event types can opt into `allow_phone_call`. Their booking page and widget then accept an optional `phone` value. A valid number selects a telephone appointment; leaving it empty preserves video. The booking stores its own location type so management pages, calendar retries, and paid confirmation do not generate a video link for a telephone appointment. Event duplication preserves the setting. diff --git a/internal/handler/booking_assistant.go b/internal/handler/booking_assistant.go index 4cbe5125..ae64b74c 100644 --- a/internal/handler/booking_assistant.go +++ b/internal/handler/booking_assistant.go @@ -433,6 +433,8 @@ func (h *Handler) runAssistantTool(ctx context.Context, slug, tz, lang, name, ar // the model can relay. func assistantBookError(err error) string { switch { + case errors.Is(err, errCalendarUnavailable): + return errCalendarUnavailable.Error() case errors.Is(err, errEventTypeNotFound): return "this event type is no longer available" case errors.Is(err, booking.ErrDoubleBooked), errors.Is(err, errNoHostAvailable), errors.Is(err, errSlotUnavailable): diff --git a/internal/handler/booking_calendar_check.go b/internal/handler/booking_calendar_check.go index 7f4e4089..f39d5d8a 100644 --- a/internal/handler/booking_calendar_check.go +++ b/internal/handler/booking_calendar_check.go @@ -2,9 +2,15 @@ package handler import ( "context" + "errors" + "fmt" "time" + + "github.com/calnode/calnode/internal/slots" ) +var errCalendarUnavailable = errors.New("calendar availability could not be checked; please try again shortly") + func (h *Handler) calendarFreeHosts(ctx context.Context, et *bookableEventType, candidates, required, optional []string, start, end time.Time) ([]string, []string, error) { gc := h.getCal() if gc == nil { @@ -12,20 +18,28 @@ func (h *Handler) calendarFreeHosts(ctx context.Context, et *bookableEventType, } ctx, cancel := context.WithTimeout(ctx, 15*time.Second) defer cancel() + window := slots.Interval{ + Start: start.Add(-time.Duration(et.BufferAfterMinutes) * time.Minute), + End: end.Add(time.Duration(et.BufferBeforeMinutes) * time.Minute), + } free := map[string]bool{} check := func(id string) (bool, error) { if ok, seen := free[id]; seen { return ok, nil } - busy, err := gc.FreeBusy(ctx, id, start.Add(-time.Duration(et.BufferBeforeMinutes)*time.Minute), end.Add(time.Duration(et.BufferAfterMinutes)*time.Minute)) + ownEvents, err := h.ownCalendarEvents(ctx, id, window.Start.Format(time.RFC3339Nano), window.End.Format(time.RFC3339Nano)) + if err != nil { + return false, fmt.Errorf("load own calendar events: %w", err) + } + busy, err := gc.FreeBusy(ctx, id, window.Start, window.End) if err != nil { - return false, err + return false, fmt.Errorf("%w: %w", errCalendarUnavailable, err) } - for _, iv := range busy { - if iv.Start.Before(end.Add(time.Duration(et.BufferAfterMinutes)*time.Minute)) && iv.End.After(start.Add(-time.Duration(et.BufferBeforeMinutes)*time.Minute)) { - free[id] = false - return false, nil - } + busy = slots.SubtractIntervals(busy, ownEvents) + remaining := slots.SubtractIntervals([]slots.Interval{window}, busy) + if len(remaining) != 1 || remaining[0] != window { + free[id] = false + return false, nil } free[id] = true return true, nil diff --git a/internal/handler/booking_calendar_check_test.go b/internal/handler/booking_calendar_check_test.go index 7d39f373..30cc7411 100644 --- a/internal/handler/booking_calendar_check_test.go +++ b/internal/handler/booking_calendar_check_test.go @@ -2,56 +2,271 @@ package handler_test import ( "context" + "database/sql" + "encoding/json" "errors" "fmt" - "github.com/calnode/calnode/internal/calendar" - "github.com/calnode/calnode/internal/slots" "net/http" "net/http/httptest" + "slices" "strings" "testing" "time" + + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/handler" + "github.com/calnode/calnode/internal/slots" + "github.com/modelcontextprotocol/go-sdk/mcp" ) type conflictCalendar struct { calendar.Provider - busy []slots.Interval - err error + name string + busy map[string][]slots.Interval + err error + calls int } -func (p conflictCalendar) Name() string { return "google" } -func (p conflictCalendar) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { - return p.busy, p.err +func (p *conflictCalendar) Name() string { return p.name } +func (p *conflictCalendar) FreeBusy(_ context.Context, id string, from, to time.Time) ([]slots.Interval, error) { + p.calls++ + var busy []slots.Interval + for _, iv := range p.busy[id] { + if iv.Start.Before(to) && iv.End.After(from) { + busy = append(busy, iv) + } + } + return busy, p.err +} + +func calendarCheckRequest(h *handler.Handler, slug string, start time.Time) *httptest.ResponseRecorder { + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(fmt.Sprintf(`{"event_type_slug":%q,"start_at":%q,"name":"Test","email":"test@example.com"}`, slug, start.Format(time.RFC3339)))) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + return rec } -func TestBookingRejectsExternalCalendarConflicts(t *testing.T) { +func calendarCheckExec(t *testing.T, database *sql.DB, query string, args ...any) { + t.Helper() + if _, err := database.Exec(query, args...); err != nil { + t.Fatal(err) + } +} + +func TestBookingCalendarHostSelection(t *testing.T) { start := time.Date(2026, 6, 15, 9, 0, 0, 0, time.UTC) for _, tc := range []struct { - name string - provider conflictCalendar + name, mode string + roles []string + busy []int + providerError bool + wantStatus int + wantHosts []int + }{ + {"required_busy", "fixed", []string{"required"}, []int{0}, false, 409, nil}, + {"provider_unavailable", "fixed", []string{"required"}, nil, true, 503, nil}, + {"rotation_filters_busy", "round_robin", []string{"rotation", "rotation"}, []int{0}, false, 201, []int{1}}, + {"all_rotation_busy", "round_robin", []string{"rotation", "rotation"}, []int{0, 1}, false, 409, nil}, + {"round_robin_required_busy", "round_robin", []string{"required", "rotation"}, []int{0}, false, 409, nil}, + {"round_robin_required_attends", "round_robin", []string{"required", "rotation"}, nil, false, 201, []int{0, 1}}, + {"collective_required_busy", "collective", []string{"required", "required"}, []int{1}, false, 409, nil}, + {"optional_busy_dropped", "fixed", []string{"required", "optional"}, []int{1}, false, 201, []int{0}}, + {"optional_free_attends", "fixed", []string{"required", "optional"}, nil, false, 201, []int{0, 1}}, + } { + t.Run(tc.name, func(t *testing.T) { + h, database, key, owner := setupWorkspaceWithDB(t) + slug, etID := seedEventTypeHTTP(t, h, key) + calendarCheckExec(t, database, `UPDATE event_types SET routing_mode = ? WHERE id = ?`, tc.mode, etID) + calendarCheckExec(t, database, `DELETE FROM event_type_hosts WHERE event_type_id = ?`, etID) + hosts := []string{owner} + for i, role := range tc.roles { + if i > 0 { + id := fmt.Sprintf("host-%d", i) + calendarCheckExec(t, database, `INSERT INTO users (id,email,name,iana_timezone) VALUES (?,?,?,'UTC')`, id, id+"@example.com", id) + seedFullAvailabilityDB(t, database, id) + hosts = append(hosts, id) + } + calendarCheckExec(t, database, `INSERT INTO event_type_hosts (id,event_type_id,user_id,role,priority) VALUES (?,?,?,?,?)`, fmt.Sprintf("seat-%d", i), etID, hosts[i], role, i) + } + provider := &conflictCalendar{name: "google", busy: map[string][]slots.Interval{}} + for _, i := range tc.busy { + provider.busy[hosts[i]] = []slots.Interval{{Start: start, End: start.Add(time.Hour)}} + } + if tc.providerError { + provider.err = errors.New("private provider diagnostic") + } + svc := calendar.NewService(database) + svc.Register(provider) + if tc.providerError { + svc.Register(&conflictCalendar{name: "other"}) + } + h.SetCalendar(svc) + rec := calendarCheckRequest(h, slug, start) + if rec.Code != tc.wantStatus { + t.Fatalf("status %d, want %d: %s", rec.Code, tc.wantStatus, rec.Body) + } + if provider.calls == 0 { + t.Fatal("booking did not check the provider") + } + if tc.providerError && (!strings.Contains(rec.Body.String(), "try again") || strings.Contains(rec.Body.String(), "private provider")) { + t.Fatalf("provider error not safely mapped: %s", rec.Body) + } + var count int + if err := database.QueryRow(`SELECT COUNT(*) FROM bookings`).Scan(&count); err != nil { + t.Fatal(err) + } + if tc.wantStatus != 201 { + if count != 0 { + t.Fatalf("created %d bookings after failed check", count) + } + return + } + if count != 1 { + t.Fatalf("created %d bookings", count) + } + rows, err := database.Query(`SELECT user_id FROM booking_hosts ORDER BY user_id`) + if err != nil { + t.Fatal(err) + } + defer rows.Close() + var got []string + for rows.Next() { + var id string + if err := rows.Scan(&id); err != nil { + t.Fatal(err) + } + got = append(got, id) + } + if err := rows.Err(); err != nil { + t.Fatal(err) + } + var want []string + for _, i := range tc.wantHosts { + want = append(want, hosts[i]) + } + slices.Sort(want) + if !slices.Equal(got, want) { + t.Fatalf("hosts = %v, want %v", got, want) + } + }) + } +} + +func TestBookingCalendarBuffersMatchSlots(t *testing.T) { + start := time.Date(2026, 6, 15, 9, 30, 0, 0, time.UTC) + for _, tc := range []struct { + name string + before, after, busyOffset int + wantFree bool }{ - {"busy", conflictCalendar{busy: []slots.Interval{{Start: start, End: start.Add(time.Hour)}}}}, - {"unavailable", conflictCalendar{err: errors.New("provider unavailable")}}, + {"before_blocks_later_event", 15, 0, 30, false}, + {"after_blocks_earlier_event", 0, 30, -45, false}, + {"before_allows_earlier_event", 15, 0, -30, true}, + {"after_allows_later_event", 0, 30, 45, true}, + {"before_touching_boundary", 15, 0, 45, true}, + {"after_touching_boundary", 0, 30, -60, true}, } { t.Run(tc.name, func(t *testing.T) { - h, database, key, _ := setupWorkspaceWithDB(t) + h, database, key, owner := setupWorkspaceWithDB(t) + slug, etID := seedEventTypeHTTP(t, h, key) + calendarCheckExec(t, database, `UPDATE event_types SET buffer_before_minutes = ?, buffer_after_minutes = ? WHERE id = ?`, tc.before, tc.after, etID) + busyStart := start.Add(time.Duration(tc.busyOffset) * time.Minute) + busy := []slots.Interval{{Start: busyStart, End: busyStart.Add(30 * time.Minute)}} + generated, err := slots.Generate(slots.Request{ + Event: slots.EventConfig{DurationMinutes: 30, SlotIntervalMinutes: 30, BufferBeforeMinutes: tc.before, BufferAfterMinutes: tc.after, RoutingMode: "fixed"}, + Hosts: []slots.HostAvailability{{HostID: owner, Location: time.UTC, Rules: []slots.AvailabilityRule{{DayOfWeek: time.Monday, StartTime: "00:00", EndTime: "23:59"}}, Busy: busy}}, + DateFrom: start, DateTo: start, BookerTZ: time.UTC, Now: start.Add(-24 * time.Hour), + }) + if err != nil { + t.Fatal(err) + } + offered := slices.ContainsFunc(generated, func(s slots.Slot) bool { return s.Start.Equal(start) }) + if offered != tc.wantFree { + t.Fatalf("slot offered = %v, want %v", offered, tc.wantFree) + } + svc := calendar.NewService(database) + svc.Register(&conflictCalendar{name: "google", busy: map[string][]slots.Interval{owner: busy}}) + h.SetCalendar(svc) + rec := calendarCheckRequest(h, slug, start) + want := http.StatusConflict + if offered { + want = http.StatusCreated + } + if rec.Code != want { + t.Fatalf("status %d, want %d: %s", rec.Code, want, rec.Body) + } + }) + } +} + +func TestBookingCalendarCancelledOwnEvent(t *testing.T) { + start := time.Date(2026, 6, 15, 9, 0, 0, 0, time.UTC) + for _, otherEvent := range []bool{false, true} { + t.Run(fmt.Sprintf("otherEvent=%v", otherEvent), func(t *testing.T) { + h, database, key, owner := setupWorkspaceWithDB(t) + slug, etID := seedEventTypeHTTP(t, h, key) + calendarCheckExec(t, database, `INSERT INTO bookings (id,event_type_id,host_id,start_at,end_at,status) VALUES ('cancelled',?,?,?,?,'cancelled')`, etID, owner, start.Add(-time.Hour).Format(time.RFC3339), start.Add(time.Hour).Format(time.RFC3339)) + calendarCheckExec(t, database, `INSERT INTO booking_hosts (booking_id,user_id,external_event_id) VALUES ('cancelled',?,'old-event')`, owner) + busyEnd := start.Add(time.Hour) + bookingStart := start + if otherEvent { + busyEnd = busyEnd.Add(30 * time.Minute) + bookingStart = start.Add(time.Hour) + } + svc := calendar.NewService(database) + svc.Register(&conflictCalendar{name: "google", busy: map[string][]slots.Interval{owner: {{Start: start.Add(-time.Hour), End: busyEnd}}}}) + h.SetCalendar(svc) + rec := calendarCheckRequest(h, slug, bookingStart) + want := http.StatusCreated + if otherEvent { + want = http.StatusConflict + } + if rec.Code != want { + t.Fatalf("status %d, want %d: %s", rec.Code, want, rec.Body) + } + }) + } +} + +func TestMCPBookingCalendarErrors(t *testing.T) { + start := time.Date(2026, 6, 15, 9, 0, 0, 0, time.UTC) + for _, outage := range []bool{false, true} { + t.Run(fmt.Sprintf("outage=%v", outage), func(t *testing.T) { + h, database, key, owner := setupWorkspaceWithDB(t) slug, _ := seedEventTypeHTTP(t, h, key) + provider := &conflictCalendar{name: "google", busy: map[string][]slots.Interval{owner: {{Start: start, End: start.Add(time.Hour)}}}} + want := "this slot is no longer available" + if outage { + provider.err = errors.New("private provider diagnostic") + want = "calendar availability could not be checked; please try again shortly" + } svc := calendar.NewService(database) - svc.Register(tc.provider) + svc.Register(provider) h.SetCalendar(svc) - req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T09:00:00Z","name":"Test","email":"test@example.com"}`, slug))) - req.Header.Set("Content-Type", "application/json") - rec := httptest.NewRecorder() - h.CreateBooking(rec, req) - if rec.Code != http.StatusConflict { - t.Fatalf("status %d: %s", rec.Code, rec.Body) - } - var n int - if err := database.QueryRow(`SELECT COUNT(*) FROM bookings`).Scan(&n); err != nil { + client := connectMCP(t, h) + result, err := client.CallTool(t.Context(), &mcp.CallToolParams{Name: "create_booking", Arguments: map[string]any{ + "event_type_id": slug, "slot_start": start.Format(time.RFC3339), "attendee_name": "Test", "attendee_email": "test@example.com", + }}) + if err != nil { + t.Fatal(err) + } + body, err := json.Marshal(result.Content) + if err != nil { + t.Fatal(err) + } + if !result.IsError || !strings.Contains(string(body), want) || strings.Contains(string(body), "private provider") { + t.Fatalf("MCP error: %s", body) + } + if provider.calls == 0 { + t.Fatal("MCP booking did not check the provider") + } + var count int + if err := database.QueryRow(`SELECT COUNT(*) FROM bookings`).Scan(&count); err != nil { t.Fatal(err) } - if n != 0 { - t.Fatalf("created %d bookings", n) + if count != 0 { + t.Fatalf("created %d bookings", count) } }) } diff --git a/internal/handler/booking_calendar_error_test.go b/internal/handler/booking_calendar_error_test.go new file mode 100644 index 00000000..878c0cd7 --- /dev/null +++ b/internal/handler/booking_calendar_error_test.go @@ -0,0 +1,21 @@ +package handler + +import ( + "errors" + "fmt" + "testing" +) + +func TestAssistantCalendarErrors(t *testing.T) { + for _, tc := range []struct { + err error + want string + }{ + {errSlotUnavailable, "that time was just taken — please choose another slot"}, + {fmt.Errorf("%w: %w", errCalendarUnavailable, errors.New("private provider diagnostic")), "calendar availability could not be checked; please try again shortly"}, + } { + if got := assistantBookError(tc.err); got != tc.want { + t.Fatalf("message = %q, want %q", got, tc.want) + } + } +} diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 3152adea..04dec0de 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -549,6 +549,9 @@ func (h *Handler) createBookingForSlug(ctx context.Context, slug string, startAt } candidates, optional, err = h.calendarFreeHosts(ctx, et, candidates, required, optional, startAt.UTC(), endAt) if err != nil { + if !errors.Is(err, errSlotUnavailable) { + h.logger.ErrorContext(ctx, "booking calendar check failed", "error", err) + } return nil, err } b, err := h.bookingSvc.Create(ctx, booking.CreateParams{ @@ -858,8 +861,16 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { candidates, optional, err = h.calendarFreeHosts(r.Context(), et, candidates, required, optional, startAt.UTC(), endAt) if err != nil { - h.logger.WarnContext(r.Context(), "booking calendar check rejected", "error", err) - h.writeError(w, http.StatusConflict, "this slot is no longer available; please select another time") + switch { + case errors.Is(err, errSlotUnavailable): + h.writeError(w, http.StatusConflict, "this slot is no longer available; please select another time") + case errors.Is(err, errCalendarUnavailable): + h.logger.ErrorContext(r.Context(), "booking calendar check failed", "error", err) + h.writeError(w, http.StatusServiceUnavailable, errCalendarUnavailable.Error()) + default: + h.logger.ErrorContext(r.Context(), "booking calendar check failed", "error", err) + h.writeError(w, http.StatusInternalServerError, "could not complete the booking") + } return } b, err := h.bookingSvc.Create(r.Context(), booking.CreateParams{ diff --git a/internal/handler/mcp.go b/internal/handler/mcp.go index d211727b..f7953a50 100644 --- a/internal/handler/mcp.go +++ b/internal/handler/mcp.go @@ -401,6 +401,8 @@ func (h *Handler) mcpCreateBooking(ctx context.Context, _ *mcp.CallToolRequest, booking.Attendee{Name: in.AttendeeName, Email: in.AttendeeEmail, IANATimezone: tz}, raw) if err != nil { switch { + case errors.Is(err, errCalendarUnavailable): + return nil, bookingJSON{}, errCalendarUnavailable case errors.Is(err, errEventTypeNotFound): return nil, bookingJSON{}, fmt.Errorf("event type not found: %s", in.EventTypeID) case errors.Is(err, booking.ErrDoubleBooked), errors.Is(err, errNoHostAvailable), errors.Is(err, errSlotUnavailable): diff --git a/internal/handler/slots_handler.go b/internal/handler/slots_handler.go index 52f094ef..d4eeef4f 100644 --- a/internal/handler/slots_handler.go +++ b/internal/handler/slots_handler.go @@ -464,33 +464,10 @@ func (h *Handler) hostAvailability(ctx context.Context, userID, eventTypeID stri // only while we believe a Google event still exists (it's cleared on a successful // cancel, inline or via the reconciler), so this targets exactly our own events. // Materialise fully before the free/busy call (single-connection pool). - var ownEvents []slots.Interval - ownRows, err := h.db.QueryContext(ctx, ` - SELECT b.start_at, b.end_at FROM bookings b - JOIN booking_hosts bh ON bh.booking_id = b.id - WHERE bh.user_id = ? AND COALESCE(bh.external_event_id, '') != '' - AND b.start_at >= ? AND b.start_at < ?`, - userID, busyFrom, busyTo) + ownEvents, err := h.ownCalendarEvents(ctx, userID, busyFrom, busyTo) if err != nil { return slots.HostAvailability{}, err } - for ownRows.Next() { - var startStr, endStr string - if err := ownRows.Scan(&startStr, &endStr); err != nil { - ownRows.Close() // #nosec G104 -- already returning the scan error; nothing more actionable - return slots.HostAvailability{}, err - } - s, err1 := time.Parse(time.RFC3339Nano, startStr) - e, err2 := time.Parse(time.RFC3339Nano, endStr) - if err1 != nil || err2 != nil { - continue - } - ownEvents = append(ownEvents, slots.Interval{Start: s, End: e}) - } - ownRows.Close() // #nosec G104 -- rows already fully consumed above; nothing actionable on close error - if err := ownRows.Err(); err != nil { - return slots.HostAvailability{}, err - } // Merge Google Calendar free/busy (check_conflicts connections only), minus our // own events. Non-fatal. @@ -505,6 +482,32 @@ func (h *Handler) hostAvailability(ctx context.Context, userID, eventTypeID stri return slots.HostAvailability{HostID: userID, Location: hostLoc, Rules: rules, Overrides: overrides, Busy: busy}, nil } +func (h *Handler) ownCalendarEvents(ctx context.Context, userID, from, to string) ([]slots.Interval, error) { + rows, err := h.db.QueryContext(ctx, ` + SELECT b.start_at, b.end_at FROM bookings b + JOIN booking_hosts bh ON bh.booking_id = b.id + WHERE bh.user_id = ? AND COALESCE(bh.external_event_id, '') != '' + AND b.start_at < ? AND b.end_at > ?`, userID, to, from) + if err != nil { + return nil, err + } + defer rows.Close() + var events []slots.Interval + for rows.Next() { + var startStr, endStr string + if err := rows.Scan(&startStr, &endStr); err != nil { + return nil, err + } + start, startErr := time.Parse(time.RFC3339Nano, startStr) + end, endErr := time.Parse(time.RFC3339Nano, endStr) + if startErr != nil || endErr != nil { + continue + } + events = append(events, slots.Interval{Start: start, End: end}) + } + return events, rows.Err() +} + // parseDateRangeStr resolves from/to date strings (either may be "") to UTC-midnight times. // Returns (from, to, ok). ok=false means the params were malformed. // maxFutureDays=0 is treated as 365 (no configured limit). The resolved From 5e2cf0ac1478cdab783eacbb7e47e4c7c190b637 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Mon, 21 Sep 2026 10:35:57 +0200 Subject: [PATCH 056/250] test(mailer): use the email settings From field --- internal/server/smtp_relay_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/server/smtp_relay_test.go b/internal/server/smtp_relay_test.go index fcc6be09..3d2a3825 100644 --- a/internal/server/smtp_relay_test.go +++ b/internal/server/smtp_relay_test.go @@ -59,7 +59,7 @@ func TestSMTPRelayAtBootAndSettingsReload(t *testing.T) { } patch := func(h *handler.Handler, smtpHost string) { t.Helper() - req := httptest.NewRequest(http.MethodPatch, "/v1/settings/email", strings.NewReader(fmt.Sprintf(`{"smtp_host":%q,"smtp_port":"465","smtp_tls":true,"from_address":"from@example.com"}`, smtpHost))) + req := httptest.NewRequest(http.MethodPatch, "/v1/settings/email", strings.NewReader(fmt.Sprintf(`{"smtp_host":%q,"smtp_port":"465","smtp_tls":true,"email_from":"from@example.com"}`, smtpHost))) req.Header.Set("Authorization", "Bearer "+identity.APIKey) rec := httptest.NewRecorder() h.RequireAuth(h.PatchEmailSettings)(rec, req) From 1ffe9c2c5d10aa3c2a09c129fa08597656dab7d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 08:49:46 +0000 Subject: [PATCH 057/250] chore(deps-dev): bump vite from 8.0.16 to 8.3.0 in /frontend Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 8.0.16 to 8.3.0. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@8.3.0/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 8.3.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 434 ++++++++++++++++++++++++---------------- 2 files changed, 258 insertions(+), 178 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 6b0ee81f..754f8ac3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -44,7 +44,7 @@ "tailwindcss": "^4.0.0", "tw-animate-css": "^1.4.0", "typescript": "^5.7.3", - "vite": "^8.0.16", + "vite": "^8.3.0", "vitest": "^4.1.10", "vitest-browser-svelte": "^2.1.1" } diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 9d39888d..870235c4 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -29,28 +29,28 @@ importers: version: 1.47.0(svelte@5.57.0) '@sveltejs/adapter-static': specifier: ^3.0.10 - version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))) + version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))) '@sveltejs/kit': specifier: ^2.70.2 - version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) '@sveltejs/vite-plugin-svelte': specifier: ^7.1.2 - version: 7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + version: 7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) '@tailwindcss/vite': specifier: ^4.3.1 - version: 4.3.1(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + version: 4.3.1(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) '@types/node': specifier: ^26.6.1 version: 26.6.1 '@vitest/browser': specifier: ^4.1.10 - version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) + version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) '@vitest/browser-playwright': specifier: ^4.1.10 - version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) + version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) bits-ui: specifier: ^2.18.1 - version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) + version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) playwright: specifier: ^1.61.0 version: 1.61.0 @@ -62,7 +62,7 @@ importers: version: 5.57.0 svelte-check: specifier: ^4.7.1 - version: 4.7.1(picomatch@4.0.4)(svelte@5.57.0)(typescript@5.9.3) + version: 4.7.1(picomatch@4.0.7)(svelte@5.57.0)(typescript@5.9.3) svelte-sonner: specifier: ^1.1.1 version: 1.1.1(svelte@5.57.0) @@ -79,11 +79,11 @@ importers: specifier: ^5.7.3 version: 5.9.3 vite: - specifier: ^8.0.16 - version: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) + specifier: ^8.3.0 + version: 8.3.0(@types/node@26.6.1)(jiti@2.7.0) vitest: specifier: ^4.1.10 - version: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + version: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) vitest-browser-svelte: specifier: ^2.1.1 version: 2.1.1(svelte@5.57.0)(vitest@4.1.11) @@ -93,15 +93,6 @@ packages: '@blazediff/core@1.9.1': resolution: {integrity: sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==} - '@emnapi/core@1.10.0': - resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} - - '@emnapi/runtime@1.10.0': - resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} - - '@emnapi/wasi-threads@1.2.1': - resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} - '@floating-ui/core@1.7.5': resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==} @@ -174,12 +165,6 @@ packages: resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==} engines: {node: '>=18'} - '@napi-rs/wasm-runtime@1.1.5': - resolution: {integrity: sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==} - peerDependencies: - '@emnapi/core': ^1.7.1 - '@emnapi/runtime': ^1.7.1 - '@open-draft/deferred-promise@2.2.0': resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} @@ -192,103 +177,104 @@ packages: '@open-draft/until@2.1.0': resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} - '@oxc-project/types@0.133.0': - resolution: {integrity: sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==} + '@oxc-project/types@0.150.0': + resolution: {integrity: sha512-rDS5/31E9HfPl/CIzGrn0DOlvBbXFseQ5URJ9sYMfstbKLD/c6Gm9vmRzRGDdAXyOIL4zmO37lc9RIwYqVruZw==} '@polka/url@1.0.0-next.29': resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==} - '@rolldown/binding-android-arm64@1.0.3': - resolution: {integrity: sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==} + '@rolldown/binding-android-arm-eabi@1.2.9': + resolution: {integrity: sha512-tNISae1QEf/vkb3xkRcjV5SEdzPE97We5IVaa2Z8jSszQPZ8U60B/YCYpw4QI7VidYsBtKavczXf+DyDs9WGxw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + + '@rolldown/binding-android-arm64@1.2.9': + resolution: {integrity: sha512-YC8YsI30o606GTZi0VyzYlsDKFP8W61i/QzayHDkLbNEz/IShqAmTa+hsJRj13xTHA0H+6fk4b2UmGn+Q/cMlg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.0.3': - resolution: {integrity: sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==} + '@rolldown/binding-darwin-arm64@1.2.9': + resolution: {integrity: sha512-IwhlH3qK5urrY8hZiEgGkHKEFN901p/p2bjxCxJlr4GyNnF7wYpUvK+Y43uaRYuC4hpfjzbR3SJC3arX1jGvmw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.0.3': - resolution: {integrity: sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==} + '@rolldown/binding-darwin-x64@1.2.9': + resolution: {integrity: sha512-XxpJfVzFh+jilRxIXUqcfYAYcunIc/XEzIizsOL1fcJee5Sf7H3mH8WlLmfHfluz5amqR88QQo9izKtmMlavAw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.0.3': - resolution: {integrity: sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==} + '@rolldown/binding-freebsd-x64@1.2.9': + resolution: {integrity: sha512-kSfvhmgeWyfkbT3p/1s5vSgboogoah2zkm9fX2zjg2hHxSV7T4KhMWRUUaRk4OXNqoD3QAUeRqLcs1aZOK4U1g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.0.3': - resolution: {integrity: sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==} + '@rolldown/binding-linux-arm-gnueabihf@1.2.9': + resolution: {integrity: sha512-1RVzG17pxqbTfYLC352JlLt6kKLG+6Hr30n8DlIJqsnV5luUDd2Qdx9Ayw1Cabfyb1K9k0jXEZ7evxkRoT+uiw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.0.3': - resolution: {integrity: sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==} + '@rolldown/binding-linux-arm64-gnu@1.2.9': + resolution: {integrity: sha512-BXqPvZ2drqVD+/Z8UpKwcs4Mp7grM+eGFku4CAEKrEtcbAsUpzREphK1sogCRZGreVPiMkiiBtw0n3TPteuqvw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-arm64-musl@1.0.3': - resolution: {integrity: sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==} + '@rolldown/binding-linux-arm64-musl@1.2.9': + resolution: {integrity: sha512-11vWvo8YDwLzukt27J3aYDWU+gg2P7J+ZOmiJ0hkF5BXZDW7pVya7r40MXDy6ya0i9KamoENSVKIugvJNgFXIA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@rolldown/binding-linux-ppc64-gnu@1.0.3': - resolution: {integrity: sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==} + '@rolldown/binding-linux-ppc64-gnu@1.2.9': + resolution: {integrity: sha512-a1tijMkdwsIARtc0F39ApURROkf3NwqinI6TOiSSWCTR7dT96dffNvMUtDHnq64wKNTIZOIlzKrFvvFUznJiyw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-s390x-gnu@1.0.3': - resolution: {integrity: sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==} + '@rolldown/binding-linux-s390x-gnu@1.2.9': + resolution: {integrity: sha512-x6SQNdAvv4c3hWqTMaWuawzMX9myaCs/yEmlGsxJzkdClnHW7FbrjQuSiRDhuSYzEYoEMhsaJy9qHG/XNemJPQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-gnu@1.0.3': - resolution: {integrity: sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==} + '@rolldown/binding-linux-x64-gnu@1.2.9': + resolution: {integrity: sha512-9s0AZ8BFK5/n7B/TBoa2yJE3gI3KURrbXcPBlsAsvjU4VeJKgE90y1YtNxyEUIcHPQkg6/yfF3qihUrcM/Kf0Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-musl@1.0.3': - resolution: {integrity: sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==} + '@rolldown/binding-linux-x64-musl@1.2.9': + resolution: {integrity: sha512-P7VWAmV+WdJluH7ovnRGoiv2i8To7GAZ+kGzfGup635cyL7SyYl3lSUaA3Gp5THf0n/Co5EyEqb2zbqq+nMOHQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@rolldown/binding-openharmony-arm64@1.0.3': - resolution: {integrity: sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==} + '@rolldown/binding-openharmony-arm64@1.2.9': + resolution: {integrity: sha512-1qixtsE4BK8h+yS3BfmZ09UhA7O/N4IACva6YBr7EBvCJraByTuRcgOTaiA62Tm0vey3UcKXLOaoGHtYmNGEVg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-wasm32-wasi@1.0.3': - resolution: {integrity: sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [wasm32] - - '@rolldown/binding-win32-arm64-msvc@1.0.3': - resolution: {integrity: sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==} + '@rolldown/binding-win32-arm64-msvc@1.2.9': + resolution: {integrity: sha512-ok8IQjcEPs1AKZfuEUznVBrJw+gK4soq+bx8b1X2XoMqVClarc1q5JDmVtWXY1xfr6ZuHTAsPXHTgTrqKTZeww==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-x64-msvc@1.0.3': - resolution: {integrity: sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==} + '@rolldown/binding-win32-x64-msvc@1.2.9': + resolution: {integrity: sha512-Ip2mXoU0hM0boq3Rf+ekuT653OROSo6aSYcPT1VHE4q52KvyxgFkQgrgb/IEsxOuvQ2fZZbs8khJAyCEPM24/g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -444,9 +430,6 @@ packages: peerDependencies: svelte: ^3 || ^4 || ^5 || ^5.0.0-next.0 - '@tybys/wasm-util@0.10.2': - resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==} - '@types/chai@5.2.3': resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==} @@ -709,30 +692,60 @@ packages: cpu: [arm64] os: [android] + lightningcss-android-arm64@1.33.0: + resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [android] + lightningcss-darwin-arm64@1.32.0: resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [darwin] + lightningcss-darwin-arm64@1.33.0: + resolution: {integrity: sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [darwin] + lightningcss-darwin-x64@1.32.0: resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [darwin] + lightningcss-darwin-x64@1.33.0: + resolution: {integrity: sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [darwin] + lightningcss-freebsd-x64@1.32.0: resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [freebsd] + lightningcss-freebsd-x64@1.33.0: + resolution: {integrity: sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [freebsd] + lightningcss-linux-arm-gnueabihf@1.32.0: resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==} engines: {node: '>= 12.0.0'} cpu: [arm] os: [linux] + lightningcss-linux-arm-gnueabihf@1.33.0: + resolution: {integrity: sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm] + os: [linux] + lightningcss-linux-arm64-gnu@1.32.0: resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==} engines: {node: '>= 12.0.0'} @@ -740,6 +753,13 @@ packages: os: [linux] libc: [glibc] + lightningcss-linux-arm64-gnu@1.33.0: + resolution: {integrity: sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + libc: [glibc] + lightningcss-linux-arm64-musl@1.32.0: resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==} engines: {node: '>= 12.0.0'} @@ -747,6 +767,13 @@ packages: os: [linux] libc: [musl] + lightningcss-linux-arm64-musl@1.33.0: + resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + libc: [musl] + lightningcss-linux-x64-gnu@1.32.0: resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==} engines: {node: '>= 12.0.0'} @@ -754,6 +781,13 @@ packages: os: [linux] libc: [glibc] + lightningcss-linux-x64-gnu@1.33.0: + resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + libc: [glibc] + lightningcss-linux-x64-musl@1.32.0: resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==} engines: {node: '>= 12.0.0'} @@ -761,22 +795,45 @@ packages: os: [linux] libc: [musl] + lightningcss-linux-x64-musl@1.33.0: + resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + libc: [musl] + lightningcss-win32-arm64-msvc@1.32.0: resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [win32] + lightningcss-win32-arm64-msvc@1.33.0: + resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [win32] + lightningcss-win32-x64-msvc@1.32.0: resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [win32] + lightningcss-win32-x64-msvc@1.33.0: + resolution: {integrity: sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [win32] + lightningcss@1.32.0: resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==} engines: {node: '>= 12.0.0'} + lightningcss@1.33.0: + resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==} + engines: {node: '>= 12.0.0'} + locate-character@3.0.0: resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==} @@ -837,6 +894,10 @@ packages: resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==} engines: {node: '>=12'} + picomatch@4.0.7: + resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} + engines: {node: '>=12'} + playwright-core@1.61.0: resolution: {integrity: sha512-caX7TrY3Ml6egyDX0WUcTHDxodl/b51y5wJOdCEA36QviK/s2g081hvmGs8eaE3DWb6NYZQ6BjO/QkNRPenoPA==} engines: {node: '>=18'} @@ -866,8 +927,8 @@ packages: rettime@0.11.11: resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==} - rolldown@1.0.3: - resolution: {integrity: sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==} + rolldown@1.2.9: + resolution: {integrity: sha512-hx/Pv0N1haXRb11qkfnK5MXB/iqr7i0yjWQqmO9uHqZpBgQSqzc8UsSnEpalsh+j1I8qQ2CkXAkJC8Br3dKSlg==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true @@ -1041,13 +1102,13 @@ packages: until-async@3.0.2: resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} - vite@8.0.16: - resolution: {integrity: sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==} + vite@8.3.0: + resolution: {integrity: sha512-lhZBVvEHefgE+HQZC9O7EBJgCU/nVzFNl7vkS4RE0APtWLP02/8QVIkQtzBxPquh7lq5/78NHipTj7ODQ6XuyQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': ^20.19.0 || >=22.12.0 - '@vitejs/devtools': ^0.1.18 + '@vitejs/devtools': ^0.7.1 esbuild: ^0.27.0 || ^0.28.0 jiti: '>=1.21.0' less: ^4.0.0 @@ -1179,22 +1240,6 @@ snapshots: '@blazediff/core@1.9.1': {} - '@emnapi/core@1.10.0': - dependencies: - '@emnapi/wasi-threads': 1.2.1 - tslib: 2.8.1 - optional: true - - '@emnapi/runtime@1.10.0': - dependencies: - tslib: 2.8.1 - optional: true - - '@emnapi/wasi-threads@1.2.1': - dependencies: - tslib: 2.8.1 - optional: true - '@floating-ui/core@1.7.5': dependencies: '@floating-ui/utils': 0.2.11 @@ -1275,13 +1320,6 @@ snapshots: strict-event-emitter: 0.5.1 optional: true - '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.2 - optional: true - '@open-draft/deferred-promise@2.2.0': optional: true @@ -1297,57 +1335,53 @@ snapshots: '@open-draft/until@2.1.0': optional: true - '@oxc-project/types@0.133.0': {} + '@oxc-project/types@0.150.0': {} '@polka/url@1.0.0-next.29': {} - '@rolldown/binding-android-arm64@1.0.3': + '@rolldown/binding-android-arm-eabi@1.2.9': optional: true - '@rolldown/binding-darwin-arm64@1.0.3': + '@rolldown/binding-android-arm64@1.2.9': optional: true - '@rolldown/binding-darwin-x64@1.0.3': + '@rolldown/binding-darwin-arm64@1.2.9': optional: true - '@rolldown/binding-freebsd-x64@1.0.3': + '@rolldown/binding-darwin-x64@1.2.9': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.3': + '@rolldown/binding-freebsd-x64@1.2.9': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.3': + '@rolldown/binding-linux-arm-gnueabihf@1.2.9': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.3': + '@rolldown/binding-linux-arm64-gnu@1.2.9': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.0.3': + '@rolldown/binding-linux-arm64-musl@1.2.9': optional: true - '@rolldown/binding-linux-s390x-gnu@1.0.3': + '@rolldown/binding-linux-ppc64-gnu@1.2.9': optional: true - '@rolldown/binding-linux-x64-gnu@1.0.3': + '@rolldown/binding-linux-s390x-gnu@1.2.9': optional: true - '@rolldown/binding-linux-x64-musl@1.0.3': + '@rolldown/binding-linux-x64-gnu@1.2.9': optional: true - '@rolldown/binding-openharmony-arm64@1.0.3': + '@rolldown/binding-linux-x64-musl@1.2.9': optional: true - '@rolldown/binding-wasm32-wasi@1.0.3': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + '@rolldown/binding-openharmony-arm64@1.2.9': optional: true - '@rolldown/binding-win32-arm64-msvc@1.0.3': + '@rolldown/binding-win32-arm64-msvc@1.2.9': optional: true - '@rolldown/binding-win32-x64-msvc@1.0.3': + '@rolldown/binding-win32-x64-msvc@1.2.9': optional: true '@rolldown/pluginutils@1.0.1': {} @@ -1362,15 +1396,15 @@ snapshots: dependencies: acorn: 8.18.0 - '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))': + '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))': dependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) - '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': + '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))': dependencies: '@standard-schema/spec': 1.1.0 '@sveltejs/acorn-typescript': 1.0.10(acorn@8.17.0) - '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) '@types/cookie': 0.6.0 acorn: 8.17.0 cookie: 0.7.2 @@ -1382,20 +1416,20 @@ snapshots: set-cookie-parser: 3.1.0 sirv: 3.0.2 svelte: 5.57.0 - vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) + vite: 8.3.0(@types/node@26.6.1)(jiti@2.7.0) optionalDependencies: typescript: 5.9.3 '@sveltejs/load-config@0.2.0': {} - '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': + '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))': dependencies: deepmerge: 4.3.1 magic-string: 0.30.21 obug: 2.1.3 svelte: 5.57.0 - vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) - vitefu: 1.1.3(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + vite: 8.3.0(@types/node@26.6.1)(jiti@2.7.0) + vitefu: 1.1.3(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) '@swc/helpers@0.5.23': dependencies: @@ -1462,22 +1496,17 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.3.1 '@tailwindcss/oxide-win32-x64-msvc': 4.3.1 - '@tailwindcss/vite@4.3.1(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': + '@tailwindcss/vite@4.3.1(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))': dependencies: '@tailwindcss/node': 4.3.1 '@tailwindcss/oxide': 4.3.1 tailwindcss: 4.3.1 - vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) + vite: 8.3.0(@types/node@26.6.1)(jiti@2.7.0) '@testing-library/svelte-core@1.0.0(svelte@5.57.0)': dependencies: svelte: 5.57.0 - '@tybys/wasm-util@0.10.2': - dependencies: - tslib: 2.8.1 - optional: true - '@types/chai@5.2.3': dependencies: '@types/deep-eql': 4.0.2 @@ -1501,29 +1530,29 @@ snapshots: '@types/statuses@2.0.6': optional: true - '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11)': + '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11)': dependencies: - '@vitest/browser': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) - '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@vitest/browser': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) playwright: 1.61.0 tinyrainbow: 3.1.0 - vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) transitivePeerDependencies: - bufferutil - msw - utf-8-validate - vite - '@vitest/browser@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11)': + '@vitest/browser@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11)': dependencies: '@blazediff/core': 1.9.1 - '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) '@vitest/utils': 4.1.11 magic-string: 0.30.21 pngjs: 7.0.0 sirv: 3.0.2 tinyrainbow: 3.1.0 - vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) ws: 8.21.0 transitivePeerDependencies: - bufferutil @@ -1540,14 +1569,14 @@ snapshots: chai: 6.2.2 tinyrainbow: 3.1.0 - '@vitest/mocker@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))': + '@vitest/mocker@4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))': dependencies: '@vitest/spy': 4.1.11 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.14.6(@types/node@26.6.1)(typescript@5.9.3) - vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) + vite: 8.3.0(@types/node@26.6.1)(jiti@2.7.0) '@vitest/pretty-format@4.1.11': dependencies: @@ -1591,15 +1620,15 @@ snapshots: axobject-query@4.1.0: {} - bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): + bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): dependencies: '@floating-ui/core': 1.7.5 '@floating-ui/dom': 1.7.6 '@internationalized/date': 3.12.2 esm-env: 1.2.2 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) svelte: 5.57.0 - svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) + svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) tabbable: 6.4.0 transitivePeerDependencies: - '@sveltejs/kit' @@ -1689,9 +1718,9 @@ snapshots: fast-string-width: 3.0.2 optional: true - fdir@6.5.0(picomatch@4.0.4): + fdir@6.5.0(picomatch@4.0.7): optionalDependencies: - picomatch: 4.0.4 + picomatch: 4.0.7 fsevents@2.3.2: optional: true @@ -1732,36 +1761,69 @@ snapshots: lightningcss-android-arm64@1.32.0: optional: true + lightningcss-android-arm64@1.33.0: + optional: true + lightningcss-darwin-arm64@1.32.0: optional: true + lightningcss-darwin-arm64@1.33.0: + optional: true + lightningcss-darwin-x64@1.32.0: optional: true + lightningcss-darwin-x64@1.33.0: + optional: true + lightningcss-freebsd-x64@1.32.0: optional: true + lightningcss-freebsd-x64@1.33.0: + optional: true + lightningcss-linux-arm-gnueabihf@1.32.0: optional: true + lightningcss-linux-arm-gnueabihf@1.33.0: + optional: true + lightningcss-linux-arm64-gnu@1.32.0: optional: true + lightningcss-linux-arm64-gnu@1.33.0: + optional: true + lightningcss-linux-arm64-musl@1.32.0: optional: true + lightningcss-linux-arm64-musl@1.33.0: + optional: true + lightningcss-linux-x64-gnu@1.32.0: optional: true + lightningcss-linux-x64-gnu@1.33.0: + optional: true + lightningcss-linux-x64-musl@1.32.0: optional: true + lightningcss-linux-x64-musl@1.33.0: + optional: true + lightningcss-win32-arm64-msvc@1.32.0: optional: true + lightningcss-win32-arm64-msvc@1.33.0: + optional: true + lightningcss-win32-x64-msvc@1.32.0: optional: true + lightningcss-win32-x64-msvc@1.33.0: + optional: true + lightningcss@1.32.0: dependencies: detect-libc: 2.1.2 @@ -1778,6 +1840,22 @@ snapshots: lightningcss-win32-arm64-msvc: 1.32.0 lightningcss-win32-x64-msvc: 1.32.0 + lightningcss@1.33.0: + dependencies: + detect-libc: 2.1.2 + optionalDependencies: + lightningcss-android-arm64: 1.33.0 + lightningcss-darwin-arm64: 1.33.0 + lightningcss-darwin-x64: 1.33.0 + lightningcss-freebsd-x64: 1.33.0 + lightningcss-linux-arm-gnueabihf: 1.33.0 + lightningcss-linux-arm64-gnu: 1.33.0 + lightningcss-linux-arm64-musl: 1.33.0 + lightningcss-linux-x64-gnu: 1.33.0 + lightningcss-linux-x64-musl: 1.33.0 + lightningcss-win32-arm64-msvc: 1.33.0 + lightningcss-win32-x64-msvc: 1.33.0 + locate-character@3.0.0: {} lz-string@1.5.0: {} @@ -1837,6 +1915,8 @@ snapshots: picomatch@4.0.4: {} + picomatch@4.0.7: {} + playwright-core@1.61.0: {} playwright@1.61.0: @@ -1861,40 +1941,40 @@ snapshots: rettime@0.11.11: optional: true - rolldown@1.0.3: + rolldown@1.2.9: dependencies: - '@oxc-project/types': 0.133.0 + '@oxc-project/types': 0.150.0 '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.3 - '@rolldown/binding-darwin-arm64': 1.0.3 - '@rolldown/binding-darwin-x64': 1.0.3 - '@rolldown/binding-freebsd-x64': 1.0.3 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.3 - '@rolldown/binding-linux-arm64-gnu': 1.0.3 - '@rolldown/binding-linux-arm64-musl': 1.0.3 - '@rolldown/binding-linux-ppc64-gnu': 1.0.3 - '@rolldown/binding-linux-s390x-gnu': 1.0.3 - '@rolldown/binding-linux-x64-gnu': 1.0.3 - '@rolldown/binding-linux-x64-musl': 1.0.3 - '@rolldown/binding-openharmony-arm64': 1.0.3 - '@rolldown/binding-wasm32-wasi': 1.0.3 - '@rolldown/binding-win32-arm64-msvc': 1.0.3 - '@rolldown/binding-win32-x64-msvc': 1.0.3 + '@rolldown/binding-android-arm-eabi': 1.2.9 + '@rolldown/binding-android-arm64': 1.2.9 + '@rolldown/binding-darwin-arm64': 1.2.9 + '@rolldown/binding-darwin-x64': 1.2.9 + '@rolldown/binding-freebsd-x64': 1.2.9 + '@rolldown/binding-linux-arm-gnueabihf': 1.2.9 + '@rolldown/binding-linux-arm64-gnu': 1.2.9 + '@rolldown/binding-linux-arm64-musl': 1.2.9 + '@rolldown/binding-linux-ppc64-gnu': 1.2.9 + '@rolldown/binding-linux-s390x-gnu': 1.2.9 + '@rolldown/binding-linux-x64-gnu': 1.2.9 + '@rolldown/binding-linux-x64-musl': 1.2.9 + '@rolldown/binding-openharmony-arm64': 1.2.9 + '@rolldown/binding-win32-arm64-msvc': 1.2.9 + '@rolldown/binding-win32-x64-msvc': 1.2.9 runed@0.28.0(svelte@5.57.0): dependencies: esm-env: 1.2.2 svelte: 5.57.0 - runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): + runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): dependencies: dequal: 2.0.3 esm-env: 1.2.2 lz-string: 1.5.0 svelte: 5.57.0 optionalDependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) sade@1.8.1: dependencies: @@ -1952,12 +2032,12 @@ snapshots: dependencies: inline-style-parser: 0.2.7 - svelte-check@4.7.1(picomatch@4.0.4)(svelte@5.57.0)(typescript@5.9.3): + svelte-check@4.7.1(picomatch@4.0.7)(svelte@5.57.0)(typescript@5.9.3): dependencies: '@jridgewell/trace-mapping': 0.3.31 '@sveltejs/load-config': 0.2.0 chokidar: 4.0.3 - fdir: 6.5.0(picomatch@4.0.4) + fdir: 6.5.0(picomatch@4.0.7) picocolors: 1.1.1 sade: 1.8.1 svelte: 5.57.0 @@ -1970,10 +2050,10 @@ snapshots: runed: 0.28.0(svelte@5.57.0) svelte: 5.57.0 - svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): + svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): dependencies: clsx: 2.1.1 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) style-to-object: 1.0.14 svelte: 5.57.0 transitivePeerDependencies: @@ -2022,8 +2102,8 @@ snapshots: tinyglobby@0.2.17: dependencies: - fdir: 6.5.0(picomatch@4.0.4) - picomatch: 4.0.4 + fdir: 6.5.0(picomatch@4.0.7) + picomatch: 4.0.7 tinyrainbow@3.1.0: {} @@ -2058,32 +2138,32 @@ snapshots: until-async@3.0.2: optional: true - vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0): + vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0): dependencies: - lightningcss: 1.32.0 - picomatch: 4.0.4 + lightningcss: 1.33.0 + picomatch: 4.0.7 postcss: 8.5.28 - rolldown: 1.0.3 + rolldown: 1.2.9 tinyglobby: 0.2.17 optionalDependencies: '@types/node': 26.6.1 fsevents: 2.3.3 jiti: 2.7.0 - vitefu@1.1.3(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)): + vitefu@1.1.3(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)): optionalDependencies: - vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) + vite: 8.3.0(@types/node@26.6.1)(jiti@2.7.0) vitest-browser-svelte@2.1.1(svelte@5.57.0)(vitest@4.1.11): dependencies: '@testing-library/svelte-core': 1.0.0(svelte@5.57.0) svelte: 5.57.0 - vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + vitest: 4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) - vitest@4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)): + vitest@4.1.11(@types/node@26.6.1)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)): dependencies: '@vitest/expect': 4.1.11 - '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0)) + '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)) '@vitest/pretty-format': 4.1.11 '@vitest/runner': 4.1.11 '@vitest/snapshot': 4.1.11 @@ -2100,11 +2180,11 @@ snapshots: tinyexec: 1.2.4 tinyglobby: 0.2.17 tinyrainbow: 3.1.0 - vite: 8.0.16(@types/node@26.6.1)(jiti@2.7.0) + vite: 8.3.0(@types/node@26.6.1)(jiti@2.7.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 26.6.1 - '@vitest/browser-playwright': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.0.16(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) + '@vitest/browser-playwright': 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) transitivePeerDependencies: - msw From 3d0f582c8bc7ae8800b9f352ff0fc04cd7fd3d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 09:01:33 +0000 Subject: [PATCH 058/250] chore(deps-dev): bump tailwindcss from 4.3.1 to 4.3.3 in /frontend Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/tailwindcss) from 4.3.1 to 4.3.3. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.3.3/packages/tailwindcss) --- updated-dependencies: - dependency-name: tailwindcss dependency-version: 4.3.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 754f8ac3..8080c687 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -41,7 +41,7 @@ "svelte-check": "^4.7.1", "svelte-sonner": "^1.1.1", "tailwind-variants": "^3.2.2", - "tailwindcss": "^4.0.0", + "tailwindcss": "^4.3.3", "tw-animate-css": "^1.4.0", "typescript": "^5.7.3", "vite": "^8.3.0", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 870235c4..c3380458 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -68,10 +68,10 @@ importers: version: 1.1.1(svelte@5.57.0) tailwind-variants: specifier: ^3.2.2 - version: 3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.1) + version: 3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.3) tailwindcss: - specifier: ^4.0.0 - version: 4.3.1 + specifier: ^4.3.3 + version: 4.3.3 tw-animate-css: specifier: ^1.4.0 version: 1.4.0 @@ -1047,6 +1047,9 @@ packages: tailwindcss@4.3.1: resolution: {integrity: sha512-hk+TB1m+K8CYNrP6rjQaq/Y+4Zylwpa87mLYBKCunwnnQ9p+fHb7kmSfGqyEJoxF/O6CDyABWVFEafNSYKll+Q==} + tailwindcss@4.3.3: + resolution: {integrity: sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==} + tapable@2.3.3: resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==} engines: {node: '>=6'} @@ -2086,14 +2089,16 @@ snapshots: tailwind-merge@3.6.0: {} - tailwind-variants@3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.1): + tailwind-variants@3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.3): dependencies: - tailwindcss: 4.3.1 + tailwindcss: 4.3.3 optionalDependencies: tailwind-merge: 3.6.0 tailwindcss@4.3.1: {} + tailwindcss@4.3.3: {} + tapable@2.3.3: {} tinybench@2.9.0: {} From 05f0e12b2859f36580f3ba19f95d9935f7094431 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 07:32:42 +1200 Subject: [PATCH 059/250] fix(calendar): follow pagination when listing calendars (#59) Microsoft requested $top=100 calendars once and Google maxResults=250 once, so anything beyond silently vanished from the picker. Both listings now page to the end (@odata.nextLink / nextPageToken). --- CHANGELOG.md | 5 ++ internal/calendar/microsoft/calendars.go | 66 +++++++++------- internal/calendar/microsoft/microsoft_test.go | 39 ++++++++++ internal/gcal/calendars.go | 76 +++++++++++-------- internal/gcal/destination_test.go | 45 +++++++++++ 5 files changed, 175 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5334624..9dd4f807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,6 +92,11 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad CSP and would break the embedding this exists for. ### Fixed +- **The calendar picker no longer drops calendars past the first page.** Microsoft + requested `$top=100` calendars once and Google `maxResults=250` once, so anything + beyond silently vanished: unreachable for conflict checks and unchoosable as the + destination. Both listings now follow `@odata.nextLink` / `nextPageToken` to the + end. Answers [#59](https://github.com/Calnode/calnode/issues/59). - **The Zoom setup text no longer promises that an unpublished app works for "your own team".** Zoom only lets users inside the Zoom account that owns an unpublished app authorize it, so a member with their own Zoom account was refused on a Zoom error page diff --git a/internal/calendar/microsoft/calendars.go b/internal/calendar/microsoft/calendars.go index 141491ea..9fed3fca 100644 --- a/internal/calendar/microsoft/calendars.go +++ b/internal/calendar/microsoft/calendars.go @@ -32,6 +32,8 @@ func (c *Client) clientForAccount(ctx context.Context, userID, accountEmail stri // be named in ListCalendars' $select: Graph returns only the selected properties, and an // absent bool decodes as false without error. // TestListCalendars_selectNamesEveryDecodedProperty holds the two together. +// NextLink is exempt: @odata.nextLink is response metadata, returned regardless of +// $select, and the guard test only inspects the Value item struct. type msCalListResp struct { Value []struct { ID string `json:"id"` @@ -40,40 +42,52 @@ type msCalListResp struct { // Graph reports this per calendar; false for one shared with the user read-only. CanEdit bool `json:"canEdit"` } `json:"value"` + NextLink string `json:"@odata.nextLink"` } -// ListCalendars returns the calendars in the account (Graph GET /me/calendars). +// ListCalendars returns the calendars in the account (Graph GET /me/calendars), +// following @odata.nextLink until every page is read. Without this, accounts with +// more than $top calendars silently lose the rest: they can't be checked for +// conflicts or chosen as the destination. func (c *Client) ListCalendars(ctx context.Context, userID, accountEmail string) ([]calendar.CalendarInfo, error) { hc, err := c.clientForAccount(ctx, userID, accountEmail) if err != nil || hc == nil { return nil, err } - req, err := http.NewRequestWithContext(ctx, http.MethodGet, - c.apiBase+"/me/calendars?$select=id,name,isDefaultCalendar,canEdit&$top=100", nil) - if err != nil { - return nil, err - } - resp, err := hc.Do(req) - if err != nil { - return nil, fmt.Errorf("microsoft: list calendars call: %w", err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("microsoft: list calendars status %d", resp.StatusCode) - } - var lr msCalListResp - if err := json.NewDecoder(resp.Body).Decode(&lr); err != nil { - return nil, fmt.Errorf("microsoft: list calendars decode: %w", err) - } - out := make([]calendar.CalendarInfo, 0, len(lr.Value)) - for _, it := range lr.Value { - name := it.Name - if name == "" { - name = it.ID + next := c.apiBase + "/me/calendars?$select=id,name,isDefaultCalendar,canEdit&$top=100" + var out []calendar.CalendarInfo + for next != "" { + req, err := http.NewRequestWithContext(ctx, http.MethodGet, next, nil) + if err != nil { + return nil, err + } + resp, err := hc.Do(req) + if err != nil { + return nil, fmt.Errorf("microsoft: list calendars call: %w", err) + } + var lr msCalListResp + if resp.StatusCode != http.StatusOK { + msg := graphErrBody(resp) + resp.Body.Close() // #nosec G104 -- already returning a more specific error; nothing actionable on close error + return nil, fmt.Errorf("microsoft: list calendars status %d: %s", resp.StatusCode, msg) + } + derr := json.NewDecoder(resp.Body).Decode(&lr) + resp.Body.Close() // #nosec G104 -- body already decoded above; nothing actionable on close error + if derr != nil { + return nil, fmt.Errorf("microsoft: list calendars decode: %w", derr) + } + for _, it := range lr.Value { + name := it.Name + if name == "" { + name = it.ID + } + out = append(out, calendar.CalendarInfo{ + ID: it.ID, Name: name, Primary: it.IsDefaultCalendar, Writable: it.CanEdit, + }) } - out = append(out, calendar.CalendarInfo{ - ID: it.ID, Name: name, Primary: it.IsDefaultCalendar, Writable: it.CanEdit, - }) + // The nextLink is a complete Graph URL (same host, skiptoken query) — follow + // it verbatim, the way calendarView follows its NextLink. + next = lr.NextLink } return out, nil } diff --git a/internal/calendar/microsoft/microsoft_test.go b/internal/calendar/microsoft/microsoft_test.go index 5e89d3bb..568db8f7 100644 --- a/internal/calendar/microsoft/microsoft_test.go +++ b/internal/calendar/microsoft/microsoft_test.go @@ -356,6 +356,45 @@ func TestListCalendars_selectNamesEveryDecodedProperty(t *testing.T) { } } +func TestListCalendars_followsNextLink(t *testing.T) { + c := newTestClient(t) + connect(t, c, "u1") + + var calls []string + var srv *httptest.Server + srv = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + calls = append(calls, r.URL.String()) + w.Header().Set("Content-Type", "application/json") + if r.URL.Query().Get("$skiptoken") == "" { + _ = json.NewEncoder(w).Encode(map[string]any{ + "value": []map[string]any{graphCalendars[0]}, + "@odata.nextLink": srv.URL + "/me/calendars?$skiptoken=page2", + }) + return + } + _ = json.NewEncoder(w).Encode(map[string]any{ + "value": []map[string]any{graphCalendars[1]}, + }) + })) + defer srv.Close() + c.apiBase = srv.URL + + got, err := c.ListCalendars(context.Background(), "u1", "") + if err != nil { + t.Fatalf("ListCalendars: %v", err) + } + want := []calendar.CalendarInfo{ + {ID: "cal-own", Name: "Calendar", Primary: true, Writable: true}, + {ID: "cal-shared", Name: "Team rota", Primary: false, Writable: false}, + } + if !reflect.DeepEqual(got, want) { + t.Errorf("ListCalendars =\n %+v\nwant\n %+v", got, want) + } + if len(calls) != 2 { + t.Errorf("expected 2 page fetches, got %d: %v", len(calls), calls) + } +} + func mkIDToken(tid string) string { payload := base64.RawURLEncoding.EncodeToString([]byte(`{"tid":"` + tid + `"}`)) return "header." + payload + ".sig" diff --git a/internal/gcal/calendars.go b/internal/gcal/calendars.go index 1e1e8d3b..f0af92d1 100644 --- a/internal/gcal/calendars.go +++ b/internal/gcal/calendars.go @@ -6,6 +6,7 @@ import ( "encoding/json" "fmt" "net/http" + "net/url" "github.com/calnode/calnode/internal/calendar" ) @@ -37,45 +38,60 @@ type calListResp struct { // "owner" | "writer" | "reader" | "freeBusyReader" AccessRole string `json:"accessRole"` } `json:"items"` + NextPageToken string `json:"nextPageToken"` } -// ListCalendars returns every calendar in the account (calendarList.list). Read-only -// calendars are included — they're valid for conflict checks even if not writable. +// ListCalendars returns every calendar in the account (calendarList.list), following +// nextPageToken until every page is read. Without this, accounts subscribed to more +// than maxResults calendars silently lose the rest. Read-only calendars are included +// — they're valid for conflict checks even if not writable. func (c *Client) ListCalendars(ctx context.Context, userID, accountEmail string) ([]calendar.CalendarInfo, error) { hc, err := c.clientForAccount(ctx, userID, accountEmail) if err != nil || hc == nil { return nil, err } - req, err := http.NewRequestWithContext(ctx, http.MethodGet, - c.apiBase+"/users/me/calendarList?maxResults=250", nil) - if err != nil { - return nil, err - } - resp, err := hc.Do(req) - if err != nil { - return nil, fmt.Errorf("gcal: calendarList call: %w", err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("gcal: calendarList status %d", resp.StatusCode) - } - var lr calListResp - if err := json.NewDecoder(resp.Body).Decode(&lr); err != nil { - return nil, fmt.Errorf("gcal: calendarList decode: %w", err) - } - out := make([]calendar.CalendarInfo, 0, len(lr.Items)) - for _, it := range lr.Items { - if it.Deleted { - continue + var out []calendar.CalendarInfo + pageToken := "" + for { + endpoint := c.apiBase + "/users/me/calendarList?maxResults=250" + if pageToken != "" { + endpoint += "&pageToken=" + url.QueryEscape(pageToken) + } + req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil) + if err != nil { + return nil, err + } + resp, err := hc.Do(req) + if err != nil { + return nil, fmt.Errorf("gcal: calendarList call: %w", err) + } + var lr calListResp + if resp.StatusCode != http.StatusOK { + resp.Body.Close() // #nosec G104 -- already returning the status; nothing actionable on close error + return nil, fmt.Errorf("gcal: calendarList status %d", resp.StatusCode) + } + derr := json.NewDecoder(resp.Body).Decode(&lr) + resp.Body.Close() // #nosec G104 -- body already decoded above; nothing actionable on close error + if derr != nil { + return nil, fmt.Errorf("gcal: calendarList decode: %w", derr) + } + for _, it := range lr.Items { + if it.Deleted { + continue + } + name := it.Summary + if name == "" { + name = it.ID + } + out = append(out, calendar.CalendarInfo{ + ID: it.ID, Name: name, Primary: it.Primary, + Writable: it.AccessRole == "owner" || it.AccessRole == "writer", + }) } - name := it.Summary - if name == "" { - name = it.ID + if lr.NextPageToken == "" { + break } - out = append(out, calendar.CalendarInfo{ - ID: it.ID, Name: name, Primary: it.Primary, - Writable: it.AccessRole == "owner" || it.AccessRole == "writer", - }) + pageToken = lr.NextPageToken } return out, nil } diff --git a/internal/gcal/destination_test.go b/internal/gcal/destination_test.go index cc85b5c0..d5f1b374 100644 --- a/internal/gcal/destination_test.go +++ b/internal/gcal/destination_test.go @@ -142,3 +142,48 @@ func TestUpdateEvent_usesTheStoredCalendar(t *testing.T) { t.Errorf("patched %q, want the calendar the event lives in", *path) } } + +// TestListCalendars_followsNextPageToken is the fix for issue #59: accounts +// subscribed to more than maxResults calendars lost everything past page one. +func TestListCalendars_followsNextPageToken(t *testing.T) { + var tokens []string + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + tokens = append(tokens, r.URL.Query().Get("pageToken")) + w.Header().Set("Content-Type", "application/json") + if r.URL.Query().Get("pageToken") == "" { + _, _ = w.Write([]byte(`{"items":[ + {"id":"a@example.com","summary":"A","primary":true,"accessRole":"owner"}, + {"id":"gone@example.com","summary":"Gone","deleted":true,"accessRole":"owner"} + ],"nextPageToken":"page2"}`)) + return + } + _, _ = w.Write([]byte(`{"items":[ + {"id":"b@example.com","summary":"B","accessRole":"reader"} + ]}`)) + })) + t.Cleanup(srv.Close) + + c := newTestClient(t) + c.apiBase = srv.URL + saveDestinationConnection(t, c, "user-1", "primary") + + got, err := c.ListCalendars(context.Background(), "user-1", "") + if err != nil { + t.Fatalf("ListCalendars: %v", err) + } + want := []calendar.CalendarInfo{ + {ID: "a@example.com", Name: "A", Primary: true, Writable: true}, + {ID: "b@example.com", Name: "B", Primary: false, Writable: false}, + } + if len(got) != len(want) { + t.Fatalf("ListCalendars returned %d calendars, want %d: %+v", len(got), len(want), got) + } + for i := range want { + if got[i] != want[i] { + t.Errorf("ListCalendars[%d] = %+v, want %+v", i, got[i], want[i]) + } + } + if len(tokens) != 2 || tokens[0] != "" || tokens[1] != "page2" { + t.Errorf("pageToken sequence = %v, want [\"\" page2]", tokens) + } +} From c6ec8eff4efd00ddfe52d2ef32bef89cde1fcdc5 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 07:57:13 +1200 Subject: [PATCH 060/250] fix(calendar): route reschedule/cancel to the provider holding the event (#58) booking_hosts.external_provider stamps the writer at creation; updates and cancels prefer the stamp, then id recognition, then the destination for pre-stamp rows. --- CHANGELOG.md | 8 ++ internal/caldav/events_test.go | 40 +++--- internal/calendar/calendar.go | 53 +++++--- internal/calendar/provider_event_test.go | 120 ++++++++++++++++++ .../00062_booking_event_provider.sql | 10 ++ internal/handler/booking_handler.go | 18 ++- .../handler/booking_provider_stamp_test.go | 67 ++++++++++ internal/handler/calendar_reconcile.go | 23 ++-- internal/handler/reassign.go | 25 ++-- 9 files changed, 294 insertions(+), 70 deletions(-) create mode 100644 internal/calendar/provider_event_test.go create mode 100644 internal/db/migrations/00062_booking_event_provider.sql create mode 100644 internal/handler/booking_provider_stamp_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dd4f807..0905df52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,6 +92,14 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad CSP and would break the embedding this exists for. ### Fixed +- **Rescheduling or cancelling after a destination change acts on the provider that + holds the event.** The booking stored which calendar its event was written to but + not which provider wrote it, so a destination move handed old event ids to a + provider that never issued them: silent orphans one way, endless reconciler + retries the other. Each host event now stamps its provider at creation; updates + and cancels prefer the stamp, then id recognition (CalDAV URLs), then the current + destination for pre-stamp rows. Answers + [#58](https://github.com/Calnode/calnode/issues/58). - **The calendar picker no longer drops calendars past the first page.** Microsoft requested `$top=100` calendars once and Google `maxResults=250` once, so anything beyond silently vanished: unreachable for conflict checks and unchoosable as the diff --git a/internal/caldav/events_test.go b/internal/caldav/events_test.go index 42a3cfd4..dce75c20 100644 --- a/internal/caldav/events_test.go +++ b/internal/caldav/events_test.go @@ -112,7 +112,7 @@ func createOn(t *testing.T, svc *calendar.Service, accountEmail string) (eventID if err := svc.SetDestination(ctx, "u1", "caldav", accountEmail); err != nil { t.Fatalf("set destination %s: %v", accountEmail, err) } - eventID, _, calendarID, err := svc.CreateEvent(ctx, "u1", bookingParams()) + eventID, _, calendarID, _, err := svc.CreateEvent(ctx, "u1", bookingParams()) if err != nil || eventID == "" { t.Fatalf("CreateEvent on %s: id=%q err=%v", accountEmail, eventID, err) } @@ -147,10 +147,10 @@ func TestUpdateCancel_eventOnPreviousAccountUsesThatAccount(t *testing.T) { } srvA.reset() - if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, "", moveStart, moveEnd); err != nil { t.Errorf("UpdateEvent: %v", err) } - if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID, ""); err != nil { t.Errorf("CancelEvent: %v", err) } @@ -187,10 +187,10 @@ func TestCancel_emptyCalendarIDResolvesOwnerByURL(t *testing.T) { } srvA.reset() - if err := svc.CancelEvent(ctx, "u1", "", eventID); err != nil { + if err := svc.CancelEvent(ctx, "u1", "", eventID, ""); err != nil { t.Errorf("CancelEvent with no calendar id: %v", err) } - if err := svc.UpdateEvent(ctx, "u1", "", eventID, moveStart, moveEnd); err != nil { + if err := svc.UpdateEvent(ctx, "u1", "", eventID, "", moveStart, moveEnd); err != nil { t.Errorf("UpdateEvent with no calendar id: %v", err) } srvA.onlyOwnCredentials(t, "A") @@ -223,7 +223,7 @@ func TestUpdate_eventInPickedCalendarResolvesToItsAccount(t *testing.T) { }); err != nil { t.Fatal(err) } - eventID, _, calendarID, err := svc.CreateEvent(ctx, "u1", bookingParams()) + eventID, _, calendarID, _, err := svc.CreateEvent(ctx, "u1", bookingParams()) if err != nil || calendarID != work || !strings.HasPrefix(eventID, work) { t.Fatalf("CreateEvent: id=%q cal=%q err=%v, want an event in %s", eventID, calendarID, err, work) } @@ -233,7 +233,7 @@ func TestUpdate_eventInPickedCalendarResolvesToItsAccount(t *testing.T) { srvA.reset() for _, calID := range []string{calendarID, ""} { - if err := svc.UpdateEvent(ctx, "u1", calID, eventID, moveStart, moveEnd); err != nil { + if err := svc.UpdateEvent(ctx, "u1", calID, eventID, "", moveStart, moveEnd); err != nil { t.Errorf("UpdateEvent(calendarID=%q): %v", calID, err) } } @@ -318,10 +318,10 @@ func TestUpdateCancel_destinationMovedToAnotherProvider(t *testing.T) { seedOtherDestination(t, c, svc) srvA.reset() - if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, "", moveStart, moveEnd); err != nil { t.Errorf("UpdateEvent: %v", err) } - if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID, ""); err != nil { t.Errorf("CancelEvent: %v", err) } if len(other.touched) != 0 { @@ -333,7 +333,7 @@ func TestUpdateCancel_destinationMovedToAnotherProvider(t *testing.T) { } // The other provider's own events still route to it, by destination, as before. - if err := svc.CancelEvent(ctx, "u1", "primary", "other-event-1"); err == nil { + if err := svc.CancelEvent(ctx, "u1", "primary", "other-event-1", ""); err == nil { t.Error("CancelEvent of the other provider's event: want its error, got nil") } if !reflect.DeepEqual(other.touched, []string{"other-event-1"}) { @@ -362,10 +362,10 @@ func TestUpdateCancel_owningAccountDisconnectedSendsNothing(t *testing.T) { } srvA.reset() - if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, "", moveStart, moveEnd); err != nil { t.Errorf("UpdateEvent with no CalDAV account left: %v, want nil (no connection to act as)", err) } - if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID, ""); err != nil { t.Errorf("CancelEvent with no CalDAV account left: %v, want nil (no connection to act as)", err) } srvA.noRequests(t, "A") @@ -470,10 +470,10 @@ func TestUpdateCancel_ambiguousOrUnknownOwnerSendsNothing(t *testing.T) { calendarID, eventID := tc.ids(s) // ErrEventUnreachable specifically, not just an error: it is what stops the // reconciler retrying a refusal that no later sweep can change. - if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); !errors.Is(err, calendar.ErrEventUnreachable) { + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, "", moveStart, moveEnd); !errors.Is(err, calendar.ErrEventUnreachable) { t.Errorf("UpdateEvent = %v, want calendar.ErrEventUnreachable when the owning account cannot be established", err) } - if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); !errors.Is(err, calendar.ErrEventUnreachable) { + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID, ""); !errors.Is(err, calendar.ErrEventUnreachable) { t.Errorf("CancelEvent = %v, want calendar.ErrEventUnreachable when the owning account cannot be established", err) } s.srvA.noRequests(t, "A") @@ -511,11 +511,11 @@ func TestUpdateCancel_serverFailureStaysRetryable(t *testing.T) { eventID, calendarID := createOn(t, svc, "a@a.test") tc.fail(t, c, srvA) - err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd) + err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, "", moveStart, moveEnd) if err == nil || errors.Is(err, calendar.ErrEventUnreachable) { t.Errorf("UpdateEvent = %v, want a retryable error (not ErrEventUnreachable)", err) } - err = svc.CancelEvent(ctx, "u1", calendarID, eventID) + err = svc.CancelEvent(ctx, "u1", calendarID, eventID, "") if err == nil || errors.Is(err, calendar.ErrEventUnreachable) { t.Errorf("CancelEvent = %v, want a retryable error (not ErrEventUnreachable)", err) } @@ -538,16 +538,16 @@ func TestUpdateCancel_singleAccountUnchanged(t *testing.T) { path := strings.TrimPrefix(eventID, srvA.URL) srvA.reset() - if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, moveStart, moveEnd); err != nil { + if err := svc.UpdateEvent(ctx, "u1", calendarID, eventID, "", moveStart, moveEnd); err != nil { t.Errorf("UpdateEvent: %v", err) } - if err := svc.UpdateEvent(ctx, "u1", "", eventID, moveStart, moveEnd); err != nil { + if err := svc.UpdateEvent(ctx, "u1", "", eventID, "", moveStart, moveEnd); err != nil { t.Errorf("UpdateEvent (no calendar id): %v", err) } - if err := svc.CancelEvent(ctx, "u1", calendarID, eventID); err != nil { + if err := svc.CancelEvent(ctx, "u1", calendarID, eventID, ""); err != nil { t.Errorf("CancelEvent: %v", err) } - if err := svc.CancelEvent(ctx, "u1", "", eventID); err != nil { + if err := svc.CancelEvent(ctx, "u1", "", eventID, ""); err != nil { t.Errorf("CancelEvent (no calendar id): %v", err) } a := func(method, ifMatch string) davReq { diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index 1561948b..d5373d4c 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -86,8 +86,9 @@ type Provider interface { // the events written before the move nor hands their ids to a provider that never issued them. // // CalDAV implements it: its event id is the absolute URL of the event resource. Google and -// Microsoft ids are opaque and never URLs; they do not implement it and keep routing by -// destination. +// Microsoft ids are opaque and never URLs; for them the stamped provider recorded at creation +// (booking_hosts.external_provider, migration 00062) decides, falling back to recognition and +// then the destination for rows written before stamping. type EventRecognizer interface { RecognizesEvent(eventID string) bool } @@ -380,18 +381,32 @@ func (s *Service) FreeBusy(ctx context.Context, userID string, from, to time.Tim } // CreateEvent creates an event on the user's DESTINATION calendar. Returns the event id, -// the join URL, and the calendar it was written to; ("","","",nil) if they have no -// destination. Persist the calendar id alongside the event id. -func (s *Service) CreateEvent(ctx context.Context, userID string, p CreateEventParams) (string, string, string, error) { +// the join URL, the calendar it was written to, and the provider that wrote it; +// ("","","","",nil) if they have no destination. Persist the calendar id AND the provider +// alongside the event id: the provider stamp is what routes later updates and cancels +// after a destination move (issue #58). +func (s *Service) CreateEvent(ctx context.Context, userID string, p CreateEventParams) (string, string, string, string, error) { if pr := s.providerForDestination(ctx, userID); pr != nil { - return pr.CreateEvent(ctx, userID, p) + eventID, joinURL, calendarID, err := pr.CreateEvent(ctx, userID, p) + if err != nil { + return "", "", "", "", err + } + return eventID, joinURL, calendarID, pr.Name(), nil } - return "", "", "", nil + return "", "", "", "", nil } -// providerForEvent resolves the provider an existing event belongs to: the one that recognizes -// its id (EventRecognizer), else the user's destination provider. Returns nil if neither. -func (s *Service) providerForEvent(ctx context.Context, userID, eventID string) Provider { +// providerForEvent resolves the provider an existing event belongs to: the stamped +// provider recorded at creation (empty for rows written before stamping), else one +// that recognizes its id (EventRecognizer), else the user's destination provider. +// Returns nil if none. A stamped provider that is no longer registered falls through +// to recognition and destination rather than stranding the event. +func (s *Service) providerForEvent(ctx context.Context, userID, eventID, storedProvider string) Provider { + if storedProvider != "" { + if pr := s.providers[storedProvider]; pr != nil { + return pr + } + } for _, name := range s.ProviderNames() { if r, ok := s.providers[name].(EventRecognizer); ok && r.RecognizesEvent(eventID) { return s.providers[name] @@ -400,20 +415,20 @@ func (s *Service) providerForEvent(ctx context.Context, userID, eventID string) return s.providerForDestination(ctx, userID) } -// UpdateEvent moves an event. calendarID is the one recorded at creation; empty falls back -// to the user's current destination. The provider is the one that recognizes eventID, if any -// does, else the destination's (providerForEvent). -func (s *Service) UpdateEvent(ctx context.Context, userID, calendarID, eventID string, start, end time.Time) error { - if pr := s.providerForEvent(ctx, userID, eventID); pr != nil { +// UpdateEvent moves an event. calendarID is the one recorded at creation; provider is +// the stamped provider recorded alongside it ("" for pre-stamp rows: recognition, then +// the user's current destination). +func (s *Service) UpdateEvent(ctx context.Context, userID, calendarID, eventID, provider string, start, end time.Time) error { + if pr := s.providerForEvent(ctx, userID, eventID, provider); pr != nil { return pr.UpdateEvent(ctx, userID, calendarID, eventID, start, end) } return nil } -// CancelEvent deletes an event. calendarID is the one recorded at creation; empty falls -// back to the user's current destination. The provider is chosen as for UpdateEvent. -func (s *Service) CancelEvent(ctx context.Context, userID, calendarID, eventID string) error { - if pr := s.providerForEvent(ctx, userID, eventID); pr != nil { +// CancelEvent deletes an event. calendarID and provider are the ones recorded at +// creation; provider "" falls back as for UpdateEvent. +func (s *Service) CancelEvent(ctx context.Context, userID, calendarID, eventID, provider string) error { + if pr := s.providerForEvent(ctx, userID, eventID, provider); pr != nil { return pr.CancelEvent(ctx, userID, calendarID, eventID) } return nil diff --git a/internal/calendar/provider_event_test.go b/internal/calendar/provider_event_test.go new file mode 100644 index 00000000..6043a208 --- /dev/null +++ b/internal/calendar/provider_event_test.go @@ -0,0 +1,120 @@ +package calendar + +import ( + "context" + "testing" + "time" + + "github.com/calnode/calnode/internal/db" + "github.com/calnode/calnode/internal/slots" +) + +// recordProvider is a stub Provider that logs which of its write ops ran, so +// routing tests can assert WHERE an event went rather than merely that it went. +type recordProvider struct { + name string + recognize func(string) bool + log *[]string +} + +func (p *recordProvider) Name() string { return p.name } +func (p *recordProvider) InvitesGuests() bool { return false } +func (p *recordProvider) AuthURL(string) string { return "" } +func (p *recordProvider) EncryptState(string) (string, error) { return "", nil } +func (p *recordProvider) DecryptState(string) (string, error) { return "", nil } +func (p *recordProvider) Exchange(context.Context, string, string, string) error { return nil } +func (p *recordProvider) Connected(context.Context, string) (bool, error) { return true, nil } +func (p *recordProvider) Disconnect(context.Context, string) error { return nil } +func (p *recordProvider) HasDestination(context.Context, string) (bool, error) { return true, nil } +func (p *recordProvider) ListCalendars(context.Context, string, string) ([]CalendarInfo, error) { + return nil, nil +} +func (p *recordProvider) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return nil, nil +} +func (p *recordProvider) CreateEvent(context.Context, string, CreateEventParams) (string, string, string, error) { + return "", "", "", nil +} +func (p *recordProvider) UpdateEvent(context.Context, string, string, string, time.Time, time.Time) error { + *p.log = append(*p.log, p.name+":update") + return nil +} +func (p *recordProvider) CancelEvent(context.Context, string, string, string) error { + *p.log = append(*p.log, p.name+":cancel") + return nil +} +func (p *recordProvider) RecognizesEvent(id string) bool { + return p.recognize != nil && p.recognize(id) +} + +// TestProviderForEvent_prefersStampedProvider is the fix for issue #58: an event +// written by Google must go back to Google even after the destination moved to +// Microsoft. Empty stamps keep the old behaviour (recognition, then destination); +// unknown stamps fall through instead of stranding the event. +func TestProviderForEvent_prefersStampedProvider(t *testing.T) { + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + ctx := context.Background() + if _, err := database.ExecContext(ctx, + `INSERT INTO users (id, email, name, iana_timezone, is_admin, created_at) + VALUES ('host', 'host@x.test', 'H', 'UTC', 0, '2026-01-01T00:00:00Z')`); err != nil { + t.Fatal(err) + } + for _, pc := range []struct { + provider string + dest int + }{ + {"google", 0}, + {"microsoft", 1}, // current destination + } { + if _, err := database.ExecContext(ctx, + `INSERT INTO calendar_connections + (id, user_id, provider, access_token_enc, calendar_id, + check_conflicts, is_destination, created_at) + VALUES (?, 'host', ?, 'e', 'primary', 1, ?, '2026-01-01T00:00:00Z')`, + "host-"+pc.provider, pc.provider, pc.dest); err != nil { + t.Fatal(err) + } + } + + var log []string + isURL := func(id string) bool { return len(id) > 8 && id[:8] == "https://" } + svc := NewService(database) + svc.Register(&recordProvider{name: "google", log: &log}) + svc.Register(&recordProvider{name: "microsoft", log: &log}) + svc.Register(&recordProvider{name: "caldav", recognize: isURL, log: &log}) + + start := time.Now() + cases := []struct { + name, eventID, stamp string + want string + }{ + {"stamped google beats microsoft destination", "opaque-google-id", "google", "google"}, + {"empty stamp falls back to destination", "opaque-google-id", "", "microsoft"}, + {"unknown stamp falls back to destination", "opaque-google-id", "nope", "microsoft"}, + {"caldav URL recognized without stamp", "https://cal.example/x/evt.ics", "", "caldav"}, + {"stamp beats recognition", "https://cal.example/x/evt.ics", "microsoft", "microsoft"}, + } + for _, tc := range cases { + log = nil + if err := svc.UpdateEvent(ctx, "host", "cal", tc.eventID, tc.stamp, start, start.Add(time.Hour)); err != nil { + t.Fatalf("%s: UpdateEvent: %v", tc.name, err) + } + if len(log) != 1 || log[0] != tc.want+":update" { + t.Errorf("%s: routed to %v, want %s", tc.name, log, tc.want) + } + log = nil + if err := svc.CancelEvent(ctx, "host", "cal", tc.eventID, tc.stamp); err != nil { + t.Fatalf("%s: CancelEvent: %v", tc.name, err) + } + if len(log) != 1 || log[0] != tc.want+":cancel" { + t.Errorf("%s: routed to %v, want %s", tc.name, log, tc.want) + } + } +} diff --git a/internal/db/migrations/00062_booking_event_provider.sql b/internal/db/migrations/00062_booking_event_provider.sql new file mode 100644 index 00000000..bcc8ee52 --- /dev/null +++ b/internal/db/migrations/00062_booking_event_provider.sql @@ -0,0 +1,10 @@ +-- +goose Up +-- Stamp which provider wrote a booking's calendar event, so reschedule and +-- cancel act on the account that holds the event even after the host moves +-- their destination to another provider (issue #58). Empty means "recorded +-- before stamping": fall back to event-id recognition (CalDAV URLs) and then +-- the current destination, the previous behaviour. +ALTER TABLE booking_hosts ADD COLUMN external_provider TEXT NOT NULL DEFAULT ''; + +-- +goose Down +ALTER TABLE booking_hosts DROP COLUMN external_provider; diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 04dec0de..4b64346b 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -1143,7 +1143,7 @@ func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Book // the per-host event ID so it can be cancelled later. The primary's id // also lives on the booking row for back-compat. if gc != nil { - eventID, link, calID, err := gc.CreateEvent(ctx, host.UserID, calendar.CreateEventParams{ + eventID, link, calID, provider, err := gc.CreateEvent(ctx, host.UserID, calendar.CreateEventParams{ // The attendee is added as a calendar invitee below, so this text reaches // them via the provider's own native invite (Google/Outlook/CalDAV) — // follows their locale like the confirmation email, not English/host-fixed. @@ -1164,9 +1164,10 @@ func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Book // re-resolving the host's destination, so changing that later cannot orphan // this event (see migration 00055). if _, err := h.db.ExecContext(ctx, - `UPDATE booking_hosts SET external_event_id = ?, external_calendar_id = ? + `UPDATE booking_hosts SET external_event_id = ?, external_calendar_id = ?, + external_provider = ? WHERE booking_id = ? AND user_id = ?`, - eventID, calID, b.ID, host.UserID); err != nil { + eventID, calID, provider, b.ID, host.UserID); err != nil { h.logger.Error("save host gcal event id", "error", err, "booking_id", b.ID) } if host.IsPrimary { @@ -1649,7 +1650,7 @@ func (h *Handler) cancelSideEffects(b booking.Booking) { } for _, host := range hosts { if gc != nil && host.ExternalEventID != "" { - if err := gc.CancelEvent(ctx, host.UserID, host.ExternalCalendarID, host.ExternalEventID); err != nil { + if err := gc.CancelEvent(ctx, host.UserID, host.ExternalCalendarID, host.ExternalEventID, host.ExternalProvider); err != nil { h.logger.Error("cancel gcal event", "error", err, "booking_id", b.ID, "host", host.UserID) h.nudgeCalendarReconcile() // event still on the calendar — heal on a later sweep } else { @@ -1768,7 +1769,7 @@ func (h *Handler) moveCalendarEvents(ctx context.Context, bookingID string, star if host.ExternalEventID == "" { continue } - if err := gc.UpdateEvent(ctx, host.UserID, host.ExternalCalendarID, host.ExternalEventID, start, end); err != nil { + if err := gc.UpdateEvent(ctx, host.UserID, host.ExternalCalendarID, host.ExternalEventID, host.ExternalProvider, start, end); err != nil { // The event is now at the wrong time — flag it so the reconciler re-applies // the move on a later sweep (drift can't be inferred from booking state). h.logger.Error("reschedule: move gcal event", "error", err, "booking_id", bookingID, "host", host.UserID) @@ -1805,6 +1806,9 @@ type assignedHost struct { // Which calendar that event lives in. Empty for bookings made before this was // recorded, which means "resolve the host's current destination" - see migration 00055. ExternalCalendarID string + // Which provider wrote the event. Empty for bookings made before this was + // stamped (migration 00062): fall back to id recognition, then the destination. + ExternalProvider string } // assignedHosts returns every host attending a booking, primary first. Group @@ -1815,7 +1819,7 @@ type assignedHost struct { func (h *Handler) assignedHosts(ctx context.Context, bookingID string) ([]assignedHost, error) { rows, err := h.db.QueryContext(ctx, ` SELECT bh.user_id, u.name, u.email, bh.is_primary, COALESCE(bh.external_event_id, ''), - COALESCE(bh.external_calendar_id, '') + COALESCE(bh.external_calendar_id, ''), COALESCE(bh.external_provider, '') FROM booking_hosts bh JOIN users u ON u.id = bh.user_id WHERE bh.booking_id = ? ORDER BY bh.is_primary DESC, u.name ASC`, bookingID) @@ -1827,7 +1831,7 @@ func (h *Handler) assignedHosts(ctx context.Context, bookingID string) ([]assign for rows.Next() { var a assignedHost var primary int - if err := rows.Scan(&a.UserID, &a.Name, &a.Email, &primary, &a.ExternalEventID, &a.ExternalCalendarID); err != nil { + if err := rows.Scan(&a.UserID, &a.Name, &a.Email, &primary, &a.ExternalEventID, &a.ExternalCalendarID, &a.ExternalProvider); err != nil { return nil, err } a.IsPrimary = primary != 0 diff --git a/internal/handler/booking_provider_stamp_test.go b/internal/handler/booking_provider_stamp_test.go new file mode 100644 index 00000000..ca8502c3 --- /dev/null +++ b/internal/handler/booking_provider_stamp_test.go @@ -0,0 +1,67 @@ +package handler_test + +import ( + "context" + "fmt" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" + + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/slots" +) + +type stampCalendar struct { + calendar.Provider + created chan struct{} +} + +func (p stampCalendar) Name() string { return "google" } +func (p stampCalendar) InvitesGuests() bool { return true } +func (p stampCalendar) HasDestination(context.Context, string) (bool, error) { return true, nil } +func (p stampCalendar) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return nil, nil +} +func (p stampCalendar) CreateEvent(context.Context, string, calendar.CreateEventParams) (string, string, string, error) { + p.created <- struct{}{} + return "event-id", "", "primary", nil +} + +// TestBookingStampsEventProvider is the write half of the issue #58 fix: the +// provider that writes the event is recorded on booking_hosts so later updates +// and cancels route back to it after a destination move. Calendar creation runs +// in a background goroutine, so the test waits for the create before asserting. +func TestBookingStampsEventProvider(t *testing.T) { + h, db, key, userID := setupWorkspaceWithDB(t) + slug, _ := seedEventTypeHTTP(t, h, key) + if _, err := db.Exec(`INSERT INTO calendar_connections (id,user_id,provider,access_token_enc,calendar_id,is_destination) VALUES ('conn',?,'google','test','primary',1)`, userID); err != nil { + t.Fatal(err) + } + p := stampCalendar{created: make(chan struct{}, 1)} + svc := calendar.NewService(db) + svc.Register(p) + h.SetCalendar(svc) + + body := fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T09:00:00Z","name":"Test","email":"test@example.com"}`, slug) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + if rec.Code != 201 { + t.Fatalf("status %d: %s", rec.Code, rec.Body) + } + select { + case <-p.created: + case <-time.After(5 * time.Second): + t.Fatal("calendar event was not created") + } + var provider string + if err := db.QueryRow(`SELECT COALESCE(external_provider,'') FROM booking_hosts WHERE external_event_id = 'event-id'`).Scan(&provider); err != nil { + t.Fatal(err) + } + if provider != "google" { + t.Fatalf("external_provider = %q, want google", provider) + } +} diff --git a/internal/handler/calendar_reconcile.go b/internal/handler/calendar_reconcile.go index 5112cbc9..9798f018 100644 --- a/internal/handler/calendar_reconcile.go +++ b/internal/handler/calendar_reconcile.go @@ -68,14 +68,14 @@ func (h *Handler) reconcileCalendar() { func (h *Handler) reconcileReschedules(ctx context.Context, gc *calendar.Service) { now := time.Now().UTC().Format(time.RFC3339) type drift struct { - bookingID, userID, eventID, calendarID, startStr, endStr string + bookingID, userID, eventID, calendarID, provider, startStr, endStr string } // Read fully before acting — the single DB connection can't serve the inner // UpdateEvent/UPDATE while a cursor is open (would deadlock). Only upcoming // confirmed bookings matter; past ones need no calendar correction. var items []drift rows, err := h.db.QueryContext(ctx, ` - SELECT bh.booking_id, bh.user_id, bh.external_event_id, COALESCE(bh.external_calendar_id, ''), b.start_at, b.end_at + SELECT bh.booking_id, bh.user_id, bh.external_event_id, COALESCE(bh.external_calendar_id, ''), COALESCE(bh.external_provider, ''), b.start_at, b.end_at FROM booking_hosts bh JOIN bookings b ON b.id = bh.booking_id WHERE bh.needs_sync = 1 AND b.status = 'confirmed' AND COALESCE(bh.external_event_id, '') != '' AND b.end_at > ?`, now) @@ -85,7 +85,7 @@ func (h *Handler) reconcileReschedules(ctx context.Context, gc *calendar.Service } for rows.Next() { var d drift - if err := rows.Scan(&d.bookingID, &d.userID, &d.eventID, &d.calendarID, &d.startStr, &d.endStr); err == nil { + if err := rows.Scan(&d.bookingID, &d.userID, &d.eventID, &d.calendarID, &d.provider, &d.startStr, &d.endStr); err == nil { items = append(items, d) } } @@ -97,7 +97,7 @@ func (h *Handler) reconcileReschedules(ctx context.Context, gc *calendar.Service if err1 != nil || err2 != nil { continue } - if err := gc.UpdateEvent(ctx, d.userID, d.calendarID, d.eventID, start, end); err != nil { + if err := gc.UpdateEvent(ctx, d.userID, d.calendarID, d.eventID, d.provider, start, end); err != nil { if !errors.Is(err, calendar.ErrEventUnreachable) { h.logger.Error("reconcile: re-apply event time", "error", err, "booking_id", d.bookingID, "host", d.userID) continue // leave the flag set; retry next sweep @@ -120,12 +120,12 @@ func (h *Handler) reconcileReschedules(ctx context.Context, gc *calendar.Service // bookings (the inline cancel never reached Google). On success the per-host // event id is cleared so the row drops out of the next sweep. func (h *Handler) reconcileCancellations(ctx context.Context, gc *calendar.Service) { - type orphan struct{ bookingID, userID, eventID, calendarID string } + type orphan struct{ bookingID, userID, eventID, calendarID, provider string } // Read fully before acting — the single DB connection can't serve the inner // CancelEvent/UPDATE queries while a cursor is open (would deadlock). var orphans []orphan rows, err := h.db.QueryContext(ctx, ` - SELECT bh.booking_id, bh.user_id, bh.external_event_id, COALESCE(bh.external_calendar_id, '') + SELECT bh.booking_id, bh.user_id, bh.external_event_id, COALESCE(bh.external_calendar_id, ''), COALESCE(bh.external_provider, '') FROM booking_hosts bh JOIN bookings b ON b.id = bh.booking_id WHERE b.status = 'cancelled' AND COALESCE(bh.external_event_id, '') != ''`) if err != nil { @@ -134,14 +134,14 @@ func (h *Handler) reconcileCancellations(ctx context.Context, gc *calendar.Servi } for rows.Next() { var o orphan - if err := rows.Scan(&o.bookingID, &o.userID, &o.eventID, &o.calendarID); err == nil { + if err := rows.Scan(&o.bookingID, &o.userID, &o.eventID, &o.calendarID, &o.provider); err == nil { orphans = append(orphans, o) } } rows.Close() // #nosec G104 -- rows already fully consumed above; nothing actionable on close error for _, o := range orphans { - if err := gc.CancelEvent(ctx, o.userID, o.calendarID, o.eventID); err != nil { + if err := gc.CancelEvent(ctx, o.userID, o.calendarID, o.eventID, o.provider); err != nil { if !errors.Is(err, calendar.ErrEventUnreachable) { h.logger.Error("reconcile: cancel orphaned event", "error", err, "booking_id", o.bookingID, "host", o.userID) continue // leave the id in place; retry next sweep @@ -230,7 +230,7 @@ func (h *Handler) reconcileCreations(ctx context.Context, gc *calendar.Service) } } loc := i18n.Get(m.orgLocale) // nil (→ English) if empty/unrecognized; i18n.Locale.T handles nil safely - eventID, link, calID, err := gc.CreateEvent(ctx, m.userID, calendar.CreateEventParams{ + eventID, link, calID, provider, err := gc.CreateEvent(ctx, m.userID, calendar.CreateEventParams{ Summary: loc.Tf("calendar_event_summary", m.etName, m.orgName), Description: loc.Tf("calendar_event_booking_id", m.bookingID), Location: m.bookingLoc, @@ -248,9 +248,10 @@ func (h *Handler) reconcileCreations(ctx context.Context, gc *calendar.Service) continue } if _, err := h.db.ExecContext(ctx, - `UPDATE booking_hosts SET external_event_id = ?, external_calendar_id = ? + `UPDATE booking_hosts SET external_event_id = ?, external_calendar_id = ?, + external_provider = ? WHERE booking_id = ? AND user_id = ?`, - eventID, calID, m.bookingID, m.userID); err != nil { + eventID, calID, provider, m.bookingID, m.userID); err != nil { h.logger.Error("reconcile: save healed event id", "error", err, "booking_id", m.bookingID) } if m.isPrimary { diff --git a/internal/handler/reassign.go b/internal/handler/reassign.go index 3c68d774..27ad9bb8 100644 --- a/internal/handler/reassign.go +++ b/internal/handler/reassign.go @@ -98,15 +98,16 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { } // Capture the old host + calendar event + summary fields before the move. - var oldHostID, extEventID, etName, orgName, orgEmail, orgLocale string + var oldHostID, extEventID, extProvider, etName, orgName, orgEmail, orgLocale string err = h.db.QueryRowContext(r.Context(), ` - SELECT b.host_id, COALESCE(b.external_event_id,''), et.name, - COALESCE(a.name,''), COALESCE(a.email,''), COALESCE(a.locale,'') + SELECT b.host_id, COALESCE(b.external_event_id,''), COALESCE(bh.external_provider,''), + et.name, COALESCE(a.name,''), COALESCE(a.email,''), COALESCE(a.locale,'') FROM bookings b JOIN event_types et ON et.id = b.event_type_id LEFT JOIN booking_attendees a ON a.booking_id = b.id AND a.is_organizer = 1 + LEFT JOIN booking_hosts bh ON bh.booking_id = b.id AND bh.user_id = b.host_id WHERE b.id = ?`, id). - Scan(&oldHostID, &extEventID, &etName, &orgName, &orgEmail, &orgLocale) + Scan(&oldHostID, &extEventID, &extProvider, &etName, &orgName, &orgEmail, &orgLocale) if errors.Is(err, sql.ErrNoRows) { h.writeError(w, http.StatusNotFound, "booking not found") return @@ -159,17 +160,14 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { // produced nothing, e.g. the new host has no destination calendar). if gc := h.getCal(); gc != nil { if extEventID != "" { - // Reassignment cancels on the OLD host's calendar. Their stored calendar id is not - // loaded here, so this falls back to resolving their destination - the same - // behaviour as before, and correct unless they also moved their destination. - // A CalDAV event is the exception: its id is its URL, which is enough to find the - // account that holds it wherever the destination is now. - if err := gc.CancelEvent(ctx, oldHostID, "", extEventID); err != nil { + // Reassignment cancels on the OLD host's calendar. Their stamped provider + // routes it ("" falls back to id recognition, then their destination). + if err := gc.CancelEvent(ctx, oldHostID, "", extEventID, extProvider); err != nil { h.logger.Error("reassign: delete old calendar event", "error", err, "booking_id", bCopy.ID) } } loc := i18n.Get(orgLocale) // nil (→ English) if empty/unrecognized; i18n.Locale.T handles nil safely - newEventID, _, newCalID, err := gc.CreateEvent(ctx, newHostID, calendar.CreateEventParams{ + newEventID, _, newCalID, newProvider, err := gc.CreateEvent(ctx, newHostID, calendar.CreateEventParams{ Summary: loc.Tf("calendar_event_summary", etName, orgName), Description: loc.Tf("calendar_event_booking_id", bCopy.ID), Location: bCopy.LocationValue, // keep the existing Meet link (don't mint a new one) @@ -186,9 +184,10 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { h.logger.Error("reassign: persist new event id", "error", err, "booking_id", bCopy.ID) } if _, err := h.db.ExecContext(ctx, - `UPDATE booking_hosts SET external_event_id = ?, external_calendar_id = ? + `UPDATE booking_hosts SET external_event_id = ?, external_calendar_id = ?, + external_provider = ? WHERE booking_id = ? AND is_primary = 1`, - newEventID, newCalID, bCopy.ID); err != nil { + newEventID, newCalID, newProvider, bCopy.ID); err != nil { h.logger.Error("reassign: persist host event id", "error", err, "booking_id", bCopy.ID) } } From 62511c0d3b8a8149f03258d2743a1e24297d4d72 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 09:11:56 +1200 Subject: [PATCH 061/250] audit fixes: reschedule esc(), user-delete cascade, refund idempotency, confirmation durability, slots degraded flag, hardening pass - manage.html had no esc(): reschedule slot list threw on any open day - booking_hosts + MCP OAuth tables cascade on user delete; guard covers group seats and blocks on primary-host history with a clear 409 - Stripe refunds claim-first with idempotency key; failure reverts to paid - confirmations retry once, then set bookings.confirm_failed (surfaced JSON) - per-email hourly throttle enforced inside the creation transaction - slots carry degraded:true on provider outage; all 3 surfaces warn - jobs: finished_at + 30d purge of terminal rows, partial unique index, conditional mark-done; webhook deliveries pending until retries exhaust - LiveKit webhook replay protection (exp/iat, 5min skew) - access-log token redaction, panic-recovery middleware, accent read guard, reconciler quarantine + cancel clears needs_sync, leastLoaded counts seats, reminder parse accepts fractional seconds, worker ORDER BY, bounded drain --- CHANGELOG.md | 20 +++ cmd/calnode/main.go | 10 +- internal/booking/booking.go | 12 +- internal/booking/service.go | 43 +++++- internal/calendar/calendar.go | 5 +- .../db/migrations/00012_auth_providers.sql | 3 + .../migrations/00063_user_delete_cascade.sql | 130 ++++++++++++++++++ .../00064_booking_confirm_failed.sql | 9 ++ .../db/migrations/00065_jobs_finished_at.sql | 19 +++ internal/handler/book.go | 2 + internal/handler/booking_accent.go | 22 +++ internal/handler/booking_assistant.go | 2 + internal/handler/booking_handler.go | 71 ++++++++-- internal/handler/calendar_reconcile.go | 11 ++ internal/handler/embed.js | 10 +- internal/handler/manage_handler.go | 1 + internal/handler/mcp.go | 2 + internal/handler/roles_test.go | 45 +++++- internal/handler/slots_busy_test.go | 10 +- internal/handler/slots_degraded_test.go | 54 ++++++++ internal/handler/slots_handler.go | 42 ++++-- internal/handler/stripe_booking.go | 39 ++++-- internal/handler/stripe_refund_test.go | 109 +++++++++++++++ internal/handler/templates/book.html | 10 +- internal/handler/templates/manage.html | 13 ++ internal/handler/users.go | 40 +++++- internal/i18n/locales/de.json | 3 +- internal/i18n/locales/en.json | 3 +- internal/i18n/locales/es.json | 3 +- internal/i18n/locales/fr-CA.json | 3 +- internal/i18n/locales/fr.json | 3 +- internal/i18n/locales/it.json | 3 +- internal/i18n/locales/nl.json | 3 +- internal/i18n/locales/pt.json | 3 +- internal/i18n/locales/sv.json | 3 +- internal/livekit/admin.go | 18 +++ internal/livekit/livekit_test.go | 40 ++++++ internal/server/middleware.go | 40 +++++- internal/server/server.go | 2 +- internal/stripe/stripe.go | 17 ++- internal/worker/worker.go | 67 +++++++-- 41 files changed, 871 insertions(+), 74 deletions(-) create mode 100644 internal/db/migrations/00063_user_delete_cascade.sql create mode 100644 internal/db/migrations/00064_booking_confirm_failed.sql create mode 100644 internal/db/migrations/00065_jobs_finished_at.sql create mode 100644 internal/handler/slots_degraded_test.go create mode 100644 internal/handler/stripe_refund_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 0905df52..df8be69a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,6 +92,26 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad CSP and would break the embedding this exists for. ### Fixed +- **Rescheduling on the manage page works again.** Its slot list called an `esc()` + helper that only ever existed on the booking page, so any day with availability + threw before rendering and could not be rescheduled. The helper is now defined + on both surfaces. +- **Removing a member no longer 500s on booking history, and no longer leaves + their MCP tokens valid.** `booking_hosts.user_id` had no `ON DELETE` action; + both it and the token tables now cascade. The upcoming-booking guard covers + group seats too, and primary-host history (past or present) blocks with a 409 + naming reassignment instead of failing in SQL. +- **Cancelling a paid booking cannot double-refund.** The refund row is claimed + with a conditional update before Stripe is called, the call carries an + idempotency key, and a Stripe failure reverts the claim so a later cancel + retries instead of silently keeping the money. +- **A lost confirmation email is retried once and then flagged, not just logged.** + Confirmation sends get one retry; a final failure sets `confirm_failed` on the + booking, surfaced on the booking JSON for follow-up. +- **The slots response says when its busy data is incomplete.** A provider outage + used to read as free time while booking stayed fail-closed, offering slots that + could not be sold. Slots now carry `degraded: true`, and all three booking + surfaces show a warning. - **Rescheduling or cancelling after a destination change acts on the provider that holds the event.** The booking stored which calendar its event was written to but not which provider wrote it, so a destination move handed old event ids to a diff --git a/cmd/calnode/main.go b/cmd/calnode/main.go index 115a6954..2ffbae86 100644 --- a/cmd/calnode/main.go +++ b/cmd/calnode/main.go @@ -137,6 +137,14 @@ func main() { os.Exit(1) } - <-workerDone // wait for current poll cycle to complete before db.Close() + // Bound the worker drain: Poll uses context.Background internally, so an + // in-flight cycle (up to 10 jobs × 30 s SMTP bounds) could otherwise linger + // for minutes on SIGTERM and stall deploys. Jobs are idempotent across + // restarts (claimed rows, retried payloads), so abandoning the drain is safe. + select { + case <-workerDone: // wait for current poll cycle to complete before db.Close() + case <-time.After(60 * time.Second): + logger.Error("worker drain timed out; exiting with jobs to retry on restart") + } logger.Info("server stopped") } diff --git a/internal/booking/booking.go b/internal/booking/booking.go index 1ac2aa45..85ac6321 100644 --- a/internal/booking/booking.go +++ b/internal/booking/booking.go @@ -11,6 +11,7 @@ var ( ErrAlreadyCancelled = errors.New("booking: already cancelled") ErrTokenNotFound = errors.New("booking: manage token not found or expired") ErrBookingLimitReached = errors.New("booking: active booking limit reached for this invitee") + ErrEmailThrottled = errors.New("booking: too many bookings from this email address") ) // Booking is a confirmed or cancelled appointment. @@ -26,9 +27,12 @@ type Booking struct { LocationType string CreatedAt time.Time UpdatedAt time.Time - PaymentStatus string // none | pending | paid | refunded + PaymentStatus string // none | pending | paid | refunded | refunding (refund claimed, Stripe call in flight) AmountPaidCents int AmountPaidCurrency string + // ConfirmFailed reports whether the initial confirmation email failed (after + // retry). Operator-visible via the booking JSON; see migration 00064. + ConfirmFailed bool } // Attendee is a participant in a booking (the person who made the booking). @@ -78,4 +82,10 @@ type CreateParams struct { // MaxActivePerInvitee caps how many active (upcoming, non-cancelled) bookings // the organizer's email may already hold for this event type. 0 = unlimited. MaxActivePerInvitee int + // MaxBookingsPerHour caps how many bookings the organizer's email may create + // workspace-wide in the trailing hour (cancelled bookings count, so + // book/cancel/rebook churn is bounded). 0 = unlimited. Checked inside the + // creation transaction, next to the active cap, so concurrent submissions + // can't both slip past a read-then-write check. + MaxBookingsPerHour int } diff --git a/internal/booking/service.go b/internal/booking/service.go index 1e0eb3ec..419b49de 100644 --- a/internal/booking/service.go +++ b/internal/booking/service.go @@ -134,6 +134,23 @@ func (s *Service) Create(ctx context.Context, p CreateParams) (*Booking, error) } } + // Hourly per-email throttle, inside the transaction for the same reason: + // two simultaneous submissions must not both read below the cap and both + // insert. Counts cancelled bookings too, bounding book/cancel/rebook churn. + if p.MaxBookingsPerHour > 0 { + var recent int + if err := tx.QueryRowContext(ctx, ` + SELECT COUNT(*) FROM bookings b + JOIN booking_attendees a ON a.booking_id = b.id AND a.is_organizer = 1 + WHERE a.email = ? COLLATE NOCASE AND b.created_at > ?`, + p.Organizer.Email, time.Now().UTC().Add(-time.Hour).Format(time.RFC3339Nano)).Scan(&recent); err != nil { + return nil, fmt.Errorf("booking: hourly throttle check: %w", err) + } + if recent >= p.MaxBookingsPerHour { + return nil, ErrEmailThrottled + } + } + bookingID := uid.New() _, err = tx.ExecContext(ctx, ` @@ -207,6 +224,14 @@ func (s *Service) Create(ctx context.Context, p CreateParams) (*Booking, error) }, nil } +// clearNeedsSync drops reschedule-drift flags when a booking is cancelled: the +// reschedule reconciler only sweeps confirmed bookings, so without this a flag +// set before the cancel would sit forever — never cleared, never acted on. +func (s *Service) clearNeedsSync(ctx context.Context, bookingID string) { + _, _ = s.db.ExecContext(ctx, + `UPDATE booking_hosts SET needs_sync = 0 WHERE booking_id = ?`, bookingID) +} + // Cancel marks a booking as cancelled. hostID must match the booking's host_id // so that one user cannot cancel another user's bookings. Returns ErrNotFound // if the booking does not exist or belongs to a different host, and @@ -236,6 +261,7 @@ func (s *Service) Cancel(ctx context.Context, hostID, id, reason string) error { } return ErrAlreadyCancelled } + s.clearNeedsSync(ctx, id) return nil } @@ -263,6 +289,7 @@ func (s *Service) CancelByID(ctx context.Context, id, reason string) error { } return ErrAlreadyCancelled } + s.clearNeedsSync(ctx, id) return nil } @@ -272,7 +299,8 @@ func (s *Service) CancelByID(ctx context.Context, id, reason string) error { const bookingColumns = `id, event_type_id, host_id, start_at, end_at, status, COALESCE(cancellation_reason, ''), COALESCE(location_value, ''), created_at, updated_at, - payment_status, amount_paid_cents, amount_paid_currency, location_type` + payment_status, amount_paid_cents, amount_paid_currency, location_type, + confirm_failed` // hostBusy reports whether hostID has any non-cancelled booking overlapping // [start, end) — the double-booking invariant every write path (Create, Reschedule, @@ -406,10 +434,11 @@ func leastLoadedHost(ctx context.Context, tx *sql.Tx, eventTypeID string, candid args = append(args, c) } rows, err := tx.QueryContext(ctx, - `SELECT host_id, COUNT(*) FROM bookings - WHERE event_type_id = ? AND status != 'cancelled' AND end_at > ? - AND host_id IN (`+strings.Join(ph, ",")+`) - GROUP BY host_id`, args...) // #nosec G202 -- ph is a fixed slice of literal "?" placeholders (one per candidate above); every value is bound via args..., never concatenated into the SQL text + `SELECT bh.user_id, COUNT(DISTINCT b.id) FROM bookings b + JOIN booking_hosts bh ON bh.booking_id = b.id + WHERE b.event_type_id = ? AND b.status != 'cancelled' AND b.end_at > ? + AND bh.user_id IN (`+strings.Join(ph, ",")+`) + GROUP BY bh.user_id`, args...) // #nosec G202 -- ph is a fixed slice of literal "?" placeholders (one per candidate above); every value is bound via args..., never concatenated into the SQL text if err != nil { return "", fmt.Errorf("booking: load host loads: %w", err) } @@ -594,6 +623,7 @@ func (s *Service) CancelByToken(ctx context.Context, rawToken, reason string) (* if t, err := time.Parse(time.RFC3339Nano, now); err == nil { b.UpdatedAt = t } + s.clearNeedsSync(ctx, b.ID) return b, nil } @@ -631,6 +661,7 @@ type scanner interface { func scanBooking(s scanner) (*Booking, error) { var b Booking var startStr, endStr, createdStr, updatedStr string + var confirmFailed int err := s.Scan( &b.ID, &b.EventTypeID, &b.HostID, @@ -638,6 +669,7 @@ func scanBooking(s scanner) (*Booking, error) { &b.CancellationReason, &b.LocationValue, &createdStr, &updatedStr, &b.PaymentStatus, &b.AmountPaidCents, &b.AmountPaidCurrency, &b.LocationType, + &confirmFailed, ) if err == sql.ErrNoRows { return nil, ErrNotFound @@ -659,5 +691,6 @@ func scanBooking(s scanner) (*Booking, error) { if b.UpdatedAt, parseErr = time.Parse(time.RFC3339Nano, updatedStr); parseErr != nil { return nil, fmt.Errorf("booking: parse updated_at %q: %w", updatedStr, parseErr) } + b.ConfirmFailed = confirmFailed != 0 return &b, nil } diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index d5373d4c..7d4f5bc8 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -330,10 +330,11 @@ func (s *Service) DisconnectOne(ctx context.Context, userID, provider, accountEm } // Without this the account's calendar picks survive the disconnect, and reconnecting the // same address silently inherits them - including a destination pointing at a calendar - // the user may no longer have. + // the user may no longer have. COALESCE matches the lookup above: a legacy row with a + // NULL account_email would otherwise keep its calendars while losing its connection. if _, err := tx.ExecContext(ctx, `DELETE FROM connection_calendars - WHERE user_id = ? AND provider = ? AND account_email = ?`, + WHERE user_id = ? AND provider = ? AND COALESCE(account_email,'') = ?`, userID, provider, accountEmail); err != nil { return err } diff --git a/internal/db/migrations/00012_auth_providers.sql b/internal/db/migrations/00012_auth_providers.sql index fbd92116..fb19adc3 100644 --- a/internal/db/migrations/00012_auth_providers.sql +++ b/internal/db/migrations/00012_auth_providers.sql @@ -26,6 +26,9 @@ DROP INDEX IF EXISTS idx_invite_tokens_email; DROP TABLE IF EXISTS invite_tokens; -- SQLite requires a table rebuild to drop columns. +-- WARNING: the Down rebuild below selects a fixed column subset — running it +-- after any later migration will silently drop every column added since. It is +-- only safe immediately at version 00012, never as a general rollback. CREATE TABLE users_new AS SELECT id, email, name, iana_timezone, avatar_url, is_admin, created_at, time_format, week_start, date_format, diff --git a/internal/db/migrations/00063_user_delete_cascade.sql b/internal/db/migrations/00063_user_delete_cascade.sql new file mode 100644 index 00000000..37e74d1d --- /dev/null +++ b/internal/db/migrations/00063_user_delete_cascade.sql @@ -0,0 +1,130 @@ +-- +goose Up +-- Deleting a user with booking history failed with a foreign-key violation +-- (surfaced as a 500): booking_hosts.user_id referenced users(id) with no +-- ON DELETE action, and the DeleteUser guard only checked bookings.host_id, so +-- even a past group attendee blocked the delete. The MCP OAuth tables never +-- referenced users at all, so a deleted user's bearer tokens stayed valid. +-- SQLite can't ALTER a constraint, so recreate the tables with +-- ON DELETE CASCADE (same approach as 00014). booking_hosts columns are +-- carried verbatim, including the 00062 external_provider stamp. +CREATE TABLE booking_hosts_new ( + id TEXT PRIMARY KEY, + booking_id TEXT NOT NULL REFERENCES bookings(id) ON DELETE CASCADE, + user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE, + is_primary INTEGER NOT NULL DEFAULT 0, + external_event_id TEXT, + needs_sync INTEGER NOT NULL DEFAULT 0, + external_calendar_id TEXT, + external_provider TEXT NOT NULL DEFAULT '', + UNIQUE(booking_id, user_id) +); +INSERT INTO booking_hosts_new + (id, booking_id, user_id, is_primary, external_event_id, needs_sync, + external_calendar_id, external_provider) + SELECT id, booking_id, user_id, is_primary, external_event_id, needs_sync, + external_calendar_id, external_provider + FROM booking_hosts; +DROP TABLE booking_hosts; +ALTER TABLE booking_hosts_new RENAME TO booking_hosts; +CREATE INDEX idx_booking_hosts_booking ON booking_hosts(booking_id); +CREATE INDEX idx_booking_hosts_user ON booking_hosts(user_id); + +CREATE TABLE oauth_auth_codes_new ( + code_hash TEXT PRIMARY KEY, + client_id TEXT NOT NULL, + user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE, + redirect_uri TEXT NOT NULL, + code_challenge TEXT NOT NULL, + scope TEXT NOT NULL DEFAULT '', + resource TEXT NOT NULL DEFAULT '', + expires_at TEXT NOT NULL, + created_at TEXT NOT NULL +); +INSERT INTO oauth_auth_codes_new + (code_hash, client_id, user_id, redirect_uri, code_challenge, scope, + resource, expires_at, created_at) + SELECT code_hash, client_id, user_id, redirect_uri, code_challenge, scope, + resource, expires_at, created_at + FROM oauth_auth_codes; +DROP TABLE oauth_auth_codes; +ALTER TABLE oauth_auth_codes_new RENAME TO oauth_auth_codes; + +CREATE TABLE oauth_access_tokens_new ( + id TEXT PRIMARY KEY, + token_hash TEXT NOT NULL UNIQUE, + refresh_hash TEXT UNIQUE, + client_id TEXT NOT NULL, + user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE, + scope TEXT NOT NULL DEFAULT '', + resource TEXT NOT NULL DEFAULT '', + expires_at TEXT NOT NULL, + created_at TEXT NOT NULL, + last_used_at TEXT +); +INSERT INTO oauth_access_tokens_new + (id, token_hash, refresh_hash, client_id, user_id, scope, resource, + expires_at, created_at, last_used_at) + SELECT id, token_hash, refresh_hash, client_id, user_id, scope, resource, + expires_at, created_at, last_used_at + FROM oauth_access_tokens; +DROP TABLE oauth_access_tokens; +ALTER TABLE oauth_access_tokens_new RENAME TO oauth_access_tokens; +CREATE INDEX idx_oauth_tokens_user ON oauth_access_tokens(user_id); +CREATE INDEX idx_oauth_tokens_refresh ON oauth_access_tokens(refresh_hash); + +-- +goose Down +-- Rebuild without the CASCADE rules (data-preserving; orphans stay orphaned). +CREATE TABLE booking_hosts_old ( + id TEXT PRIMARY KEY, + booking_id TEXT NOT NULL REFERENCES bookings(id) ON DELETE CASCADE, + user_id TEXT NOT NULL REFERENCES users(id), + is_primary INTEGER NOT NULL DEFAULT 0, + external_event_id TEXT, + needs_sync INTEGER NOT NULL DEFAULT 0, + external_calendar_id TEXT, + external_provider TEXT NOT NULL DEFAULT '', + UNIQUE(booking_id, user_id) +); +INSERT INTO booking_hosts_old + (id, booking_id, user_id, is_primary, external_event_id, needs_sync, + external_calendar_id, external_provider) + SELECT id, booking_id, user_id, is_primary, external_event_id, needs_sync, + external_calendar_id, external_provider + FROM booking_hosts; +DROP TABLE booking_hosts; +ALTER TABLE booking_hosts_old RENAME TO booking_hosts; +CREATE INDEX idx_booking_hosts_booking ON booking_hosts(booking_id); +CREATE INDEX idx_booking_hosts_user ON booking_hosts(user_id); + +CREATE TABLE oauth_auth_codes_old ( + code_hash TEXT PRIMARY KEY, + client_id TEXT NOT NULL, + user_id TEXT NOT NULL, + redirect_uri TEXT NOT NULL, + code_challenge TEXT NOT NULL, + scope TEXT NOT NULL DEFAULT '', + resource TEXT NOT NULL DEFAULT '', + expires_at TEXT NOT NULL, + created_at TEXT NOT NULL +); +INSERT INTO oauth_auth_codes_old SELECT * FROM oauth_auth_codes; +DROP TABLE oauth_auth_codes; +ALTER TABLE oauth_auth_codes_old RENAME TO oauth_auth_codes; + +CREATE TABLE oauth_access_tokens_old ( + id TEXT PRIMARY KEY, + token_hash TEXT NOT NULL UNIQUE, + refresh_hash TEXT UNIQUE, + client_id TEXT NOT NULL, + user_id TEXT NOT NULL, + scope TEXT NOT NULL DEFAULT '', + resource TEXT NOT NULL DEFAULT '', + expires_at TEXT NOT NULL, + created_at TEXT NOT NULL, + last_used_at TEXT +); +INSERT INTO oauth_access_tokens_old SELECT * FROM oauth_access_tokens; +DROP TABLE oauth_access_tokens; +ALTER TABLE oauth_access_tokens_old RENAME TO oauth_access_tokens; +CREATE INDEX idx_oauth_tokens_user ON oauth_access_tokens(user_id); +CREATE INDEX idx_oauth_tokens_refresh ON oauth_access_tokens(refresh_hash); diff --git a/internal/db/migrations/00064_booking_confirm_failed.sql b/internal/db/migrations/00064_booking_confirm_failed.sql new file mode 100644 index 00000000..1b956575 --- /dev/null +++ b/internal/db/migrations/00064_booking_confirm_failed.sql @@ -0,0 +1,9 @@ +-- +goose Up +-- Operator-visible flag for a lost initial confirmation: dispatchBookingConfirmation +-- runs in the background, and a failed attendee/host send used to be log-only. +-- confirm_failed = 1 means at least one confirmation send failed (after retry); +-- surfaced on the booking JSON so the admin UI can badge it. +ALTER TABLE bookings ADD COLUMN confirm_failed INTEGER NOT NULL DEFAULT 0; + +-- +goose Down +ALTER TABLE bookings DROP COLUMN confirm_failed; diff --git a/internal/db/migrations/00065_jobs_finished_at.sql b/internal/db/migrations/00065_jobs_finished_at.sql new file mode 100644 index 00000000..8a07d458 --- /dev/null +++ b/internal/db/migrations/00065_jobs_finished_at.sql @@ -0,0 +1,19 @@ +-- +goose Up +-- Two job-table fixes: +-- 1. finished_at records when a job reached a terminal state, so completed rows +-- can be purged (nothing deleted done/failed jobs; the table grew for the life +-- of the SQLite file, which Litestream replicates). +-- 2. The (type, payload) uniqueness guard covered ALL statuses, so a done/failed +-- row permanently blocked re-enqueue of the same payload (e.g. retrying +-- reminders after a failure was a silent no-op). Scope it to live rows only. +ALTER TABLE jobs ADD COLUMN finished_at TEXT; + +DROP INDEX IF EXISTS ux_jobs_type_payload; +CREATE UNIQUE INDEX IF NOT EXISTS ux_jobs_type_payload_live + ON jobs (type, payload) WHERE status IN ('pending', 'running'); + +-- +goose Down +ALTER TABLE jobs DROP COLUMN finished_at; +DROP INDEX IF EXISTS ux_jobs_type_payload_live; +CREATE UNIQUE INDEX IF NOT EXISTS ux_jobs_type_payload + ON jobs (type, payload); diff --git a/internal/handler/book.go b/internal/handler/book.go index 43167b3e..a8bbcb3c 100644 --- a/internal/handler/book.go +++ b/internal/handler/book.go @@ -343,6 +343,7 @@ func (h *Handler) PublicEventType(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusInternalServerError, "internal error") return } + accentColor = accentOrDefault(accentColor) hosts := h.displayHosts(r.Context(), etID, routingMode) if len(hosts) == 0 { @@ -459,6 +460,7 @@ func (h *Handler) BookPage(w http.ResponseWriter, r *http.Request) { http.Error(w, "Internal server error", http.StatusInternalServerError) return } + accentColor = accentOrDefault(accentColor) // Load active intake questions. var questions []bookQuestion diff --git a/internal/handler/booking_accent.go b/internal/handler/booking_accent.go index ad939733..7d69c831 100644 --- a/internal/handler/booking_accent.go +++ b/internal/handler/booking_accent.go @@ -2,9 +2,31 @@ package handler import ( "math" + "regexp" "strconv" ) +// accentFallback is the accent used when the stored value isn't a valid color. +// Writes are validated (setup.go), but reads must not trust the row: seeders, +// manual SQL, or a future regression could leave anything there, and the value +// flows into a style attribute. +const accentFallback = "#111827" + +var validAccent = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`) + +// validAccentColor reports whether color is safe to interpolate into CSS. +func validAccentColor(color string) bool { + return validAccent.MatchString(color) +} + +// accentOrDefault returns the stored accent when valid, else the fallback. +func accentOrDefault(color string) string { + if validAccentColor(color) { + return color + } + return accentFallback +} + func accentForeground(color string) string { if len(color) != 7 { return "#ffffff" diff --git a/internal/handler/booking_assistant.go b/internal/handler/booking_assistant.go index ae64b74c..2af709cc 100644 --- a/internal/handler/booking_assistant.go +++ b/internal/handler/booking_assistant.go @@ -441,6 +441,8 @@ func assistantBookError(err error) string { return "that time was just taken — please choose another slot" case errors.Is(err, booking.ErrBookingLimitReached): return "you already have the maximum number of upcoming bookings for this event" + case errors.Is(err, booking.ErrEmailThrottled): + return "too many booking attempts from this email address — please try again later" case errors.Is(err, errInvalidBookerEmail): // Worth its own case: the model can fix this by asking again, which the generic // fallback below does not tell it. diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 4b64346b..ba7f8019 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "io" + "log/slog" "net/http" "net/mail" "net/url" @@ -568,6 +569,7 @@ func (h *Handler) createBookingForSlug(ctx context.Context, slug string, startAt Organizer: organizer, Answers: answers, MaxActivePerInvitee: et.MaxActiveBookings, + MaxBookingsPerHour: maxBookingsPerEmailPerHour, }) if err != nil { return nil, err @@ -606,7 +608,10 @@ type bookingJSON struct { PaymentStatus string `json:"payment_status,omitempty" jsonschema:"payment state for paid event types: paid, refunded, or pending; absent for free bookings"` AmountPaidCents int `json:"amount_paid_cents,omitempty" jsonschema:"amount charged in minor units (e.g. cents); absent for free bookings"` AmountPaidCurrency string `json:"amount_paid_currency,omitempty" jsonschema:"ISO 4217 currency of the charge (lowercase)"` - Attendees []attendeeJSON `json:"attendees,omitempty"` + // ConfirmFailed flags a booking whose initial confirmation email failed after + // retry — operator-visible so a lost confirmation can be followed up manually. + ConfirmFailed bool `json:"confirm_failed,omitempty"` + Attendees []attendeeJSON `json:"attendees,omitempty"` Hosts []hostBrief `json:"hosts,omitempty"` // assigned host(s) for display; set on the public create response } @@ -637,6 +642,7 @@ func toBookingJSON(b *booking.Booking) bookingJSON { j.AmountPaidCents = b.AmountPaidCents j.AmountPaidCurrency = b.AmountPaidCurrency } + j.ConfirmFailed = b.ConfirmFailed return j } @@ -800,9 +806,10 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { // Per-email throttle: cap how many bookings one email can create across the // workspace in a rolling hour, independent of IP — backstops the per-IP rate - // limit against a single identity spamming via rotating IPs. Counts cancelled - // bookings too, so book/cancel/rebook churn is bounded. A query error is logged, - // not fatal (don't block a legit booking on a transient read failure). + // limit against a single identity spamming via rotating IPs. Enforced inside + // the creation transaction (see MaxBookingsPerHour), so concurrent requests + // can't both slip past; the pre-check here is only a fast path. Counts + // cancelled bookings too, so book/cancel/rebook churn is bounded. { windowStart := time.Now().UTC().Add(-time.Hour).Format(time.RFC3339Nano) var recent int @@ -892,12 +899,17 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { }, Answers: answers, MaxActivePerInvitee: et.MaxActiveBookings, + MaxBookingsPerHour: maxBookingsPerEmailPerHour, }) if err != nil { if errors.Is(err, booking.ErrDoubleBooked) { h.writeError(w, http.StatusConflict, "this slot is no longer available") return } + if errors.Is(err, booking.ErrEmailThrottled) { + h.writeError(w, http.StatusTooManyRequests, loc.T("err_email_throttled")) + return + } // Not 409 — the booking page treats 409 as "slot taken". Use 422 so its // generic error branch surfaces this message verbatim to the invitee. if errors.Is(err, booking.ErrBookingLimitReached) { @@ -1135,9 +1147,10 @@ func hostEventLocation(meetURL, livekitHostURL, attendeeLocationValue string) st // the only place such a link becomes available, since minting it is a side effect of the // calendar API call itself (see mintMeetingLink's doc comment). Returns the primary host's // notification prefs, for the caller's single attendee-confirmation send. -func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Booking, in bookingConfirmationInput, bData *mailer.BookingData, hosts []assignedHost, meetURL string, autoGenMeet bool, livekitHostURL string) hostPrefs { +func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Booking, in bookingConfirmationInput, bData *mailer.BookingData, hosts []assignedHost, meetURL string, autoGenMeet bool, livekitHostURL string) (hostPrefs, bool) { gc := h.getCal() primaryPrefs := allOnPrefs + confirmFailed := false for _, host := range hosts { // Create a calendar event on each host's connected calendar and record // the per-host event ID so it can be cancelled later. The primary's id @@ -1199,12 +1212,37 @@ func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Book if livekitHostURL != "" { hd.LocationValue = livekitHostURL // host email gets the controls-enabled link } - if err := mailer.SendConfirmationToHost(ctx, h.mailer, hd); err != nil { - h.logger.Error("booking confirmation email (host)", "error", err, "booking_id", b.ID, "host", host.UserID) + if err := sendWithRetry(ctx, h.logger, b.ID, "host/"+host.UserID, func() error { + return mailer.SendConfirmationToHost(ctx, h.mailer, hd) + }); err != nil { + confirmFailed = true } } } - return primaryPrefs + return primaryPrefs, confirmFailed +} + +// sendWithRetry delivers one confirmation email with a single retry: transient +// SMTP stalls and 5xx blips are the common loss mode, and dispatch runs in the +// background where waiting a few seconds costs nothing. Returns the final error; +// the caller records it on the booking so a lost confirmation stays visible. +func sendWithRetry(ctx context.Context, logger *slog.Logger, bookingID, who string, send func() error) error { + if err := send(); err == nil { + return nil + } else { + firstErr := err + logger.Error("booking confirmation email, retrying", "who", who, "error", firstErr, "booking_id", bookingID) + select { + case <-ctx.Done(): + return firstErr + case <-time.After(5 * time.Second): + } + if err := send(); err != nil { + logger.Error("booking confirmation email (failed)", "who", who, "error", err, "booking_id", bookingID) + return err + } + return nil + } } // dispatchBookingConfirmation runs the post-create side effects for a booking: @@ -1256,16 +1294,27 @@ func (h *Handler) dispatchBookingConfirmation(b *booking.Booking, in bookingConf } meetURL, autoGenMeet, livekitHostURL := h.mintMeetingLink(ctx, b, in, &bData, hosts) - primaryPrefs := h.createHostEventsAndNotify(ctx, b, in, &bData, hosts, meetURL, autoGenMeet, livekitHostURL) + primaryPrefs, hostFailed := h.createHostEventsAndNotify(ctx, b, in, &bData, hosts, meetURL, autoGenMeet, livekitHostURL) // Attendee confirmation, once. "With:" names the primary host; gated on the // primary host's notification preference (matches prior behaviour). bData.HostName, bData.HostEmail = primaryHost(hosts).Name, primaryHost(hosts).Email bData.AttachICS = h.noConnectedDestination(ctx, b.HostID) bData.ICSSequence = int(b.UpdatedAt.Unix()) + confirmFailed := hostFailed if primaryPrefs.NotifyConfirmation { - if err := mailer.SendConfirmationToAttendee(ctx, h.mailer, bData); err != nil { - h.logger.Error("booking confirmation email (attendee)", "error", err, "booking_id", b.ID) + if err := sendWithRetry(ctx, h.logger, b.ID, "attendee", func() error { + return mailer.SendConfirmationToAttendee(ctx, h.mailer, bData) + }); err != nil { + confirmFailed = true + } + } + if confirmFailed { + // Operator-visible: the booking happened, but at least one confirmation + // never arrived. Surfaced on the booking JSON for follow-up. + if _, err := h.db.ExecContext(ctx, + `UPDATE bookings SET confirm_failed = 1 WHERE id = ?`, b.ID); err != nil { + h.logger.Error("booking confirmation: flag failure", "error", err, "booking_id", b.ID) } } if h.webhookSvc != nil { diff --git a/internal/handler/calendar_reconcile.go b/internal/handler/calendar_reconcile.go index 9798f018..7194d04f 100644 --- a/internal/handler/calendar_reconcile.go +++ b/internal/handler/calendar_reconcile.go @@ -95,6 +95,17 @@ func (h *Handler) reconcileReschedules(ctx context.Context, gc *calendar.Service start, err1 := time.Parse(time.RFC3339Nano, d.startStr) end, err2 := time.Parse(time.RFC3339Nano, d.endStr) if err1 != nil || err2 != nil { + // Corrupt row: the stored times will never parse, so retrying every + // sweep forever helps nothing. Quarantine it (clear the flag) with a + // warning rather than spinning on it until the booking ends. + h.logger.Warn("reconcile: unparseable booking times; clearing needs_sync", + "booking_id", d.bookingID, "host", d.userID, + "start", d.startStr, "end", d.endStr) + if _, err := h.db.ExecContext(ctx, + `UPDATE booking_hosts SET needs_sync = 0 WHERE booking_id = ? AND user_id = ?`, + d.bookingID, d.userID); err != nil { + h.logger.Error("reconcile: clear needs_sync", "error", err, "booking_id", d.bookingID) + } continue } if err := gc.UpdateEvent(ctx, d.userID, d.calendarID, d.eventID, d.provider, start, end); err != nil { diff --git a/internal/handler/embed.js b/internal/handler/embed.js index 70ea3a3e..af5d4ea4 100644 --- a/internal/handler/embed.js +++ b/internal/handler/embed.js @@ -190,7 +190,7 @@ this.root.appendChild(el('style', { text: STYLE })); this.wrap = el('div', { class: 'wrap' }); this.root.appendChild(this.wrap); - this.state = { month: startOfMonth(new Date()), slotsByDay: {}, noticeDates: [], day: null, view: 'pick', slot: null }; + this.state = { month: startOfMonth(new Date()), slotsByDay: {}, noticeDates: [], degraded: false, day: null, view: 'pick', slot: null }; this.narrow = false; this.cw = 9999; this.descExpanded = false; @@ -262,6 +262,9 @@ // can say why instead of leaving the visitor to guess (#20). Server-side these are // already in TZ, so they match dayKey's output. this.state.noticeDates = (r.min_notice && r.min_notice.dates) || []; + // An external calendar check failed: busy data is incomplete, so offered + // times may be unbookable (booking stays fail-closed at commit time). + if (r.degraded) this.state.degraded = true; // Capture the id→host map so the header can narrow to a slot's actual host once // one is picked. Avatar URLs come back relative; make them absolute (the widget // runs cross-origin to the Calnode instance). @@ -548,6 +551,11 @@ if (notice && st.noticeDates && st.noticeDates.indexOf(st.day) !== -1) { listEl.appendChild(el('p', { class: 'hint notice-hint', text: notice })); } + // Shown whenever an external calendar check failed: the busy data behind + // this list is incomplete. + if (st.degraded) { + listEl.appendChild(el('p', { class: 'hint notice-hint', text: t(self.i18n, 'calendar_degraded_notice') })); + } inner = el('div', {}, [el('p', { class: 'slots-header', text: list[0] ? shortDay(list[0].start, self.locale) : this.dayHeader(st.day) }), listEl]); } else { // Before a day is chosen. The notice line belongs here as well as in the list: a diff --git a/internal/handler/manage_handler.go b/internal/handler/manage_handler.go index 84d95439..79172663 100644 --- a/internal/handler/manage_handler.go +++ b/internal/handler/manage_handler.go @@ -108,6 +108,7 @@ func (h *Handler) ManagePage(w http.ResponseWriter, r *http.Request) { http.Error(w, "Internal server error", http.StatusInternalServerError) return } + accentColor = accentOrDefault(accentColor) if b.LocationType != "" { locType = b.LocationType diff --git a/internal/handler/mcp.go b/internal/handler/mcp.go index f7953a50..855844c3 100644 --- a/internal/handler/mcp.go +++ b/internal/handler/mcp.go @@ -409,6 +409,8 @@ func (h *Handler) mcpCreateBooking(ctx context.Context, _ *mcp.CallToolRequest, return nil, bookingJSON{}, fmt.Errorf("this slot is no longer available") case errors.Is(err, booking.ErrBookingLimitReached): return nil, bookingJSON{}, fmt.Errorf("the attendee already holds the maximum number of upcoming bookings for this event") + case errors.Is(err, booking.ErrEmailThrottled): + return nil, bookingJSON{}, fmt.Errorf("too many booking attempts from this email address — please try again later") default: return nil, bookingJSON{}, err // *answerError and others are human-readable } diff --git a/internal/handler/roles_test.go b/internal/handler/roles_test.go index 34e2e112..981e8d35 100644 --- a/internal/handler/roles_test.go +++ b/internal/handler/roles_test.go @@ -272,16 +272,49 @@ func TestDeleteUser_blockedByUpcomingBookings(t *testing.T) { t.Fatalf("got %d; want 409 (upcoming bookings block removal) — %s", rec.Code, rec.Body.String()) } - // Cancelling the upcoming booking clears the guard (the 409 no longer fires). - // NOTE: hard-deleting a user with *historical* booking rows is still blocked - // by the bookings.host_id foreign key — proper member offboarding needs - // soft-delete/deactivation, tracked separately. + // Cancelling the upcoming booking clears the upcoming guard, but the member + // is still the booking's primary host, so removal stays blocked: deleting + // them would break the booking's host reference (bookings.host_id has no + // ON DELETE action by design). Reassigning the booking away is the way out. database.Exec(`UPDATE bookings SET status='cancelled' WHERE id='b1'`) req = authReq(http.MethodDelete, "/v1/users/u2", "", ownerKey) req.SetPathValue("id", "u2") rec = httptest.NewRecorder() h.RequireAuth(h.DeleteUser)(rec, req) - if rec.Code == http.StatusConflict { - t.Fatalf("after cancel the upcoming-booking guard should no longer block, got 409") + if rec.Code != http.StatusConflict { + t.Fatalf("cancelled primary booking should still block removal, got %d — %s", rec.Code, rec.Body.String()) + } + + // A member who only ever attended as a non-primary seat (plus a stale MCP + // token) deletes cleanly: seats and tokens cascade away (migration 00063). + database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin) VALUES ('u3','seat@example.com','Seat','UTC',0)`) + database.Exec(`INSERT INTO booking_hosts (id,booking_id,user_id,is_primary) VALUES ('seat1','b1','u3',0)`) + database.Exec(`INSERT INTO oauth_access_tokens (id,token_hash,client_id,user_id,expires_at,created_at) VALUES ('tok1','hash1','c1','u3','2099-01-01T00:00:00Z','2026-01-01T00:00:00Z')`) + req = authReq(http.MethodDelete, "/v1/users/u3", "", ownerKey) + req.SetPathValue("id", "u3") + rec = httptest.NewRecorder() + h.RequireAuth(h.DeleteUser)(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("seat-only member delete: got %d; want 200 — %s", rec.Code, rec.Body.String()) + } + var seats, toks int + database.QueryRow(`SELECT COUNT(*) FROM booking_hosts WHERE user_id='u3'`).Scan(&seats) + database.QueryRow(`SELECT COUNT(*) FROM oauth_access_tokens WHERE user_id='u3'`).Scan(&toks) + if seats != 0 || toks != 0 { + t.Fatalf("cascade left seats=%d tokens=%d; want 0 0", seats, toks) + } + + // A non-primary seat on an UPCOMING booking blocks removal too: deleting + // the member would silently drop them from a meeting that still needs them. + database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin) VALUES ('u4','upcoming-seat@example.com','Upcoming','UTC',0)`) + database.Exec(`INSERT INTO bookings (id,event_type_id,host_id,start_at,end_at,status) + VALUES ('b2','et1','u2','2099-02-01T10:00:00Z','2099-02-01T10:30:00Z','confirmed')`) + database.Exec(`INSERT INTO booking_hosts (id,booking_id,user_id,is_primary) VALUES ('seat2','b2','u4',0)`) + req = authReq(http.MethodDelete, "/v1/users/u4", "", ownerKey) + req.SetPathValue("id", "u4") + rec = httptest.NewRecorder() + h.RequireAuth(h.DeleteUser)(rec, req) + if rec.Code != http.StatusConflict { + t.Fatalf("upcoming non-primary seat should block removal, got %d — %s", rec.Code, rec.Body.String()) } } diff --git a/internal/handler/slots_busy_test.go b/internal/handler/slots_busy_test.go index 9d4be979..7fb429a7 100644 --- a/internal/handler/slots_busy_test.go +++ b/internal/handler/slots_busy_test.go @@ -37,10 +37,13 @@ func TestHostAvailability_includesAdjacentUTCDayBooking(t *testing.T) { // The booker requests slots for local day 18 Jun → UTC-midnight window. dateFrom := time.Date(2027, 6, 18, 0, 0, 0, 0, time.UTC) - ha, err := h.hostAvailability(context.Background(), "u1", "et1", dateFrom, dateFrom) + ha, degraded, err := h.hostAvailability(context.Background(), "u1", "et1", dateFrom, dateFrom) if err != nil { t.Fatalf("hostAvailability: %v", err) } + if degraded { + t.Errorf("hostAvailability degraded with no calendar configured; want fully checked") + } want := time.Date(2027, 6, 17, 22, 0, 0, 0, time.UTC) found := false @@ -80,10 +83,13 @@ func TestHostAvailability_includesNonPrimaryGroupSeat(t *testing.T) { database.Exec(`INSERT INTO booking_hosts (id,booking_id,user_id,is_primary) VALUES ('bh-s','b2','u1',0)`) dateFrom := time.Date(2027, 6, 18, 0, 0, 0, 0, time.UTC) - ha, err := h.hostAvailability(context.Background(), "u1", "et1", dateFrom, dateFrom) + ha, degraded, err := h.hostAvailability(context.Background(), "u1", "et1", dateFrom, dateFrom) if err != nil { t.Fatalf("hostAvailability: %v", err) } + if degraded { + t.Errorf("hostAvailability degraded with no calendar configured; want fully checked") + } want := time.Date(2027, 6, 18, 3, 0, 0, 0, time.UTC) found := false for _, iv := range ha.Busy { diff --git a/internal/handler/slots_degraded_test.go b/internal/handler/slots_degraded_test.go new file mode 100644 index 00000000..fdab6836 --- /dev/null +++ b/internal/handler/slots_degraded_test.go @@ -0,0 +1,54 @@ +package handler_test + +import ( + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "testing" + "time" + + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/slots" +) + +type failingCalendar struct { + calendar.Provider +} + +func (failingCalendar) Name() string { return "google" } +func (failingCalendar) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return nil, errTestProviderDown +} + +type testProviderError string + +func (e testProviderError) Error() string { return string(e) } + +const errTestProviderDown = testProviderError("provider unavailable") + +// TestSlots_marksDegradedOnProviderOutage proves a calendar outage surfaces as +// degraded=true on the slots response rather than silently reading as free +// time: surfaces warn, while booking itself stays fail-closed at commit time. +func TestSlots_marksDegradedOnProviderOutage(t *testing.T) { + h, database, key, _ := setupWorkspaceWithDB(t) + slug, _ := seedEventTypeHTTP(t, h, key) + svc := calendar.NewService(database) + svc.Register(failingCalendar{}) + h.SetCalendar(svc) + + req := httptest.NewRequest(http.MethodGet, "/v1/event-types/"+slug+"/slots?from=2027-06-18&to=2027-06-18", nil) + req.SetPathValue("slug", slug) + rec := httptest.NewRecorder() + h.GetSlots(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("status %d: %s", rec.Code, rec.Body) + } + var body map[string]any + if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil { + t.Fatal(err) + } + if body["degraded"] != true { + t.Errorf("slots response has no degraded flag despite provider outage: %v", body["degraded"]) + } +} diff --git a/internal/handler/slots_handler.go b/internal/handler/slots_handler.go index d4eeef4f..83a943bf 100644 --- a/internal/handler/slots_handler.go +++ b/internal/handler/slots_handler.go @@ -39,6 +39,12 @@ type slotsResult struct { // to decide whether to explain a thin or empty day, and it says nothing about which // times or which host - see slots.Result.NoticeGap. MinNoticeDates []string + // Degraded reports that at least one host's external calendar could not be + // checked, so the busy data behind these slots is incomplete. Booking stays + // fail-closed (the recheck rejects), but the slots themselves are fail-open — + // without this flag the page would offer times it cannot sell. Surfaces + // render t('calendar_degraded_notice') when set. + Degraded bool } // Sentinel errors from computeSlots, so non-HTTP callers (the MCP tools) can map @@ -79,6 +85,13 @@ func (h *Handler) GetSlots(w http.ResponseWriter, r *http.Request) { return } body := map[string]any{"slots": res.Slots, "hosts": res.Hosts} + // Present only when an external calendar check failed mid-computation: the + // slots may include times a busy calendar would have removed. Surfaces show + // a warning; absent means fully checked (same absent-vs-empty convention as + // `taken` and `min_notice` above). + if res.Degraded { + body["degraded"] = true + } // Absent rather than empty when the event type has not opted in, so a client can // tell "this event type does not show taken times" from "none are taken today". if res.ShowsTaken { @@ -205,18 +218,20 @@ func (h *Handler) computeSlots(ctx context.Context, slug, tzName, fromStr, toStr // serialize on the single-connection pool (fast) — only the network overlaps. hostAvails := make([]slots.HostAvailability, len(pool)) errsByHost := make([]error, len(pool)) + degradedByHost := make([]bool, len(pool)) var wg sync.WaitGroup for i, ph := range pool { wg.Add(1) go func(i int, ph poolHost) { defer wg.Done() - ha, err := h.hostAvailability(ctx, ph.id, et.ID, dateFrom, dateTo) + ha, degraded, err := h.hostAvailability(ctx, ph.id, et.ID, dateFrom, dateTo) if err != nil { errsByHost[i] = err return } ha.Role = ph.role hostAvails[i] = ha + degradedByHost[i] = degraded }(i, ph) } wg.Wait() @@ -225,6 +240,10 @@ func (h *Handler) computeSlots(ctx context.Context, slug, tzName, fromStr, toStr return slotsResult{}, fmt.Errorf("load host availability (host %s): %w", pool[i].id, err) } } + degraded := false + for _, d := range degradedByHost { + degraded = degraded || d + } req := slots.Request{ Event: slots.EventConfig{ @@ -264,6 +283,7 @@ func (h *Handler) computeSlots(ctx context.Context, slug, tzName, fromStr, toStr Taken: toSlotJSON(result.Taken), Hosts: h.hostDisplayMap(ctx, poolIDs), ShowsTaken: showsTaken, + Degraded: degraded, } if want.NoticeGap { res.MinNoticeMinutes = et.MinNoticeMinutes @@ -412,10 +432,10 @@ func (h *Handler) loadHostSchedule(ctx context.Context, userID, eventTypeID stri return hostLoc, rules, overrides, nil } -func (h *Handler) hostAvailability(ctx context.Context, userID, eventTypeID string, dateFrom, dateTo time.Time) (slots.HostAvailability, error) { +func (h *Handler) hostAvailability(ctx context.Context, userID, eventTypeID string, dateFrom, dateTo time.Time) (slots.HostAvailability, bool, error) { hostLoc, rules, overrides, err := h.loadHostSchedule(ctx, userID, eventTypeID) if err != nil { - return slots.HostAvailability{}, err + return slots.HostAvailability{}, false, err } // Widen the busy window by a day on each side. Slots are generated for @@ -436,14 +456,14 @@ func (h *Handler) hostAvailability(ctx context.Context, userID, eventTypeID stri AND b.start_at >= ? AND b.start_at < ?`, userID, busyFrom, busyTo) if err != nil { - return slots.HostAvailability{}, err + return slots.HostAvailability{}, false, err } defer busyRows.Close() var busy []slots.Interval for busyRows.Next() { var startStr, endStr string if err := busyRows.Scan(&startStr, &endStr); err != nil { - return slots.HostAvailability{}, err + return slots.HostAvailability{}, false, err } s, err1 := time.Parse(time.RFC3339Nano, startStr) e, err2 := time.Parse(time.RFC3339Nano, endStr) @@ -453,7 +473,7 @@ func (h *Handler) hostAvailability(ctx context.Context, userID, eventTypeID stri busy = append(busy, slots.Interval{Start: s, End: e}) } if err := busyRows.Err(); err != nil { - return slots.HostAvailability{}, err + return slots.HostAvailability{}, false, err } // Calnode's own events on this host's calendar also show up in Google free/busy, @@ -466,20 +486,24 @@ func (h *Handler) hostAvailability(ctx context.Context, userID, eventTypeID stri // Materialise fully before the free/busy call (single-connection pool). ownEvents, err := h.ownCalendarEvents(ctx, userID, busyFrom, busyTo) if err != nil { - return slots.HostAvailability{}, err + return slots.HostAvailability{}, false, err } // Merge Google Calendar free/busy (check_conflicts connections only), minus our - // own events. Non-fatal. + // own events. A provider outage must not silently read as free time: mark the + // computation degraded so surfaces can warn (booking itself stays fail-closed + // and rejects these slots at commit time). + degraded := false if gc := h.getCal(); gc != nil { if gcalBusy, err := gc.FreeBusy(ctx, userID, dateFrom, dateTo.Add(24*time.Hour)); err != nil { h.logger.ErrorContext(ctx, "slots: gcal freebusy", "error", err, "host", userID) + degraded = true } else { busy = append(busy, slots.SubtractIntervals(gcalBusy, ownEvents)...) } } - return slots.HostAvailability{HostID: userID, Location: hostLoc, Rules: rules, Overrides: overrides, Busy: busy}, nil + return slots.HostAvailability{HostID: userID, Location: hostLoc, Rules: rules, Overrides: overrides, Busy: busy}, degraded, nil } func (h *Handler) ownCalendarEvents(ctx context.Context, userID, from, to string) ([]slots.Interval, error) { diff --git a/internal/handler/stripe_booking.go b/internal/handler/stripe_booking.go index 764f2875..5bf2beb7 100644 --- a/internal/handler/stripe_booking.go +++ b/internal/handler/stripe_booking.go @@ -145,28 +145,51 @@ func (h *Handler) releaseUnpaidHold(ctx context.Context, bookingID string) { } } -// refundBookingPayment issues a Stripe refund when a PAID booking is cancelled. Best-effort -// and idempotent (guards on payment_status='paid'); failures are logged, not fatal to cancel. +// refundBookingPayment issues a Stripe refund when a PAID booking is cancelled. +// Two concurrent cancels must not double-refund, and a Stripe failure must not +// silently keep the money: the row is claimed first with a conditional UPDATE +// (only one claimant wins), the Stripe call carries an idempotency key so a +// retried request returns the original refund, and a failed Stripe call reverts +// the claim so a later cancel retries instead of losing the refund. func (h *Handler) refundBookingPayment(ctx context.Context, bookingID string) { sc := h.getStripe() if sc == nil { return } - var paymentStatus, intentID string + var intentID string if err := h.db.QueryRowContext(ctx, - `SELECT payment_status, COALESCE(stripe_payment_intent_id, '') FROM bookings WHERE id = ?`, - bookingID).Scan(&paymentStatus, &intentID); err != nil { + `SELECT COALESCE(stripe_payment_intent_id, '') FROM bookings WHERE id = ?`, + bookingID).Scan(&intentID); err != nil { return } - if paymentStatus != "paid" || intentID == "" { + if intentID == "" { return } - if err := sc.Refund(ctx, intentID); err != nil { + // Claim the refund: only a row still marked paid flips to refunding. A + // concurrent cancel hitting the same row updates zero rows and stops. + claimed, err := h.db.ExecContext(ctx, + `UPDATE bookings SET payment_status = 'refunding' + WHERE id = ? AND payment_status = 'paid'`, bookingID) + if err != nil { + h.logger.ErrorContext(ctx, "stripe: claim refund", "error", err, "booking_id", bookingID) + return + } + if n, _ := claimed.RowsAffected(); n == 0 { + return // already refunded/refunding, or never paid + } + if err := sc.Refund(ctx, intentID, "refund:"+bookingID); err != nil { h.logger.ErrorContext(ctx, "stripe: refund on cancel", "error", err, "booking_id", bookingID) + // Revert the claim so a later cancel retries; the money was not moved. + // If the revert itself fails, the row stays 'refunding' — still safe: + // no other cancel will claim it, and the error is logged above. + _, _ = h.db.ExecContext(ctx, + `UPDATE bookings SET payment_status = 'paid' + WHERE id = ? AND payment_status = 'refunding'`, bookingID) return } if _, err := h.db.ExecContext(ctx, - `UPDATE bookings SET payment_status = 'refunded' WHERE id = ?`, bookingID); err != nil { + `UPDATE bookings SET payment_status = 'refunded' + WHERE id = ? AND payment_status = 'refunding'`, bookingID); err != nil { h.logger.ErrorContext(ctx, "stripe: mark refunded", "error", err, "booking_id", bookingID) } } diff --git a/internal/handler/stripe_refund_test.go b/internal/handler/stripe_refund_test.go new file mode 100644 index 00000000..2fa3afca --- /dev/null +++ b/internal/handler/stripe_refund_test.go @@ -0,0 +1,109 @@ +package handler + +import ( + "context" + "database/sql" + "log/slog" + "net/http" + "net/http/httptest" + "strings" + "sync/atomic" + "testing" + + "github.com/calnode/calnode/internal/db" + "github.com/calnode/calnode/internal/stripe" +) + +func newRefundTestSetup(t *testing.T) (*Handler, *sql.DB, string) { + t.Helper() + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatalf("db.Open: %v", err) + } + t.Cleanup(func() { database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatalf("db.Migrate: %v", err) + } + h := New(database, slog.Default()) + setupRec := httptest.NewRecorder() + h.Setup(setupRec, httptest.NewRequest(http.MethodPost, "/v1/setup", + strings.NewReader(`{"name":"Test Host","email":"host@example.com","timezone":"UTC"}`))) + if setupRec.Code != http.StatusCreated { + t.Fatalf("setup: %d — %s", setupRec.Code, setupRec.Body.String()) + } + var ownerID string + if err := database.QueryRow(`SELECT id FROM users WHERE email='host@example.com'`).Scan(&ownerID); err != nil { + t.Fatalf("owner lookup: %v", err) + } + if _, err := database.Exec(`INSERT INTO event_types (id,user_id,slug,name,duration_minutes) VALUES ('et-pay',?,'et-pay','E',30)`, ownerID); err != nil { + t.Fatalf("event type: %v", err) + } + if _, err := database.Exec(`INSERT INTO bookings (id,event_type_id,host_id,start_at,end_at,status,payment_status,stripe_payment_intent_id) + VALUES ('b-pay','et-pay',?,'2099-01-01T10:00:00Z','2099-01-01T10:30:00Z','confirmed','paid','pi_test_123')`, ownerID); err != nil { + t.Fatalf("booking: %v", err) + } + return h, database, ownerID +} + +func refundTestClient(t *testing.T, h *Handler, handler func(w http.ResponseWriter, r *http.Request)) { + t.Helper() + srv := httptest.NewServer(http.HandlerFunc(handler)) + t.Cleanup(srv.Close) + sc, err := stripe.New("sk_test_x", "", "") + if err != nil { + t.Fatal(err) + } + sc.SetAPIBase(srv.URL) + h.SetStripe(sc) +} + +// TestRefundBookingPayment_claimsOnce proves two cancels for the same paid booking +// produce a single Stripe refund call: the conditional claim UPDATE lets exactly one +// claimant through, and the Stripe call carries an idempotency key. +func TestRefundBookingPayment_claimsOnce(t *testing.T) { + h, database, _ := newRefundTestSetup(t) + + var calls atomic.Int32 + var idemKey string + refundTestClient(t, h, func(w http.ResponseWriter, r *http.Request) { + calls.Add(1) + idemKey = r.Header.Get("Idempotency-Key") + w.Header().Set("Content-Type", "application/json") + _, _ = w.Write([]byte(`{"id":"re_test"}`)) + }) + + ctx := context.Background() + h.refundBookingPayment(ctx, "b-pay") + h.refundBookingPayment(ctx, "b-pay") // second cancel: must not hit Stripe again + + if calls.Load() != 1 { + t.Fatalf("Stripe refund called %d times; want 1", calls.Load()) + } + if idemKey != "refund:b-pay" { + t.Fatalf("Idempotency-Key = %q; want refund:b-pay", idemKey) + } + var status string + database.QueryRow(`SELECT payment_status FROM bookings WHERE id='b-pay'`).Scan(&status) + if status != "refunded" { + t.Fatalf("payment_status = %q; want refunded", status) + } +} + +// TestRefundBookingPayment_failureRevertsClaim proves a Stripe error leaves the +// booking payable-again: the claim reverts to paid so a later cancel retries +// instead of silently keeping the money. +func TestRefundBookingPayment_failureRevertsClaim(t *testing.T) { + h, database, _ := newRefundTestSetup(t) + + refundTestClient(t, h, func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusInternalServerError) + _, _ = w.Write([]byte(`{"error":{"message":"boom"}}`)) + }) + + h.refundBookingPayment(context.Background(), "b-pay") + var status string + database.QueryRow(`SELECT payment_status FROM bookings WHERE id='b-pay'`).Scan(&status) + if status != "paid" { + t.Fatalf("payment_status = %q after Stripe failure; want paid (claim reverted)", status) + } +} diff --git a/internal/handler/templates/book.html b/internal/handler/templates/book.html index 2b049f2b..f3dec77f 100644 --- a/internal/handler/templates/book.html +++ b/internal/handler/templates/book.html @@ -293,6 +293,8 @@

    {{call .T "booking_confirmed"}}

    let availabilityLoaded = false; // false = render optimistically (assume all days open) let slotsByDay = {}; // "YYYY-MM-DD" -> [slot]; cached from the month fetch let noticeDates = new Set(); // days the minimum-notice policy took starts away from + let slotsDegraded = false; // an external calendar check failed: busy data is + // incomplete, so offered times may be unbookable const $ = id => document.getElementById(id); const pad = n => String(n).padStart(2, '0'); @@ -464,6 +466,7 @@

    {{call .T "booking_confirmed"}}

    // Days the minimum-notice policy took starts away from. Already in the selected // timezone server-side, so these keys line up with slotsByDay's. noticeDates = new Set((data.min_notice && data.min_notice.dates) || []); + if (data.degraded) slotsDegraded = true; } catch { slotsByDay = {}; availableDates = new Set(); @@ -561,6 +564,9 @@

    {{call .T "booking_confirmed"}}

    // policy did not touch would be noise attached to the wrong cause. const noticeLine = noticeDates.has(ds) ? noticeHintText() : ''; const noticeHTML = noticeLine ? `

    ${esc(noticeLine)}

    ` : ''; + // Shown whenever an external calendar check failed: the busy data behind this + // list is incomplete, and booking stays fail-closed at commit time. + const degradedHTML = slotsDegraded ? `

    ${esc(t('calendar_degraded_notice'))}

    ` : ''; if (!slotsCache.length) { // Name the day, and the host when there is exactly one. A bare "No available times." // never told the visitor whether another day would help, which is the whole @@ -569,7 +575,7 @@

    {{call .T "booking_confirmed"}}

    const msg = SOLE_HOST ? BookingLogic.fmt(t('no_available_times_host'), [SOLE_HOST, dayLabel]) : BookingLogic.fmt(t('no_available_times'), [dayLabel]); - list.innerHTML = `

    ${esc(msg)}

    ` + noticeHTML; + list.innerHTML = `

    ${esc(msg)}

    ` + noticeHTML + degradedHTML; return; } // Taken entries render as disabled buttons so they keep the same box and rhythm as @@ -593,6 +599,7 @@

    {{call .T "booking_confirmed"}}

    // Appended after a non-empty list too: a day showing 2pm onwards but nothing this // morning is exactly the "why can't I see those times" case. if (noticeHTML) list.insertAdjacentHTML('beforeend', noticeHTML); + if (degradedHTML) list.insertAdjacentHTML('beforeend', degradedHTML); } async function pickDate(ds, y, m, d) { @@ -621,6 +628,7 @@

    {{call .T "booking_confirmed"}}

    const data = await r.json(); Object.assign(hostMeta, data.hosts || {}); ((data.min_notice && data.min_notice.dates) || []).forEach(k => noticeDates.add(k)); + if (data.degraded) slotsDegraded = true; slotsCache = BookingLogic.mergeDaySlots(data.slots, data.taken); fillSlots(list, ds); } catch { diff --git a/internal/handler/templates/manage.html b/internal/handler/templates/manage.html index 544b113b..b516e4ee 100644 --- a/internal/handler/templates/manage.html +++ b/internal/handler/templates/manage.html @@ -285,6 +285,8 @@

    {{call .T "booking_cancelled_title"}}

    let availabilityLoaded = false; // false = render optimistically (assume all days open) let slotsByDay = {}; // "YYYY-MM-DD" -> [slot]; cached from the month fetch let noticeDates = new Set(); // days the minimum-notice policy took starts away from + let slotsDegraded = false; // an external calendar check failed: busy data is + // incomplete, so offered times may be unbookable const $ = id => document.getElementById(id); const pad = n => String(n).padStart(2, '0'); @@ -355,6 +357,7 @@

    {{call .T "booking_cancelled_title"}}

    // timezone server-side, so these keys line up with slotsByDay's. A reschedule goes // through the same /slots endpoint, so the same policy hides the same times. noticeDates = new Set((data.min_notice && data.min_notice.dates) || []); + if (data.degraded) slotsDegraded = true; } catch { slotsByDay = {}; availableDates = new Set(); @@ -447,6 +450,10 @@

    {{call .T "booking_cancelled_title"}}

    } let selectedPeriod = null; + function esc(s) { + return String(s).replace(/[&<>"']/g, c => + ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' }[c])); + } function slotPeriod(slot) { const hour = Number(new Intl.DateTimeFormat('en-GB', {timeZone: TZ, hour: 'numeric', hourCycle: 'h23'}).format(new Date(slot.start))); return hour < 12 ? 0 : hour < 17 ? 1 : 2; @@ -455,6 +462,9 @@

    {{call .T "booking_cancelled_title"}}

    // Only when this specific day lost starts to the policy - saying it on a day the // policy did not touch would be noise attached to the wrong cause. const notice = noticeDates.has(ds) ? noticeHintText() : ''; + // Shown whenever an external calendar check failed: the busy data behind this + // list is incomplete, and booking stays fail-closed at commit time. + const degraded = slotsDegraded ? hintP(t('calendar_degraded_notice'), 'notice-hint') : null; if (!slotsCache.length) { // Name the day, and the host when there is exactly one. A bare "No available times." // never told the visitor whether another day would help (#20). @@ -465,6 +475,7 @@

    {{call .T "booking_cancelled_title"}}

    list.innerHTML = ''; list.appendChild(hintP(msg)); if (notice) list.appendChild(hintP(notice, 'notice-hint')); + if (degraded) list.appendChild(degraded); return; } // Taken entries are disabled buttons: same box as a bookable slot, announced as @@ -484,6 +495,7 @@

    {{call .T "booking_cancelled_title"}}

    // Appended after a non-empty list too: a day showing 2pm onwards but nothing this // morning is exactly the "why can't I see those times" case. if (notice) list.appendChild(hintP(notice)); + if (degraded) list.appendChild(degraded); } async function pickDate(ds, y, m, d) { @@ -507,6 +519,7 @@

    {{call .T "booking_cancelled_title"}}

    if (!r.ok) throw new Error(r.status); const data = await r.json(); ((data.min_notice && data.min_notice.dates) || []).forEach(k => noticeDates.add(k)); + if (data.degraded) slotsDegraded = true; slotsCache = BookingLogic.mergeDaySlots( (data.slots || []).filter(s => s.start !== CURRENT_ISO), (data.taken || []).filter(s => s.start !== CURRENT_ISO)); diff --git a/internal/handler/users.go b/internal/handler/users.go index 252cf9c2..945fa834 100644 --- a/internal/handler/users.go +++ b/internal/handler/users.go @@ -84,6 +84,15 @@ func (h *Handler) ListUsers(w http.ResponseWriter, r *http.Request) { for i := range out { byID[out[i].ID] = &out[i] } + // Close before the next query: the pool is a single connection, and an open + // cursor holds it (exhausted is not closed) — querying while rows is open + // deadlocks. + rows.Close() + if err := rows.Err(); err != nil { + h.logger.ErrorContext(r.Context(), "list users: rows", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } // Attach each member's teams (the Members↔Teams cross-reference). tmRows, err := h.db.QueryContext(r.Context(), ` @@ -153,12 +162,17 @@ func (h *Handler) DeleteUser(w http.ResponseWriter, r *http.Request) { // Block removal while the user still hosts upcoming bookings, so attendees // are never silently orphaned. They must be reassigned or cancelled first. + // Group/round-robin seats live in booking_hosts, not bookings.host_id, so a + // member check covers both — otherwise a non-primary attendee passes the + // guard and the delete either FK-aborts or silently drops their seat. now := time.Now().UTC().Format(time.RFC3339Nano) var upcoming int if err := h.db.QueryRowContext(r.Context(), ` - SELECT COUNT(*) FROM bookings - WHERE host_id = ? AND status != 'cancelled' AND end_at > ?`, - targetID, now).Scan(&upcoming); err != nil { + SELECT COUNT(DISTINCT b.id) FROM bookings b + LEFT JOIN booking_hosts bh ON bh.booking_id = b.id + WHERE (b.host_id = ? OR bh.user_id = ?) + AND b.status != 'cancelled' AND b.end_at > ?`, + targetID, targetID, now).Scan(&upcoming); err != nil { h.logger.ErrorContext(r.Context(), "delete user: count bookings", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") return @@ -169,6 +183,26 @@ func (h *Handler) DeleteUser(w http.ResponseWriter, r *http.Request) { return } + // Past and cancelled bookings still reference their primary host + // (bookings.host_id has no ON DELETE action, deliberately: deleting a user + // must not cascade-delete booking history out from under other attendees). + // Non-primary seats and MCP tokens cascade away via migration 00063, so only + // primary-host rows block here. Reassigning a booking moves its host_id and + // clears this guard. + var historical int + if err := h.db.QueryRowContext(r.Context(), ` + SELECT COUNT(*) FROM bookings WHERE host_id = ?`, + targetID).Scan(&historical); err != nil { + h.logger.ErrorContext(r.Context(), "delete user: count hosted bookings", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if historical > 0 { + h.writeError(w, http.StatusConflict, + "this member still hosts past bookings; reassign them before removing the member") + return + } + res, err := h.db.ExecContext(r.Context(), `DELETE FROM users WHERE id = ?`, targetID) if err != nil { h.logger.ErrorContext(r.Context(), "delete user: exec", "error", err) diff --git a/internal/i18n/locales/de.json b/internal/i18n/locales/de.json index c95e6def..10b366ff 100644 --- a/internal/i18n/locales/de.json +++ b/internal/i18n/locales/de.json @@ -161,5 +161,6 @@ "time_morning": "Vormittag", "time_afternoon": "Nachmittag", "time_evening": "Abend", - "phone_call_number": "Telefonnummer (optional, für einen Anruf)" + "phone_call_number": "Telefonnummer (optional, für einen Anruf)", + "calendar_degraded_notice": "Einige Kalenderinformationen konnten nicht geladen werden, daher ist die Verfügbarkeit möglicherweise unvollständig." } diff --git a/internal/i18n/locales/en.json b/internal/i18n/locales/en.json index e5ef91ee..ce7f1360 100644 --- a/internal/i18n/locales/en.json +++ b/internal/i18n/locales/en.json @@ -168,5 +168,6 @@ "time_morning": "Morning", "time_afternoon": "Afternoon", "time_evening": "Evening", - "phone_call_number": "Phone number (optional, for a phone call)" + "phone_call_number": "Phone number (optional, for a phone call)", + "calendar_degraded_notice": "Some calendar information couldn't be loaded, so availability may be incomplete." } diff --git a/internal/i18n/locales/es.json b/internal/i18n/locales/es.json index 4f45a860..73f5dce0 100644 --- a/internal/i18n/locales/es.json +++ b/internal/i18n/locales/es.json @@ -168,5 +168,6 @@ "time_morning": "Mañana", "time_afternoon": "Tarde", "time_evening": "Noche", - "phone_call_number": "Teléfono (opcional, para una llamada)" + "phone_call_number": "Teléfono (opcional, para una llamada)", + "calendar_degraded_notice": "No se pudo cargar parte de la información del calendario, por lo que la disponibilidad puede estar incompleta." } diff --git a/internal/i18n/locales/fr-CA.json b/internal/i18n/locales/fr-CA.json index 64a1eee3..3b1dfc39 100644 --- a/internal/i18n/locales/fr-CA.json +++ b/internal/i18n/locales/fr-CA.json @@ -161,5 +161,6 @@ "time_period": "Moment de la journée", "time_morning": "Matin", "time_afternoon": "Après-midi", - "time_evening": "Soir" + "time_evening": "Soir", + "calendar_degraded_notice": "Certains renseignements d'agenda n'ont pas pu être chargés, les disponibilités peuvent donc être incomplètes." } diff --git a/internal/i18n/locales/fr.json b/internal/i18n/locales/fr.json index ff16d026..d369e976 100644 --- a/internal/i18n/locales/fr.json +++ b/internal/i18n/locales/fr.json @@ -161,5 +161,6 @@ "time_morning": "Matin", "time_afternoon": "Après-midi", "time_evening": "Soir", - "phone_call_number": "Téléphone (facultatif, pour un appel)" + "phone_call_number": "Téléphone (facultatif, pour un appel)", + "calendar_degraded_notice": "Certaines informations d'agenda n'ont pas pu être chargées, les disponibilités peuvent donc être incomplètes." } diff --git a/internal/i18n/locales/it.json b/internal/i18n/locales/it.json index a3216038..22917fc8 100644 --- a/internal/i18n/locales/it.json +++ b/internal/i18n/locales/it.json @@ -161,5 +161,6 @@ "time_morning": "Mattina", "time_afternoon": "Pomeriggio", "time_evening": "Sera", - "phone_call_number": "Telefono (facoltativo, per una chiamata)" + "phone_call_number": "Telefono (facoltativo, per una chiamata)", + "calendar_degraded_notice": "Non è stato possibile caricare alcune informazioni del calendario, quindi la disponibilità potrebbe essere incompleta." } diff --git a/internal/i18n/locales/nl.json b/internal/i18n/locales/nl.json index e195d93b..d6178527 100644 --- a/internal/i18n/locales/nl.json +++ b/internal/i18n/locales/nl.json @@ -161,5 +161,6 @@ "time_morning": "Ochtend", "time_afternoon": "Middag", "time_evening": "Avond", - "phone_call_number": "Telefoonnummer (optioneel, voor een telefoongesprek)" + "phone_call_number": "Telefoonnummer (optioneel, voor een telefoongesprek)", + "calendar_degraded_notice": "Sommige agendagegevens konden niet worden geladen, dus de beschikbaarheid is mogelijk onvolledig." } diff --git a/internal/i18n/locales/pt.json b/internal/i18n/locales/pt.json index 1e03a44e..27bc14c7 100644 --- a/internal/i18n/locales/pt.json +++ b/internal/i18n/locales/pt.json @@ -161,5 +161,6 @@ "time_morning": "Manhã", "time_afternoon": "Tarde", "time_evening": "Noite", - "phone_call_number": "Telefone (opcional, para uma chamada)" + "phone_call_number": "Telefone (opcional, para uma chamada)", + "calendar_degraded_notice": "Não foi possível carregar algumas informações da agenda, por isso a disponibilidade pode estar incompleta." } diff --git a/internal/i18n/locales/sv.json b/internal/i18n/locales/sv.json index 0fe3e097..3ddd1046 100644 --- a/internal/i18n/locales/sv.json +++ b/internal/i18n/locales/sv.json @@ -161,5 +161,6 @@ "time_morning": "Förmiddag", "time_afternoon": "Eftermiddag", "time_evening": "Kväll", - "phone_call_number": "Telefonnummer (valfritt, för ett telefonsamtal)" + "phone_call_number": "Telefonnummer (valfritt, för ett telefonsamtal)", + "calendar_degraded_notice": "Viss kalenderinformation kunde inte läsas in, så tillgängligheten kan vara ofullständig." } diff --git a/internal/livekit/admin.go b/internal/livekit/admin.go index 694f3730..e26200f6 100644 --- a/internal/livekit/admin.go +++ b/internal/livekit/admin.go @@ -219,6 +219,8 @@ func (c *Client) VerifyWebhook(authToken string, body []byte) error { } var claims struct { Sha256 string `json:"sha256"` + Exp int64 `json:"exp"` + Iat int64 `json:"iat"` } raw, err := base64.RawURLEncoding.DecodeString(parts[1]) if err != nil || json.Unmarshal(raw, &claims) != nil { @@ -228,5 +230,21 @@ func (c *Client) VerifyWebhook(authToken string, body []byte) error { if claims.Sha256 != base64.StdEncoding.EncodeToString(sum[:]) { return errors.New("livekit: webhook body hash mismatch") } + // Replay protection: a captured body + header verifies forever without an + // age check. LiveKit signs webhook tokens with a short expiry; enforce it + // (with the same ±5 min skew tolerance used for Stripe webhooks). Tokens + // without timestamps predate this check and are rejected — re-delivery + // mints a fresh token. + now := time.Now().Unix() + const skew = 5 * 60 + if claims.Exp == 0 || claims.Iat == 0 { + return errors.New("livekit: webhook token has no expiry") + } + if now > claims.Exp+skew { + return errors.New("livekit: webhook token expired") + } + if claims.Iat > now+skew { + return errors.New("livekit: webhook token issued in the future") + } return nil } diff --git a/internal/livekit/livekit_test.go b/internal/livekit/livekit_test.go index dd19303a..c830ec7e 100644 --- a/internal/livekit/livekit_test.go +++ b/internal/livekit/livekit_test.go @@ -172,3 +172,43 @@ func TestAPIBaseAndAdminToken(t *testing.T) { t.Errorf("admin token should be a JWT") } } + +func mintWebhookToken(t *testing.T, secret string, body []byte, exp, iat int64) string { + t.Helper() + sum := sha256.Sum256(body) + claims := map[string]any{"sha256": base64.StdEncoding.EncodeToString(sum[:])} + if exp != 0 { + claims["exp"] = exp + } + if iat != 0 { + claims["iat"] = iat + } + payload, _ := json.Marshal(claims) + head := base64.RawURLEncoding.EncodeToString([]byte(`{"alg":"HS256","typ":"JWT"}`)) + enc := base64.RawURLEncoding.EncodeToString(payload) + mac := hmac.New(sha256.New, []byte(secret)) + mac.Write([]byte(head + "." + enc)) + return head + "." + enc + "." + base64.RawURLEncoding.EncodeToString(mac.Sum(nil)) +} + +// TestVerifyWebhook_rejectsStaleTokens proves replay protection: a captured +// body + header must not verify forever. Fresh tokens pass; expired ones and +// ones without timestamps fail. +func TestVerifyWebhook_rejectsStaleTokens(t *testing.T) { + c := testClient() + body := []byte(`{"event":"egress_ended"}`) + now := time.Now().Unix() + + if err := c.VerifyWebhook(mintWebhookToken(t, "topsecret", body, now+300, now), body); err != nil { + t.Fatalf("fresh token rejected: %v", err) + } + if err := c.VerifyWebhook(mintWebhookToken(t, "topsecret", body, now-3600, now-7200), body); err == nil { + t.Fatal("expired token accepted; want rejection") + } + if err := c.VerifyWebhook(mintWebhookToken(t, "topsecret", body, 0, 0), body); err == nil { + t.Fatal("timestamp-less token accepted; want rejection") + } + if err := c.VerifyWebhook(mintWebhookToken(t, "topsecret", []byte(`{"event":"other"}`), now+300, now), body); err == nil { + t.Fatal("body-mismatched token accepted; want rejection") + } +} diff --git a/internal/server/middleware.go b/internal/server/middleware.go index a1f970fd..949b613a 100644 --- a/internal/server/middleware.go +++ b/internal/server/middleware.go @@ -9,6 +9,7 @@ import ( "net" "net/http" "net/url" + "runtime/debug" "strings" "sync" "time" @@ -46,7 +47,7 @@ func Logging(logger *slog.Logger, next http.Handler) http.Handler { reqID, _ := r.Context().Value(requestIDKey).(string) logger.InfoContext(r.Context(), "request", "method", r.Method, - "path", r.URL.Path, + "path", redactTokenPaths(r.URL.Path), "status", rw.status, "duration_ms", time.Since(start).Milliseconds(), "remote_addr", r.RemoteAddr, @@ -55,6 +56,43 @@ func Logging(logger *slog.Logger, next http.Handler) http.Handler { }) } +// redactTokenPaths replaces bearer credentials carried in URL paths before they +// reach the logs: manage tokens (/manage/{token}), room join URLs (/room/...), +// and invite tokens (/invites/{token}) would otherwise land verbatim in stdout +// and any log drain. Query strings are never logged here (only Path is). +func redactTokenPaths(path string) string { + for _, prefix := range []string{"/manage/", "/room/", "/invites/"} { + if strings.HasPrefix(path, prefix) { + return prefix + "[redacted]" + } + } + return path +} + +// Recover converts a panicking handler into a structured 500 instead of a +// dropped connection: it logs the stack with the request id and writes a +// generic error (never the panic value, which may contain request data). +func Recover(logger *slog.Logger, next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + defer func() { + if v := recover(); v != nil { + reqID, _ := r.Context().Value(requestIDKey).(string) + logger.ErrorContext(r.Context(), "request panic recovered", + "request_id", reqID, + "method", r.Method, + "path", redactTokenPaths(r.URL.Path), + "panic", fmt.Sprintf("%v", v), + "stack", string(debug.Stack()), + ) + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusInternalServerError) + fmt.Fprint(w, `{"error":"internal error"}`) + } + }() + next.ServeHTTP(w, r) + }) +} + type responseWriter struct { http.ResponseWriter status int diff --git a/internal/server/server.go b/internal/server/server.go index 882d6804..bae817ea 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -567,7 +567,7 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge logger.Info("trusting forwarded headers from proxies", "cidrs", cfg.TrustedProxyCIDRs) } - return TrustClientIP(trustedProxies)(RequestID(Logging(logger, SameOriginCheck(mux)))), drain + return TrustClientIP(trustedProxies)(RequestID(Logging(logger, Recover(logger, SameOriginCheck(mux))))), drain } // seedSMTPToDB writes env-var SMTP settings into the DB on first boot so they diff --git a/internal/stripe/stripe.go b/internal/stripe/stripe.go index f17f12c1..8337ad98 100644 --- a/internal/stripe/stripe.go +++ b/internal/stripe/stripe.go @@ -45,6 +45,10 @@ func New(secretKey, publishableKey, webhookSecret string) (*Client, error) { }, nil } +// SetAPIBase overrides the API endpoint. Test-only: lets handler tests point +// the client at a fake server without touching production construction. +func (c *Client) SetAPIBase(url string) { c.apiBase = url } + // PublishableKey returns the configured publishable key (safe to expose client-side). func (c *Client) PublishableKey() string { return c.publishableKey } @@ -121,7 +125,9 @@ func (c *Client) GetCheckoutSession(ctx context.Context, id string) (*CheckoutSe } // Refund issues a full refund for a PaymentIntent. A blank id is a no-op. -func (c *Client) Refund(ctx context.Context, paymentIntentID string) error { +// idempotencyKey (e.g. "refund:") makes retries safe: Stripe returns +// the original refund instead of creating a second one. +func (c *Client) Refund(ctx context.Context, paymentIntentID, idempotencyKey string) error { if paymentIntentID == "" { return nil } @@ -130,11 +136,15 @@ func (c *Client) Refund(ctx context.Context, paymentIntentID string) error { var out struct { ID string `json:"id"` } - return c.do(ctx, http.MethodPost, "/v1/refunds", form, &out) + return c.doWithKey(ctx, http.MethodPost, "/v1/refunds", form, idempotencyKey, &out) } // do performs a Stripe API call (form-encoded for POST) and decodes the JSON response. func (c *Client) do(ctx context.Context, method, path string, form url.Values, out any) error { + return c.doWithKey(ctx, method, path, form, "", out) +} + +func (c *Client) doWithKey(ctx context.Context, method, path string, form url.Values, idempotencyKey string, out any) error { var body io.Reader if form != nil { body = strings.NewReader(form.Encode()) @@ -147,6 +157,9 @@ func (c *Client) do(ctx context.Context, method, path string, form url.Values, o if form != nil { req.Header.Set("Content-Type", "application/x-www-form-urlencoded") } + if idempotencyKey != "" { + req.Header.Set("Idempotency-Key", idempotencyKey) + } resp, err := c.http.Do(req) if err != nil { return fmt.Errorf("stripe: request: %w", err) diff --git a/internal/worker/worker.go b/internal/worker/worker.go index 04902998..72bc8cb7 100644 --- a/internal/worker/worker.go +++ b/internal/worker/worker.go @@ -143,6 +143,15 @@ func (w *Worker) Poll(ctx context.Context) { AND last_attempted_at < ?`, deliveryCutoff); err != nil { w.logger.Error("worker: purge webhook deliveries", "error", err) } + // Purge terminal jobs older than 30 days. Every booking creates webhook + + // reminder rows; without this the table (and its Litestream-replicated copy) + // grows for the life of the instance. finished_at is set on every + // done/failed transition below, so only completed work is swept. + jobCutoff := time.Now().UTC().Add(-30 * 24 * time.Hour).Format(time.RFC3339) + if _, err := w.db.ExecContext(ctx, + `DELETE FROM jobs WHERE status IN ('done', 'failed') AND finished_at IS NOT NULL AND finished_at < ?`, jobCutoff); err != nil { + w.logger.Error("worker: purge old jobs", "error", err) + } // Backstop for the Stripe checkout.session.expired webhook: release any payment hold // still pending well past the 31-min checkout window, freeing the slot. The webhook // normally does this promptly; this catches missed/late deliveries. @@ -165,8 +174,8 @@ func (w *Worker) Poll(ctx context.Context) { w.logger.Error("worker: reaper: reset", "error", err) } if _, err := w.db.ExecContext(ctx, ` - UPDATE jobs SET status = 'failed', last_error = 'max attempts exceeded after crash' - WHERE status = 'running' AND locked_until < ? AND attempts >= max_attempts`, now); err != nil { + UPDATE jobs SET status = 'failed', last_error = 'max attempts exceeded after crash', finished_at = ? + WHERE status = 'running' AND locked_until < ? AND attempts >= max_attempts`, now, now); err != nil { w.logger.Error("worker: reaper: fail exhausted", "error", err) } @@ -174,6 +183,7 @@ func (w *Worker) Poll(ctx context.Context) { SELECT id, type, payload, attempts, max_attempts FROM jobs WHERE status = 'pending' AND run_at <= ? + ORDER BY run_at ASC, id ASC LIMIT 10`, now) if err != nil { w.logger.Error("worker: poll", "error", err) @@ -212,12 +222,16 @@ func (w *Worker) Poll(ctx context.Context) { if err := w.processJob(ctx, j.typ, j.payload); err != nil { w.logger.Error("worker: process job", "error", err, "job_id", j.id, "type", j.typ) + finishedAt := time.Now().UTC().Format(time.RFC3339Nano) if j.attempts >= j.maxAttempts { if _, uerr := w.db.ExecContext(ctx, - `UPDATE jobs SET status = 'failed', last_error = ? WHERE id = ?`, - err.Error(), j.id); uerr != nil { + `UPDATE jobs SET status = 'failed', last_error = ?, finished_at = ? WHERE id = ?`, + err.Error(), finishedAt, j.id); uerr != nil { w.logger.Error("worker: mark job failed", "error", uerr, "job_id", j.id) } + if j.typ == "webhook.deliver" { + w.markDeliveryFailed(ctx, j.payload) + } } else { runAt := time.Now().UTC().Add(backoff(j.attempts)).Format(time.RFC3339) if _, uerr := w.db.ExecContext(ctx, @@ -227,8 +241,16 @@ func (w *Worker) Poll(ctx context.Context) { } } } else { - if _, uerr := w.db.ExecContext(ctx, `UPDATE jobs SET status = 'done' WHERE id = ?`, j.id); uerr != nil { + // Conditional on still-running: if the lock expired mid-job, the reaper + // may have reset this row to pending and another pass may already own + // the retry — a stale completion must not overwrite that state. + res, uerr := w.db.ExecContext(ctx, + `UPDATE jobs SET status = 'done', finished_at = ? WHERE id = ? AND status = 'running'`, + time.Now().UTC().Format(time.RFC3339Nano), j.id) + if uerr != nil { w.logger.Error("worker: mark job done", "error", uerr, "job_id", j.id) + } else if n, _ := res.RowsAffected(); n == 0 { + w.logger.Error("worker: job left running state mid-process", "job_id", j.id) } } } @@ -296,10 +318,10 @@ func (w *Worker) sendReminder(ctx context.Context, payload string) error { } var parseErr error - if d.StartAt, parseErr = time.Parse(time.RFC3339, startAt); parseErr != nil { + if d.StartAt, parseErr = time.Parse(time.RFC3339Nano, startAt); parseErr != nil { return fmt.Errorf("worker: reminder: parse start_at %q: %w", startAt, parseErr) } - if d.EndAt, parseErr = time.Parse(time.RFC3339, endAt); parseErr != nil { + if d.EndAt, parseErr = time.Parse(time.RFC3339Nano, endAt); parseErr != nil { return fmt.Errorf("worker: reminder: parse end_at %q: %w", endAt, parseErr) } if locVal.Valid { @@ -385,11 +407,14 @@ func (w *Worker) deliverWebhook(ctx context.Context, jobPayload string) error { resp, err := w.httpClient.Do(req) now := time.Now().UTC().Format(time.RFC3339) if err != nil { + // Transient transport failure: the job retries, so the delivery is + // still in flight — record it as pending, not failed. Terminal state + // is set by markDeliveryFailed when the job exhausts its attempts. if _, uerr := w.db.ExecContext(ctx, ` UPDATE webhook_deliveries - SET status = 'failed', attempt_count = attempt_count + 1, last_attempted_at = ? + SET status = 'pending', attempt_count = attempt_count + 1, last_attempted_at = ? WHERE id = ?`, now, p.WebhookDeliveryID); uerr != nil { - w.logger.Error("worker: mark webhook delivery failed", "error", uerr, "delivery_id", p.WebhookDeliveryID) + w.logger.Error("worker: mark webhook delivery pending", "error", uerr, "delivery_id", p.WebhookDeliveryID) } return fmt.Errorf("worker: http post: %w", err) } @@ -401,7 +426,7 @@ func (w *Worker) deliverWebhook(ctx context.Context, jobPayload string) error { status := "success" if resp.StatusCode < 200 || resp.StatusCode >= 300 { - status = "failed" + status = "pending" } if _, uerr := w.db.ExecContext(ctx, ` UPDATE webhook_deliveries @@ -410,8 +435,28 @@ func (w *Worker) deliverWebhook(ctx context.Context, jobPayload string) error { w.logger.Error("worker: record webhook delivery result", "error", uerr, "delivery_id", p.WebhookDeliveryID) } - if status == "failed" { + if status == "pending" && (resp.StatusCode < 200 || resp.StatusCode >= 300) { return fmt.Errorf("worker: endpoint returned HTTP %d", resp.StatusCode) } return nil } + +// markDeliveryFailed flips a webhook delivery to terminal 'failed' when its job +// exhausts all attempts. Per-attempt failures stay 'pending' (still in flight), +// so the deliveries UI only shows failure when retries are done. +func (w *Worker) markDeliveryFailed(ctx context.Context, jobPayload string) { + var p struct { + WebhookDeliveryID string `json:"webhook_delivery_id"` + } + if err := json.Unmarshal([]byte(jobPayload), &p); err != nil { + return + } + if p.WebhookDeliveryID == "" { + return + } + if _, err := w.db.ExecContext(ctx, + `UPDATE webhook_deliveries SET status = 'failed' WHERE id = ? AND status != 'success'`, + p.WebhookDeliveryID); err != nil { + w.logger.Error("worker: mark webhook delivery failed", "error", err, "delivery_id", p.WebhookDeliveryID) + } +} From 034b9a0659568df61d1fedcd637a035dbf37b6fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:01:50 +0000 Subject: [PATCH 062/250] @MinosChatzidakis has signed the CLA in Calnode/calnode#97 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index ac157acd..b9ced6f9 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -31,6 +31,14 @@ "created_at": "2026-09-20T18:56:35Z", "repoId": 1277491008, "pullRequestNo": 69 + }, + { + "name": "MinosChatzidakis", + "id": 193494663, + "comment_id": 5798198671, + "created_at": "2026-09-23T16:01:37Z", + "repoId": 1277491008, + "pullRequestNo": 97 } ] } \ No newline at end of file From 6075f60cf60e40e0f0f12efa8bf6d2e7680ee338 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 19:02:37 +1200 Subject: [PATCH 063/250] fix(cancel): attribute cancellations server-side (#90) The bookings page hardcoded reason cancelled by admin, stored verbatim, so member cancels emailed as admin cancels. CancelBooking now composes Cancelled by {name} from the caller and ignores the client string. Booker manage-link and system paths keep their own reasons. --- frontend/src/routes/bookings/+page.svelte | 2 +- internal/handler/api_test.go | 56 +++++++++++++++++++++++ internal/handler/booking_handler.go | 16 +++++-- 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/frontend/src/routes/bookings/+page.svelte b/frontend/src/routes/bookings/+page.svelte index 6955d0a8..099b3785 100644 --- a/frontend/src/routes/bookings/+page.svelte +++ b/frontend/src/routes/bookings/+page.svelte @@ -207,7 +207,7 @@ const id = pendingCancelId; if (!id) return; try { - await api.post(`/v1/bookings/${id}/cancel`, { reason: 'cancelled by admin' }); + await api.post(`/v1/bookings/${id}/cancel`, {}); await load(); } catch (e: any) { error = e.message; diff --git a/internal/handler/api_test.go b/internal/handler/api_test.go index 854623a7..95224baa 100644 --- a/internal/handler/api_test.go +++ b/internal/handler/api_test.go @@ -750,6 +750,62 @@ func TestCancelBooking(t *testing.T) { } } +// TestCancelBooking_attributesCallerName: the stored reason names who cancelled +// (server-side), never the client-supplied string — a member cancelling their own +// booking must not produce "cancelled by admin" (#90). +func TestCancelBooking_attributesCallerName(t *testing.T) { + h, database, _, _ := setupWorkspaceWithDB(t) + database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin) VALUES ('u2','miri@example.com','Miri','UTC',0)`) //nolint:errcheck + const memberKey = "cno_memberkey" + database.Exec(`INSERT INTO api_keys (id,user_id,name,key_hash,created_at) VALUES ('k2','u2','test',?,'2024-01-01')`, sha256HexForTest(memberKey)) //nolint:errcheck + + // Event type + availability owned by the member, so the booking is theirs. + slug, _ := seedEventTypeHTTP(t, h, memberKey) + body := fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T11:00:00Z","name":"Carol","email":"carol@example.com"}`, slug) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + created := mustCreated(t, rec, "create booking") + bookingID := mustString(t, created, "id", "create booking") + + // Spoof the old hardcoded client string; the server must ignore it. + cancelReq := authReq(http.MethodPost, "/v1/bookings/"+bookingID+"/cancel", + `{"reason":"cancelled by admin"}`, memberKey) + cancelReq.SetPathValue("id", bookingID) + cancelRec := httptest.NewRecorder() + h.RequireAuth(h.CancelBooking)(cancelRec, cancelReq) + cancelled := mustJSON(t, cancelRec, http.StatusOK, "member cancel") + if cancelled["cancellation_reason"] != "Cancelled by Miri" { + t.Errorf("cancellation_reason = %v; want %q", cancelled["cancellation_reason"], "Cancelled by Miri") + } +} + +// TestCancelBooking_attributesAdminName: same guarantee on the admin path — an admin +// cancelling names themselves, not the booking's host or a client string. +func TestCancelBooking_attributesAdminName(t *testing.T) { + h, key, _ := setupWorkspace(t) + slug, _ := seedEventTypeHTTP(t, h, key) + + body := fmt.Sprintf(`{"event_type_slug":%q,"start_at":"2026-06-15T11:00:00Z","name":"Carol","email":"carol@example.com"}`, slug) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + h.CreateBooking(rec, req) + created := mustCreated(t, rec, "create booking") + bookingID := mustString(t, created, "id", "create booking") + + cancelReq := authReq(http.MethodPost, "/v1/bookings/"+bookingID+"/cancel", + `{"reason":"whatever the client says"}`, key) + cancelReq.SetPathValue("id", bookingID) + cancelRec := httptest.NewRecorder() + h.RequireAuth(h.CancelBooking)(cancelRec, cancelReq) + cancelled := mustJSON(t, cancelRec, http.StatusOK, "admin cancel") + if cancelled["cancellation_reason"] != "Cancelled by Test User" { + t.Errorf("cancellation_reason = %v; want %q", cancelled["cancellation_reason"], "Cancelled by Test User") + } +} + func TestListBookings(t *testing.T) { h, key, _ := setupWorkspace(t) slug, _ := seedEventTypeHTTP(t, h, key) diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index ba7f8019..10498fbc 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -1622,16 +1622,26 @@ func (h *Handler) CancelBooking(w http.ResponseWriter, r *http.Request) { var req struct { Reason string `json:"reason"` } - // Ignore decode errors — reason is optional. + // Ignore decode errors — the client reason is accepted for backward + // compatibility but never trusted (see below). _ = json.NewDecoder(r.Body).Decode(&req) + // Attribute server-side: the cancellation email names who cancelled, and a + // client-supplied string once hardcoded "cancelled by admin" for every + // non-admin host (#90). Booker manage-link cancels (CancelByToken) and system + // cancels keep their own reasons; this path always names the caller. + attribution := "Cancelled by " + user.Name + if strings.TrimSpace(user.Name) == "" { + attribution = "Cancelled by " + user.Email + } + // Admins (and the owner) may cancel any booking — needed to resolve a // departing member's meetings. Non-admin hosts can cancel only their own. var cancelErr error if user.IsAdmin { - cancelErr = h.bookingSvc.CancelByID(r.Context(), id, req.Reason) + cancelErr = h.bookingSvc.CancelByID(r.Context(), id, attribution) } else { - cancelErr = h.bookingSvc.Cancel(r.Context(), user.ID, id, req.Reason) + cancelErr = h.bookingSvc.Cancel(r.Context(), user.ID, id, attribution) } if err := cancelErr; err != nil { switch { From 032600a9b0dc63ab25e2612c2cb5bb6bcd47225b Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 19:04:03 +1200 Subject: [PATCH 064/250] fix(dashboard): list every booking link instead of crowning one (#93) firstSlug = items[0] arbitrarily picked one event type's link. Now one event type keeps the single-link box; several render a per-type list with names and per-row copy. Checklist row uses the first link. --- frontend/src/routes/+page.svelte | 67 ++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 498b5bde..15fcc66a 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -8,10 +8,10 @@ let calendarConfigured = $state(true); let hasAvailability = $state(false); let hasEventType = $state(false); - let firstSlug = $state(''); + let eventLinks = $state<{ slug: string; name: string }[]>([]); let origin = $state(''); let loading = $state(true); - let copied = $state(false); + let copiedSlug = $state(null); let copyFailed = $state(false); let copyTimer: ReturnType | null = null; @@ -27,7 +27,7 @@ calendarConnected = cal.connected; hasAvailability = (rules.items?.length ?? 0) > 0; hasEventType = (events.items?.length ?? 0) > 0; - firstSlug = events.items?.[0]?.slug ?? ''; + eventLinks = (events.items ?? []).filter((e) => e.slug).map((e) => ({ slug: e.slug, name: e.name })); } finally { loading = false; } @@ -43,20 +43,21 @@ // pointing at a dead-end connect flow otherwise. const calendarRequired = $derived(calendarConfigured && !$authStatus.demo_mode); const allDone = $derived((!calendarRequired || calendarDone) && hasAvailability && hasEventType); - const bookingUrl = $derived(firstSlug && origin ? `${origin}/book/${firstSlug}` : ''); + const bookingUrl = (slug: string) => (slug && origin ? `${origin}/book/${slug}` : ''); - async function copyLink() { - if (!bookingUrl) return; + async function copyLink(slug: string) { + const url = bookingUrl(slug); + if (!url) return; try { - await navigator.clipboard.writeText(bookingUrl); - copied = true; + await navigator.clipboard.writeText(url); + copiedSlug = slug; copyFailed = false; } catch { copyFailed = true; - copied = false; + copiedSlug = null; } if (copyTimer !== null) clearTimeout(copyTimer); - copyTimer = setTimeout(() => { copied = false; copyFailed = false; }, 2000); + copyTimer = setTimeout(() => { copiedSlug = null; copyFailed = false; }, 2000); } @@ -69,27 +70,53 @@

    Dashboard

    Your booking page is live and ready to share.

    - {#if bookingUrl} + {#if eventLinks.length === 1}

    Your booking link

    - {bookingUrl} + {bookingUrl(eventLinks[0].slug)}
    + {:else if eventLinks.length > 1} +
    +

    Your booking links

    +
    + {#each eventLinks as e (e.slug)} +
    + {e.name} + + {bookingUrl(e.slug)} + + +
    + {/each} +
    +
    {/if} {:else}
    @@ -194,22 +221,22 @@

    {hasEventType ? 'Your page is live. Share it and start taking bookings.' : "Available once you've created an event type."}

    - {#if hasEventType && bookingUrl} + {#if hasEventType && eventLinks.length > 0}
    - {bookingUrl} + {bookingUrl(eventLinks[0].slug)}
    {/if} From 49b758924381491a5d9d29cb97465d84935c8d53 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 19:09:10 +1200 Subject: [PATCH 065/250] feat(availability): multiple custom-hours blocks per override date (#95) One row per (user, date) forced split days into calendar workarounds. Partial unique indexes now allow several custom blocks per date (exact duplicates still 409) while keeping a single blocking row; a date is either blocked or custom, enforced at write time, blocking wins at resolve time. Range and single-date blocks replace customs on their dates; PATCH maps time collisions to 409. --- frontend/src/routes/availability/+page.svelte | 3 + .../migrations/00066_override_multiblock.sql | 16 +++ internal/handler/override.go | 111 ++++++++++++++---- internal/handler/override_test.go | 73 +++++++++++- internal/slots/availability.go | 36 +++--- internal/slots/availability_test.go | 41 +++++++ 6 files changed, 242 insertions(+), 38 deletions(-) create mode 100644 internal/db/migrations/00066_override_multiblock.sql diff --git a/frontend/src/routes/availability/+page.svelte b/frontend/src/routes/availability/+page.svelte index 33ece266..cfb1460d 100644 --- a/frontend/src/routes/availability/+page.svelte +++ b/frontend/src/routes/availability/+page.svelte @@ -518,6 +518,9 @@ + {#if ovForm.reason === 'custom_hours'} +

    Split day? Add one block, then add another on the same date.

    + {/if}
    diff --git a/internal/db/migrations/00066_override_multiblock.sql b/internal/db/migrations/00066_override_multiblock.sql new file mode 100644 index 00000000..631a596f --- /dev/null +++ b/internal/db/migrations/00066_override_multiblock.sql @@ -0,0 +1,16 @@ +-- +goose Up +-- Multi-block custom-hours overrides (#95): a date may hold several custom-hours +-- blocks (e.g. 09:00-12:00 + 13:00-17:00 around a mid-day appointment) instead of one. +-- The old single-row uniqueness becomes two partial indexes: at most one blocking +-- (day_off/out_of_office) row per date, and no exact-duplicate custom blocks. +-- resolveDay gives a blocking row priority over customs on the same date. +DROP INDEX IF EXISTS idx_availability_overrides_user_date; +CREATE UNIQUE INDEX IF NOT EXISTS idx_availability_overrides_blocked + ON availability_overrides (user_id, date) WHERE is_available = 0; +CREATE UNIQUE INDEX IF NOT EXISTS idx_availability_overrides_custom + ON availability_overrides (user_id, date, start_time, end_time) WHERE is_available = 1; + +-- +goose Down +-- Intentionally irreversible: dates with several custom blocks cannot satisfy the +-- old single-row uniqueness, so downgrading with such data would fail or silently +-- drop blocks. SQLite doesn't support DROP COLUMN in older versions either. diff --git a/internal/handler/override.go b/internal/handler/override.go index d34db3ac..8530fe73 100644 --- a/internal/handler/override.go +++ b/internal/handler/override.go @@ -84,6 +84,22 @@ func (h *Handler) CreateAvailabilityOverride(w http.ResponseWriter, r *http.Requ h.writeError(w, http.StatusBadRequest, "start_time must be before end_time") return } + // A blocked date stays blocked until the block is removed: custom hours on a + // blocked date would silently do nothing (blocking wins at resolve time), so + // refuse with a message that says what to do instead. + var blockReason string + err := h.db.QueryRowContext(r.Context(), + `SELECT reason FROM availability_overrides WHERE user_id = ? AND date = ? AND is_available = 0`, + user.ID, req.Date).Scan(&blockReason) + if err != nil && err != sql.ErrNoRows { + h.logger.ErrorContext(r.Context(), "override custom: check block", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if err == nil { + h.writeError(w, http.StatusConflict, "date is blocked ("+blockReason+"); remove the block first") + return + } } else { req.StartTime = nil req.EndTime = nil @@ -91,7 +107,9 @@ func (h *Handler) CreateAvailabilityOverride(w http.ResponseWriter, r *http.Requ // Date-range block: expand [date … end_date] into one blocked row per date, tied // by a shared group_id so the UI shows/deletes them as a single "out of office" - // span. Slot generation is unchanged (it reads the per-date rows). + // span. A range block replaces everything on those dates (custom blocks included); + // slot generation reads the per-date rows. Custom hours cannot span dates — add + // one block per date instead (#95). if req.EndDate != nil && *req.EndDate != "" { if isCustom { h.writeError(w, http.StatusBadRequest, "a date range is only for 'day_off' or 'out_of_office', not custom hours") @@ -121,13 +139,18 @@ func (h *Handler) CreateAvailabilityOverride(w http.ResponseWriter, r *http.Requ defer tx.Rollback() //nolint:errcheck days := 0 for d := startDate; !d.After(endDate); d = d.AddDate(0, 0, 1) { - // A range block wins over any existing single-date override on that date. + ds := d.Format("2006-01-02") + if _, err := tx.ExecContext(r.Context(), + `DELETE FROM availability_overrides WHERE user_id = ? AND date = ?`, + user.ID, ds); err != nil { + h.logger.ErrorContext(r.Context(), "override range: clear date", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } if _, err := tx.ExecContext(r.Context(), ` INSERT INTO availability_overrides (id, user_id, date, is_available, reason, start_time, end_time, group_id) - VALUES (?, ?, ?, 0, ?, NULL, NULL, ?) - ON CONFLICT(user_id, date) DO UPDATE SET - is_available = 0, reason = excluded.reason, start_time = NULL, end_time = NULL, group_id = excluded.group_id`, - uid.New(), user.ID, d.Format("2006-01-02"), req.Reason, groupID); err != nil { + VALUES (?, ?, ?, 0, ?, NULL, NULL, ?)`, + uid.New(), user.ID, ds, req.Reason, groupID); err != nil { h.logger.ErrorContext(r.Context(), "override range: insert", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") return @@ -145,18 +168,52 @@ func (h *Handler) CreateAvailabilityOverride(w http.ResponseWriter, r *http.Requ return } - isAvailInt := 0 - if isCustom { - isAvailInt = 1 + // Single-date blocking override: replaces everything on the date (custom blocks + // included), same as a one-day range above. + if !isCustom { + tx, err := h.db.BeginTx(r.Context(), nil) + if err != nil { + h.logger.ErrorContext(r.Context(), "override block: begin tx", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + defer tx.Rollback() //nolint:errcheck + if _, err := tx.ExecContext(r.Context(), + `DELETE FROM availability_overrides WHERE user_id = ? AND date = ?`, + user.ID, req.Date); err != nil { + h.logger.ErrorContext(r.Context(), "override block: clear date", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + id := uid.New() + if _, err := tx.ExecContext(r.Context(), ` + INSERT INTO availability_overrides (id, user_id, date, is_available, reason, start_time, end_time) + VALUES (?, ?, ?, 0, ?, NULL, NULL)`, + id, user.ID, req.Date, req.Reason); err != nil { + h.logger.ErrorContext(r.Context(), "override block: insert", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if err := tx.Commit(); err != nil { + h.logger.ErrorContext(r.Context(), "override block: commit", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + h.writeJSON(w, http.StatusCreated, availOverrideJSON{ + ID: id, Date: req.Date, IsAvailable: false, Reason: req.Reason, + }) + return } + // Single custom-hours block. Several blocks may share the date (#95); only an + // exact duplicate is rejected. id := uid.New() if _, err := h.db.ExecContext(r.Context(), ` INSERT INTO availability_overrides (id, user_id, date, is_available, reason, start_time, end_time) - VALUES (?, ?, ?, ?, ?, ?, ?)`, - id, user.ID, req.Date, isAvailInt, req.Reason, req.StartTime, req.EndTime); err != nil { + VALUES (?, ?, ?, 1, 'custom_hours', ?, ?)`, + id, user.ID, req.Date, req.StartTime, req.EndTime); err != nil { if db.IsUniqueViolation(err) { - h.writeError(w, http.StatusConflict, "an override already exists for this date; delete it first") + h.writeError(w, http.StatusConflict, "those exact hours already exist for this date") return } h.logger.ErrorContext(r.Context(), "create availability override", "error", err) @@ -164,17 +221,10 @@ func (h *Handler) CreateAvailabilityOverride(w http.ResponseWriter, r *http.Requ return } - resp := availOverrideJSON{ - ID: id, - Date: req.Date, - IsAvailable: isCustom, - Reason: req.Reason, - } - if isCustom { - resp.StartTime = req.StartTime - resp.EndTime = req.EndTime - } - h.writeJSON(w, http.StatusCreated, resp) + h.writeJSON(w, http.StatusCreated, availOverrideJSON{ + ID: id, Date: req.Date, IsAvailable: true, Reason: "custom_hours", + StartTime: req.StartTime, EndTime: req.EndTime, + }) } // ListAvailabilityOverrides handles GET /v1/availability-overrides. @@ -312,9 +362,24 @@ func (h *Handler) UpdateAvailabilityOverride(w http.ResponseWriter, r *http.Requ if current.IsAvailable { isAvailInt = 1 } + // Flipping to blocked clears sibling custom blocks on the date: a date is either + // blocked or custom, never both (same rule as create). + if !current.IsAvailable { + if _, err := h.db.ExecContext(r.Context(), + `DELETE FROM availability_overrides WHERE user_id = ? AND date = ? AND id != ? AND is_available = 1`, + user.ID, current.Date, id); err != nil { + h.logger.ErrorContext(r.Context(), "update availability override: clear customs", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + } if _, err := h.db.ExecContext(r.Context(), `UPDATE availability_overrides SET is_available=?, reason=?, start_time=?, end_time=? WHERE id=? AND user_id=?`, isAvailInt, current.Reason, current.StartTime, current.EndTime, id, user.ID); err != nil { + if db.IsUniqueViolation(err) { + h.writeError(w, http.StatusConflict, "those exact hours already exist for this date") + return + } h.logger.ErrorContext(r.Context(), "update availability override", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") return diff --git a/internal/handler/override_test.go b/internal/handler/override_test.go index 9dd49f11..1d66d9b2 100644 --- a/internal/handler/override_test.go +++ b/internal/handler/override_test.go @@ -88,6 +88,7 @@ func TestCreateAvailabilityOverride_customHours(t *testing.T) { func TestCreateAvailabilityOverride_duplicateDateReturns409(t *testing.T) { h, key, _ := setupWorkspace(t) + // Re-blocking an already-blocked date replaces it (idempotent), not 409. body := `{"date":"2026-07-04","is_available":false}` code1, _ := createOverride(t, h, key, body) if code1 != http.StatusCreated { @@ -95,8 +96,78 @@ func TestCreateAvailabilityOverride_duplicateDateReturns409(t *testing.T) { } code2, _ := createOverride(t, h, key, body) + if code2 != http.StatusCreated { + t.Errorf("re-block: status = %d; want 201 (replace, not 409)", code2) + } +} + +func TestCreateAvailabilityOverride_secondCustomBlockAllowed(t *testing.T) { + h, key, _ := setupWorkspace(t) + + code1, _ := createOverride(t, h, key, + `{"date":"2026-07-05","reason":"custom_hours","start_time":"09:00","end_time":"12:00"}`) + if code1 != http.StatusCreated { + t.Fatalf("first block: status = %d; want 201", code1) + } + // A second, different block on the same date is the #95 case: allowed. + code2, _ := createOverride(t, h, key, + `{"date":"2026-07-05","reason":"custom_hours","start_time":"13:00","end_time":"17:00"}`) + if code2 != http.StatusCreated { + t.Errorf("second block: status = %d; want 201", code2) + } + // An exact duplicate is still rejected. + code3, _ := createOverride(t, h, key, + `{"date":"2026-07-05","reason":"custom_hours","start_time":"09:00","end_time":"12:00"}`) + if code3 != http.StatusConflict { + t.Errorf("exact duplicate: status = %d; want 409", code3) + } +} + +func TestCreateAvailabilityOverride_customOnBlockedDateReturns409(t *testing.T) { + h, key, _ := setupWorkspace(t) + + code1, _ := createOverride(t, h, key, `{"date":"2026-07-06","reason":"day_off"}`) + if code1 != http.StatusCreated { + t.Fatalf("block: status = %d; want 201", code1) + } + code2, resp := createOverride(t, h, key, + `{"date":"2026-07-06","reason":"custom_hours","start_time":"09:00","end_time":"12:00"}`) if code2 != http.StatusConflict { - t.Errorf("duplicate: status = %d; want 409", code2) + t.Fatalf("custom on blocked date: status = %d; want 409 — %v", code2, resp) + } +} + +func TestCreateAvailabilityOverride_blockReplacesCustoms(t *testing.T) { + h, key, _ := setupWorkspace(t) + + code1, _ := createOverride(t, h, key, + `{"date":"2026-07-07","reason":"custom_hours","start_time":"09:00","end_time":"12:00"}`) + if code1 != http.StatusCreated { + t.Fatalf("custom: status = %d; want 201", code1) + } + // Blocking the date removes the custom block; the day reads as fully blocked. + code2, _ := createOverride(t, h, key, `{"date":"2026-07-07","reason":"day_off"}`) + if code2 != http.StatusCreated { + t.Fatalf("block: status = %d; want 201", code2) + } + req := authReq(http.MethodGet, "/v1/availability-overrides", "", key) + rec := httptest.NewRecorder() + h.RequireAuth(h.ListAvailabilityOverrides)(rec, req) + var list struct { + Items []map[string]any `json:"items"` + } + json.Unmarshal(rec.Body.Bytes(), &list) + count := 0 + for _, it := range list.Items { + if it["date"] == "2026-07-07" { + count++ + if it["reason"] != "day_off" { + t.Errorf("remaining row reason = %v; want day_off", it["reason"]) + } + } + } + if count != 1 { + t.Errorf("rows on 2026-07-07 = %d; want exactly the blocking row", count) } } diff --git a/internal/slots/availability.go b/internal/slots/availability.go index 0074f1c8..ea54aabc 100644 --- a/internal/slots/availability.go +++ b/internal/slots/availability.go @@ -42,22 +42,31 @@ func ResolveDayWindows(loc *time.Location, date time.Time, rules []AvailabilityR // // date should be a UTC midnight representing the calendar date to evaluate. func resolveDay(loc *time.Location, date time.Time, rules []AvailabilityRule, overrides []AvailabilityOverride) ([]Interval, error) { - // A date override takes priority over weekly rules. + // A date override takes priority over weekly rules. A date may carry several + // custom-hours blocks (#95); a blocking override wins over customs on the same + // date (write-time exclusivity keeps that combination rare, but resolve-time + // priority keeps it deterministic regardless). + var windows []Interval + matched := false for _, ov := range overrides { - if sameLocalDate(ov.Date, date, loc) { - if !ov.IsAvailable { - return nil, nil // full day blocked - } - iv, err := wallClockInterval(loc, date, ov.StartTime, ov.EndTime) - if err != nil { - return nil, fmt.Errorf("override on %s: %w", date.Format("2006-01-02"), err) - } - if !iv.IsEmpty() { - return []Interval{iv}, nil - } - return nil, nil + if !sameLocalDate(ov.Date, date, loc) { + continue + } + matched = true + if !ov.IsAvailable { + return nil, nil // full day blocked + } + iv, err := wallClockInterval(loc, date, ov.StartTime, ov.EndTime) + if err != nil { + return nil, fmt.Errorf("override on %s: %w", date.Format("2006-01-02"), err) + } + if !iv.IsEmpty() { + windows = append(windows, iv) } } + if matched { + return windows, nil + } // No override: apply all matching weekly rules. // Use the UTC weekday of the iteration date, which matches the UTC date @@ -66,7 +75,6 @@ func resolveDay(loc *time.Location, date time.Time, rules []AvailabilityRule, ov // refer to the same calendar date. localWeekday := date.Weekday() - var windows []Interval for _, r := range rules { if r.DayOfWeek != localWeekday { continue diff --git a/internal/slots/availability_test.go b/internal/slots/availability_test.go index f17772d4..f75a48ac 100644 --- a/internal/slots/availability_test.go +++ b/internal/slots/availability_test.go @@ -221,6 +221,47 @@ func TestResolveDay_overrideCustomHours(t *testing.T) { } } +func TestResolveDay_multipleCustomBlocks(t *testing.T) { + loc := time.UTC + date := utcDate(2026, 6, 15) + rules := []AvailabilityRule{ + {DayOfWeek: time.Monday, StartTime: "09:00", EndTime: "17:00"}, + } + overrides := []AvailabilityOverride{ + {Date: date, IsAvailable: true, StartTime: "09:00", EndTime: "12:00"}, + {Date: date, IsAvailable: true, StartTime: "13:00", EndTime: "17:00"}, + } + windows, err := resolveDay(loc, date, rules, overrides) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + if len(windows) != 2 { + t.Fatalf("expected 2 windows (split day); got %v", windows) + } + if h1, h2 := windows[0].Start.Hour(), windows[1].Start.Hour(); h1 != 9 || h2 != 13 { + t.Errorf("window starts = %d,%d; want 9,13", h1, h2) + } +} + +func TestResolveDay_blockWinsOverCustoms(t *testing.T) { + loc := time.UTC + date := utcDate(2026, 6, 15) + rules := []AvailabilityRule{ + {DayOfWeek: time.Monday, StartTime: "09:00", EndTime: "17:00"}, + } + overrides := []AvailabilityOverride{ + {Date: date, IsAvailable: true, StartTime: "09:00", EndTime: "12:00"}, + {Date: date, IsAvailable: false}, + } + windows, err := resolveDay(loc, date, rules, overrides) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + if len(windows) != 0 { + t.Errorf("expected blocked day; got %v", windows) + } +} + func TestResolveDay_overrideDoesNotMatchOtherDate(t *testing.T) { loc := time.UTC date := utcDate(2026, 6, 15) // Monday From 34311758eb4b1c445126ba4d99d2a39f85a63072 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 19:21:50 +1200 Subject: [PATCH 066/250] feat(public): per-person and team booking pages (#94) users.handle (slugified, unique, nullable) edited from profile settings; GET /u/{handle} lists a host's public active event types (owned or hosted) with duration/location/price; GET /team/{slug} lists the team's types plus member roster. Archived users 404. Five new i18n keys with draft translations. --- frontend/src/lib/api.ts | 1 + .../src/routes/settings/profile/+page.svelte | 9 +- internal/db/migrations/00067_user_handle.sql | 9 + internal/handler/directory.go | 216 ++++++++++++++++++ internal/handler/directory_test.go | 165 +++++++++++++ internal/handler/setup.go | 44 +++- internal/handler/templates/directory.html | 99 ++++++++ internal/i18n/locales/de.json | 8 +- internal/i18n/locales/en.json | 8 +- internal/i18n/locales/es.json | 8 +- internal/i18n/locales/fr-CA.json | 8 +- internal/i18n/locales/fr.json | 8 +- internal/i18n/locales/it.json | 8 +- internal/i18n/locales/nl.json | 8 +- internal/i18n/locales/pt.json | 8 +- internal/i18n/locales/sv.json | 8 +- internal/server/server.go | 2 + 17 files changed, 603 insertions(+), 14 deletions(-) create mode 100644 internal/db/migrations/00067_user_handle.sql create mode 100644 internal/handler/directory.go create mode 100644 internal/handler/directory_test.go create mode 100644 internal/handler/templates/directory.html diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 0e0a630a..d85b1846 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -1,5 +1,6 @@ export type User = { booking_accent: string; + handle?: string; id: string; email: string; name: string; diff --git a/frontend/src/routes/settings/profile/+page.svelte b/frontend/src/routes/settings/profile/+page.svelte index e68da97d..8fb25362 100644 --- a/frontend/src/routes/settings/profile/+page.svelte +++ b/frontend/src/routes/settings/profile/+page.svelte @@ -18,6 +18,7 @@ let user = $state(null); const loadingFlag = createAsyncFlag(true); const savingFlag = createAsyncFlag(); + let handle = $state(''); const uploadingFlag = createAsyncFlag(); let avatarUrl = $state(''); let fileInput = $state(undefined); @@ -75,6 +76,7 @@ onMount(() => loadingFlag.run(async () => { user = await api.get('/v1/users/me'); name = user.name ?? ''; + handle = user.handle ?? ''; booking_accent = user.booking_accent; timezone = user.timezone; time_format = user.time_format ?? '12h'; @@ -124,7 +126,7 @@ async function save() { await savingFlag.run(async () => { const updated = await api.patch('/v1/users/me', { - name, timezone, time_format, week_start, date_format, booking_accent, + name, timezone, time_format, week_start, date_format, booking_accent, handle, }); currentUser.set(updated); prefs.set(prefsFromUser(updated)); @@ -197,6 +199,11 @@

    Your personal name, shown as the meeting host. Your business brand (logo, business name) is set separately in Settings → Branding.

    +
    + + +

    Your public booking page{handle.trim() ? `: /u/${handle.trim().toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '')}` : ''}. Leave blank for no page.

    +
    diff --git a/internal/db/migrations/00067_user_handle.sql b/internal/db/migrations/00067_user_handle.sql new file mode 100644 index 00000000..74bf1b2f --- /dev/null +++ b/internal/db/migrations/00067_user_handle.sql @@ -0,0 +1,9 @@ +-- +goose Up +-- Public booking handle for per-person pages (/u/{handle}, #94). Nullable: only users +-- who set one get a page. Plain UNIQUE treats NULLs as distinct in SQLite, so any +-- number of handle-less users coexist; setting an in-use handle 409s at the API. +ALTER TABLE users ADD COLUMN handle TEXT; +CREATE UNIQUE INDEX IF NOT EXISTS idx_users_handle ON users (handle); + +-- +goose Down +-- SQLite doesn't support DROP COLUMN before v3.35; leave the column in place. diff --git a/internal/handler/directory.go b/internal/handler/directory.go new file mode 100644 index 00000000..257c6e11 --- /dev/null +++ b/internal/handler/directory.go @@ -0,0 +1,216 @@ +package handler + +import ( + "context" + "database/sql" + _ "embed" + "errors" + "html/template" + "net/http" + "strings" + + "github.com/calnode/calnode/internal/i18n" +) + +//go:embed templates/directory.html +var directoryTmplSrc string + +var directoryTmpl = template.Must(template.Must(template.New("directory").Funcs(template.FuncMap{ + "supportedLocales": i18n.SupportedLocales, +}).Parse(sharedPartialsSrc)).Parse(directoryTmplSrc)) + +type directoryItem struct { + Slug string + Name string + Meta string // server-composed "duration · location · price" fragments +} + +type directoryMember struct { + Name string + Handle string // empty when the member has no public page +} + +type directoryPageData struct { + Locale string + Title string + Subtitle string // server-composed sentence naming the person/team + AvatarURL string + Initial string + Members []directoryMember // team page only + Items []directoryItem + CSSVersion string + T func(string) string + + HeadHTML template.HTML + GTMContainerID string + GA4MeasurementID string + BusinessName string + LogoURL string + PrivacyURL string + TermsURL string + DemoMode bool +} + +// directoryItems lists public, active event types from a WHERE fragment, composing the +// rich meta line (duration, location, price) server-side so no date/plural logic is +// reinvented in the template. +func (h *Handler) directoryItems(ctx context.Context, loc *i18n.Locale, where string, args ...any) ([]directoryItem, error) { + rows, err := h.db.QueryContext(ctx, ` + SELECT slug, name, duration_minutes, location_type, COALESCE(location_value,''), + price_cents, currency + FROM event_types et WHERE `+where+` ORDER BY name`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + items := []directoryItem{} + for rows.Next() { + var slug, name, locType, locValue, currency string + var durMins, priceCents int + if err := rows.Scan(&slug, &name, &durMins, &locType, &locValue, &priceCents, ¤cy); err != nil { + rows.Close() // #nosec G104 -- already returning the scan error; nothing more actionable + return nil, err + } + parts := []string{durationLabel(durMins, loc)} + if ll := locationLabel(locType, locValue, loc); ll != "" { + parts = append(parts, ll) + } + if pl := formatPrice(priceCents, currency); pl != "" { + parts = append(parts, pl) + } + items = append(items, directoryItem{Slug: slug, Name: name, Meta: strings.Join(parts, " · ")}) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +func (h *Handler) renderDirectory(w http.ResponseWriter, r *http.Request, data directoryPageData) { + track := h.loadTrackingSettings(r.Context()) + brand := h.loadBranding(r.Context()) + loc := h.resolveLocaleWithFallback(r, brand.FallbackLocale) + data.Locale = loc.Code + data.T = loc.T + data.CSSVersion = bookingCSSVersion + data.HeadHTML = template.HTML(track.HeadHTML) // #nosec G203 -- admin-only code injection, intentionally raw, gated by requireAdmin + data.GTMContainerID = track.GTMContainerID + data.GA4MeasurementID = track.GA4MeasurementID + data.BusinessName = brand.BusinessName + data.LogoURL = brand.LogoURL + data.PrivacyURL = brand.PrivacyURL + data.TermsURL = brand.TermsURL + data.DemoMode = h.demoMode + w.Header().Set("Content-Type", "text/html; charset=utf-8") + if err := directoryTmpl.Execute(w, data); err != nil { + h.logger.ErrorContext(r.Context(), "directory: render", "error", err) + } +} + +// PersonPage handles GET /u/{handle} — one person's public booking page: every public, +// active event type they own or host, with a per-type link into /book/{slug}. Archived +// users and unknown handles 404; users without a handle have no page. The /u/ prefix +// means handles need no reserved-word list (no top-level route can collide). +func (h *Handler) PersonPage(w http.ResponseWriter, r *http.Request) { + handle := slugify(r.PathValue("handle")) + if handle == "" { + http.Error(w, "Page not found", http.StatusNotFound) + return + } + var userID, name, avatarURL string + err := h.db.QueryRowContext(r.Context(), ` + SELECT id, name, COALESCE(avatar_url,'') FROM users + WHERE handle = ? AND archived_at IS NULL`, handle). + Scan(&userID, &name, &avatarURL) + if errors.Is(err, sql.ErrNoRows) { + http.Error(w, "Page not found", http.StatusNotFound) + return + } + if err != nil { + h.logger.ErrorContext(r.Context(), "person page: load user", "error", err) + http.Error(w, "Internal server error", http.StatusInternalServerError) + return + } + + brand := h.loadBranding(r.Context()) + loc := h.resolveLocaleWithFallback(r, brand.FallbackLocale) + items, err := h.directoryItems(r.Context(), loc, + `et.is_public = 1 AND et.is_active = 1 AND (et.user_id = ? OR EXISTS + (SELECT 1 FROM event_type_hosts hh WHERE hh.event_type_id = et.id AND hh.user_id = ?))`, + userID, userID) + if err != nil { + h.logger.ErrorContext(r.Context(), "person page: load event types", "error", err) + http.Error(w, "Internal server error", http.StatusInternalServerError) + return + } + h.renderDirectory(w, r, directoryPageData{ + Title: name, + Subtitle: loc.Tf("directory_person_subtitle", name), + AvatarURL: avatarURL, + Initial: firstRune(name), + Items: items, + }) +} + +// TeamPage handles GET /team/{slug} — a team's public booking page: its public, active +// event types plus the member roster (each linking to /u/{handle} when set). +func (h *Handler) TeamPage(w http.ResponseWriter, r *http.Request) { + slug := r.PathValue("slug") + var teamID, teamName string + err := h.db.QueryRowContext(r.Context(), + `SELECT id, name FROM teams WHERE slug = ?`, slug).Scan(&teamID, &teamName) + if errors.Is(err, sql.ErrNoRows) { + http.Error(w, "Page not found", http.StatusNotFound) + return + } + if err != nil { + h.logger.ErrorContext(r.Context(), "team page: load team", "error", err) + http.Error(w, "Internal server error", http.StatusInternalServerError) + return + } + + mRows, err := h.db.QueryContext(r.Context(), ` + SELECT u.name, COALESCE(u.handle,'') FROM team_members tm + JOIN users u ON u.id = tm.user_id + WHERE tm.team_id = ? AND u.archived_at IS NULL + ORDER BY u.name`, teamID) + if err != nil { + h.logger.ErrorContext(r.Context(), "team page: load members", "error", err) + http.Error(w, "Internal server error", http.StatusInternalServerError) + return + } + members := []directoryMember{} + for mRows.Next() { + var m directoryMember + if err := mRows.Scan(&m.Name, &m.Handle); err != nil { + mRows.Close() // #nosec G104 -- already returning the scan error; nothing more actionable + h.logger.ErrorContext(r.Context(), "team page: scan member", "error", err) + http.Error(w, "Internal server error", http.StatusInternalServerError) + return + } + members = append(members, m) + } + mRows.Close() + if err := mRows.Err(); err != nil { + h.logger.ErrorContext(r.Context(), "team page: members rows", "error", err) + http.Error(w, "Internal server error", http.StatusInternalServerError) + return + } + + brand := h.loadBranding(r.Context()) + loc := h.resolveLocaleWithFallback(r, brand.FallbackLocale) + items, err := h.directoryItems(r.Context(), loc, + `et.team_id = ? AND et.is_public = 1 AND et.is_active = 1`, teamID) + if err != nil { + h.logger.ErrorContext(r.Context(), "team page: load event types", "error", err) + http.Error(w, "Internal server error", http.StatusInternalServerError) + return + } + h.renderDirectory(w, r, directoryPageData{ + Title: teamName, + Subtitle: loc.Tf("directory_team_subtitle", teamName), + Initial: firstRune(teamName), + Members: members, + Items: items, + }) +} diff --git a/internal/handler/directory_test.go b/internal/handler/directory_test.go new file mode 100644 index 00000000..1e4a1765 --- /dev/null +++ b/internal/handler/directory_test.go @@ -0,0 +1,165 @@ +package handler_test + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" +) + +func patchMeHandle(t *testing.T, h patchMeHandler, apiKey, body string) (int, map[string]any) { + t.Helper() + rec := patchMe(t, h, body, apiKey) + var resp map[string]any + json.Unmarshal(rec.Body.Bytes(), &resp) + return rec.Code, resp +} + +type patchMeHandler interface { + RequireAuth(http.HandlerFunc) http.HandlerFunc + PatchMe(http.ResponseWriter, *http.Request) +} + +func TestPatchMe_handleSetAndSlugified(t *testing.T) { + h, key, _ := setupWorkspace(t) + + code, resp := patchMeHandle(t, h, key, `{"handle":" Wynne Pirini "}`) + if code != http.StatusOK { + t.Fatalf("set handle: status = %d — %v", code, resp) + } + if resp["handle"] != "wynne-pirini" { + t.Errorf("handle = %v; want wynne-pirini (slugified)", resp["handle"]) + } +} + +func TestPatchMe_handleCollisionAndClear(t *testing.T) { + h, database, key, _ := setupWorkspaceWithDB(t) + database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin,handle) VALUES ('u2','m@example.com','Miri','UTC',0,'miri')`) //nolint:errcheck + + if code, _ := patchMeHandle(t, h, key, `{"handle":"miri"}`); code != http.StatusConflict { + t.Errorf("collision: status = %d; want 409", code) + } + if code, _ := patchMeHandle(t, h, key, `{"handle":"!!!"}`); code != http.StatusBadRequest { + t.Errorf("garbage: status = %d; want 400", code) + } + if code, resp := patchMeHandle(t, h, key, `{"handle":"mine"}`); code != http.StatusOK || resp["handle"] != "mine" { + t.Fatalf("set: status = %d — %v", code, resp) + } + // Clearing removes the page. + if code, resp := patchMeHandle(t, h, key, `{"handle":""}`); code != http.StatusOK || resp["handle"] != "" { + t.Fatalf("clear: status = %d — %v", code, resp) + } + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodGet, "/u/mine", nil) + req.SetPathValue("handle", "mine") + h.PersonPage(rec, req) + if rec.Code != http.StatusNotFound { + t.Errorf("page after clear: status = %d; want 404", rec.Code) + } +} + +func personPage(t *testing.T, h interface { + PersonPage(http.ResponseWriter, *http.Request) +}, handle string) (int, string) { + t.Helper() + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodGet, "/u/"+handle, nil) + req.SetPathValue("handle", handle) + h.PersonPage(rec, req) + return rec.Code, rec.Body.String() +} + +func TestPersonPage_listsPublicActiveEventTypes(t *testing.T) { + h, key, _ := setupWorkspace(t) + if code, _ := patchMeHandle(t, h, key, `{"handle":"testhost"}`); code != http.StatusOK { + t.Fatalf("set handle: %d", code) + } + slugVisible, _ := seedEventTypeHTTP(t, h, key) + slugHidden, _ := seedEventTypeHTTP(t, h, key) + // Hide one via is_public. + req := authReq(http.MethodPatch, "/v1/event-types/"+slugHidden, `{"is_public":false}`, key) + req.SetPathValue("slug", slugHidden) + rec := httptest.NewRecorder() + h.RequireAuth(h.PatchEventType)(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("hide event type: %d — %s", rec.Code, rec.Body.String()) + } + + code, body := personPage(t, h, "testhost") + if code != http.StatusOK { + t.Fatalf("person page: status = %d — %.200s", code, body) + } + if !strings.Contains(body, "/book/"+slugVisible) { + t.Errorf("page missing visible event type link /book/%s", slugVisible) + } + if strings.Contains(body, "/book/"+slugHidden) { + t.Errorf("page lists non-public event type /book/%s", slugHidden) + } +} + +func TestPersonPage_archivedAndUnknown404(t *testing.T) { + h, database, key, userID := setupWorkspaceWithDB(t) + if code, _ := patchMeHandle(t, h, key, `{"handle":"ghost"}`); code != http.StatusOK { + t.Fatalf("set handle: %d", code) + } + database.Exec(`UPDATE users SET archived_at = '2026-01-01T00:00:00Z' WHERE id = ?`, userID) //nolint:errcheck + + if code, _ := personPage(t, h, "ghost"); code != http.StatusNotFound { + t.Errorf("archived user page: status = %d; want 404", code) + } + if code, _ := personPage(t, h, "nobody-here"); code != http.StatusNotFound { + t.Errorf("unknown handle page: status = %d; want 404", code) + } +} + +func TestTeamPage_listsMembersAndEventTypes(t *testing.T) { + h, database, key, _ := setupWorkspaceWithDB(t) + database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin,handle) VALUES ('u2','miri@example.com','Miri','UTC',0,'miri')`) //nolint:errcheck + database.Exec(`INSERT INTO teams (id,name,slug) VALUES ('t1','Design','design')`) //nolint:errcheck + database.Exec(`INSERT INTO team_members (id,team_id,user_id) VALUES ('tm1','t1','u2')`) //nolint:errcheck + + // Team-owned event type. + slug, etID := seedEventTypeHTTP(t, h, key) + database.Exec(`UPDATE event_types SET team_id = 't1' WHERE id = ?`, etID) //nolint:errcheck + + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodGet, "/team/design", nil) + req.SetPathValue("slug", "design") + h.TeamPage(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("team page: status = %d — %.200s", rec.Code, rec.Body.String()) + } + body := rec.Body.String() + if !strings.Contains(body, "/book/"+slug) { + t.Errorf("team page missing event type link /book/%s", slug) + } + if !strings.Contains(body, "/u/miri") { + t.Errorf("team page missing member link /u/miri") + } + + if code := func() int { + r := httptest.NewRecorder() + q := httptest.NewRequest(http.MethodGet, "/team/nope", nil) + q.SetPathValue("slug", "nope") + h.TeamPage(r, q) + return r.Code + }(); code != http.StatusNotFound { + t.Errorf("unknown team page: status = %d; want 404", code) + } +} + +func TestPersonPage_includesHostedNotOwned(t *testing.T) { + h, database, ownerKey, _ := setupWorkspaceWithDB(t) + database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin,handle) VALUES ('u2','miri@example.com','Miri','UTC',0,'miri')`) //nolint:errcheck + slug, etID := seedEventTypeHTTP(t, h, ownerKey) + database.Exec(`INSERT INTO event_type_hosts (id,event_type_id,user_id,role) VALUES ('h1',?, 'u2','required')`, etID) //nolint:errcheck + + code, body := personPage(t, h, "miri") + if code != http.StatusOK { + t.Fatalf("person page: status = %d — %.200s", code, body) + } + if !strings.Contains(body, "/book/"+slug) { + t.Errorf("hosted (not owned) event type missing from /u/miri") + } +} diff --git a/internal/handler/setup.go b/internal/handler/setup.go index 5ad79de7..ebc5aabf 100644 --- a/internal/handler/setup.go +++ b/internal/handler/setup.go @@ -2,6 +2,7 @@ package handler import ( "crypto/rand" + "database/sql" "encoding/hex" "encoding/json" "net/http" @@ -106,12 +107,14 @@ func (h *Handler) Setup(w http.ResponseWriter, r *http.Request) { func (h *Handler) GetMe(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) var accent string - if err := h.db.QueryRowContext(r.Context(), `SELECT booking_accent FROM users WHERE id = ?`, user.ID).Scan(&accent); err != nil { + var handleOut sql.NullString + if err := h.db.QueryRowContext(r.Context(), `SELECT booking_accent, handle FROM users WHERE id = ?`, user.ID).Scan(&accent, &handleOut); err != nil { h.writeError(w, http.StatusInternalServerError, "could not load profile") return } out := map[string]any{ "booking_accent": accent, + "handle": handleOut.String, "id": user.ID, "email": user.Email, "name": user.Name, @@ -144,6 +147,7 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { var req struct { Name *string `json:"name"` + Handle *string `json:"handle"` BookingAccent *string `json:"booking_accent"` Timezone *string `json:"timezone"` TimeFormat *string `json:"time_format"` @@ -163,7 +167,8 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { } var accent string - if err := h.db.QueryRowContext(r.Context(), `SELECT booking_accent FROM users WHERE id = ?`, user.ID).Scan(&accent); err != nil { + var handle sql.NullString + if err := h.db.QueryRowContext(r.Context(), `SELECT booking_accent, handle FROM users WHERE id = ?`, user.ID).Scan(&accent, &handle); err != nil { h.writeError(w, http.StatusInternalServerError, "could not load profile") return } @@ -205,6 +210,36 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { } current.Name = name } + // Public booking handle for /u/{handle}. Normalised like team slugs; empty + // clears it (no page). Lives under /u/ so no reserved-word list is needed. + if req.Handle != nil { + trimmed := strings.TrimSpace(*req.Handle) + if trimmed == "" { + handle = sql.NullString{} + } else { + slug := slugify(trimmed) + if slug == "" { + h.writeError(w, http.StatusBadRequest, "handle must contain letters or numbers") + return + } + if len(slug) > 50 { + h.writeError(w, http.StatusBadRequest, "handle is too long (max 50 characters)") + return + } + var taken int + if err := h.db.QueryRowContext(r.Context(), + `SELECT COUNT(*) FROM users WHERE handle = ? AND id != ?`, slug, user.ID).Scan(&taken); err != nil { + h.logger.ErrorContext(r.Context(), "patch me: handle check", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if taken > 0 { + h.writeError(w, http.StatusConflict, "handle is already in use") + return + } + handle = sql.NullString{String: slug, Valid: true} + } + } if req.Timezone != nil { if _, err := time.LoadLocation(*req.Timezone); err != nil { h.writeError(w, http.StatusBadRequest, "invalid timezone: "+*req.Timezone) @@ -266,11 +301,11 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { if _, err := h.db.ExecContext(r.Context(), ` UPDATE users SET - booking_accent = ?, name = ?, iana_timezone = ?, time_format = ?, week_start = ?, date_format = ?, + booking_accent = ?, handle = ?, name = ?, iana_timezone = ?, time_format = ?, week_start = ?, date_format = ?, notify_confirmation = ?, notify_cancellation = ?, notify_reschedule = ?, notify_reminder = ?, notify_host_booking = ?, notify_host_cancel = ?, notify_host_reschedule = ? WHERE id = ?`, - accent, current.Name, current.Timezone, current.TimeFormat, current.WeekStart, current.DateFormat, + accent, handle, current.Name, current.Timezone, current.TimeFormat, current.WeekStart, current.DateFormat, boolToInt(current.NotifyConfirmation), boolToInt(current.NotifyCancellation), boolToInt(current.NotifyReschedule), boolToInt(current.NotifyReminder), boolToInt(current.NotifyHostBooking), boolToInt(current.NotifyHostCancel), @@ -283,6 +318,7 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { out := map[string]any{ "booking_accent": accent, + "handle": handle.String, "id": user.ID, "email": user.Email, "name": current.Name, diff --git a/internal/handler/templates/directory.html b/internal/handler/templates/directory.html new file mode 100644 index 00000000..0de2c898 --- /dev/null +++ b/internal/handler/templates/directory.html @@ -0,0 +1,99 @@ + + + + + + +{{.Title}} +{{template "demoNoindex" .}} +{{template "trackingHead" .}} + + + + +{{template "demoBanner" .}} +
    +
    + {{if .AvatarURL}} + + {{else}} + {{if .Initial}}{{end}} + {{end}} +
    +

    {{.Title}}

    +

    {{.Subtitle}}

    +
    +
    + {{if .Members}} +

    {{call .T "directory_members"}}

    +
      + {{range .Members}}
    • {{if .Handle}}{{.Name}}{{else}}{{.Name}}{{end}}
    • {{end}} +
    + {{end}} + {{if .Items}} + + {{else}} +

    {{call .T "directory_empty"}}

    + {{end}} +
    +{{template "legalFooter" .}} + + diff --git a/internal/i18n/locales/de.json b/internal/i18n/locales/de.json index 10b366ff..c41e28dd 100644 --- a/internal/i18n/locales/de.json +++ b/internal/i18n/locales/de.json @@ -162,5 +162,11 @@ "time_afternoon": "Nachmittag", "time_evening": "Abend", "phone_call_number": "Telefonnummer (optional, für einen Anruf)", - "calendar_degraded_notice": "Einige Kalenderinformationen konnten nicht geladen werden, daher ist die Verfügbarkeit möglicherweise unvollständig." + "calendar_degraded_notice": "Einige Kalenderinformationen konnten nicht geladen werden, daher ist die Verfügbarkeit möglicherweise unvollständig.", + + "directory_book": "Buchen", + "directory_empty": "Derzeit ist nichts buchbar.", + "directory_members": "Teammitglieder", + "directory_person_subtitle": "Zeit mit %s buchen", + "directory_team_subtitle": "Zeit mit dem Team %s buchen" } diff --git a/internal/i18n/locales/en.json b/internal/i18n/locales/en.json index ce7f1360..006489fb 100644 --- a/internal/i18n/locales/en.json +++ b/internal/i18n/locales/en.json @@ -169,5 +169,11 @@ "time_afternoon": "Afternoon", "time_evening": "Evening", "phone_call_number": "Phone number (optional, for a phone call)", - "calendar_degraded_notice": "Some calendar information couldn't be loaded, so availability may be incomplete." + "calendar_degraded_notice": "Some calendar information couldn't be loaded, so availability may be incomplete.", + + "directory_book": "Book", + "directory_empty": "Nothing bookable here right now.", + "directory_members": "Team members", + "directory_person_subtitle": "Book time with %s", + "directory_team_subtitle": "Book time with the %s team" } diff --git a/internal/i18n/locales/es.json b/internal/i18n/locales/es.json index 73f5dce0..896b898f 100644 --- a/internal/i18n/locales/es.json +++ b/internal/i18n/locales/es.json @@ -169,5 +169,11 @@ "time_afternoon": "Tarde", "time_evening": "Noche", "phone_call_number": "Teléfono (opcional, para una llamada)", - "calendar_degraded_notice": "No se pudo cargar parte de la información del calendario, por lo que la disponibilidad puede estar incompleta." + "calendar_degraded_notice": "No se pudo cargar parte de la información del calendario, por lo que la disponibilidad puede estar incompleta.", + + "directory_book": "Reservar", + "directory_empty": "No hay nada reservable por ahora.", + "directory_members": "Miembros del equipo", + "directory_person_subtitle": "Reserva tiempo con %s", + "directory_team_subtitle": "Reserva tiempo con el equipo %s" } diff --git a/internal/i18n/locales/fr-CA.json b/internal/i18n/locales/fr-CA.json index 3b1dfc39..41143791 100644 --- a/internal/i18n/locales/fr-CA.json +++ b/internal/i18n/locales/fr-CA.json @@ -162,5 +162,11 @@ "time_morning": "Matin", "time_afternoon": "Après-midi", "time_evening": "Soir", - "calendar_degraded_notice": "Certains renseignements d'agenda n'ont pas pu être chargés, les disponibilités peuvent donc être incomplètes." + "calendar_degraded_notice": "Certains renseignements d'agenda n'ont pas pu être chargés, les disponibilités peuvent donc être incomplètes.", + + "directory_book": "Réserver", + "directory_empty": "Rien à réserver pour le moment.", + "directory_members": "Membres de l'équipe", + "directory_person_subtitle": "Réservez du temps avec %s", + "directory_team_subtitle": "Réservez du temps avec l'équipe %s" } diff --git a/internal/i18n/locales/fr.json b/internal/i18n/locales/fr.json index d369e976..7d79319d 100644 --- a/internal/i18n/locales/fr.json +++ b/internal/i18n/locales/fr.json @@ -162,5 +162,11 @@ "time_afternoon": "Après-midi", "time_evening": "Soir", "phone_call_number": "Téléphone (facultatif, pour un appel)", - "calendar_degraded_notice": "Certaines informations d'agenda n'ont pas pu être chargées, les disponibilités peuvent donc être incomplètes." + "calendar_degraded_notice": "Certaines informations d'agenda n'ont pas pu être chargées, les disponibilités peuvent donc être incomplètes.", + + "directory_book": "Réserver", + "directory_empty": "Rien à réserver pour le moment.", + "directory_members": "Membres de l'équipe", + "directory_person_subtitle": "Réservez du temps avec %s", + "directory_team_subtitle": "Réservez du temps avec l'équipe %s" } diff --git a/internal/i18n/locales/it.json b/internal/i18n/locales/it.json index 22917fc8..afeddd0c 100644 --- a/internal/i18n/locales/it.json +++ b/internal/i18n/locales/it.json @@ -162,5 +162,11 @@ "time_afternoon": "Pomeriggio", "time_evening": "Sera", "phone_call_number": "Telefono (facoltativo, per una chiamata)", - "calendar_degraded_notice": "Non è stato possibile caricare alcune informazioni del calendario, quindi la disponibilità potrebbe essere incompleta." + "calendar_degraded_notice": "Non è stato possibile caricare alcune informazioni del calendario, quindi la disponibilità potrebbe essere incompleta.", + + "directory_book": "Prenota", + "directory_empty": "Niente da prenotare al momento.", + "directory_members": "Membri del team", + "directory_person_subtitle": "Prenota del tempo con %s", + "directory_team_subtitle": "Prenota del tempo con il team %s" } diff --git a/internal/i18n/locales/nl.json b/internal/i18n/locales/nl.json index d6178527..b3e730c3 100644 --- a/internal/i18n/locales/nl.json +++ b/internal/i18n/locales/nl.json @@ -162,5 +162,11 @@ "time_afternoon": "Middag", "time_evening": "Avond", "phone_call_number": "Telefoonnummer (optioneel, voor een telefoongesprek)", - "calendar_degraded_notice": "Sommige agendagegevens konden niet worden geladen, dus de beschikbaarheid is mogelijk onvolledig." + "calendar_degraded_notice": "Sommige agendagegevens konden niet worden geladen, dus de beschikbaarheid is mogelijk onvolledig.", + + "directory_book": "Boeken", + "directory_empty": "Er is momenteel niets te boeken.", + "directory_members": "Teamleden", + "directory_person_subtitle": "Boek tijd met %s", + "directory_team_subtitle": "Boek tijd met het %s-team" } diff --git a/internal/i18n/locales/pt.json b/internal/i18n/locales/pt.json index 27bc14c7..dc860ede 100644 --- a/internal/i18n/locales/pt.json +++ b/internal/i18n/locales/pt.json @@ -162,5 +162,11 @@ "time_afternoon": "Tarde", "time_evening": "Noite", "phone_call_number": "Telefone (opcional, para uma chamada)", - "calendar_degraded_notice": "Não foi possível carregar algumas informações da agenda, por isso a disponibilidade pode estar incompleta." + "calendar_degraded_notice": "Não foi possível carregar algumas informações da agenda, por isso a disponibilidade pode estar incompleta.", + + "directory_book": "Reservar", + "directory_empty": "Nada para reservar no momento.", + "directory_members": "Membros da equipa", + "directory_person_subtitle": "Marque tempo com %s", + "directory_team_subtitle": "Marque tempo com a equipa %s" } diff --git a/internal/i18n/locales/sv.json b/internal/i18n/locales/sv.json index 3ddd1046..c2927d67 100644 --- a/internal/i18n/locales/sv.json +++ b/internal/i18n/locales/sv.json @@ -162,5 +162,11 @@ "time_afternoon": "Eftermiddag", "time_evening": "Kväll", "phone_call_number": "Telefonnummer (valfritt, för ett telefonsamtal)", - "calendar_degraded_notice": "Viss kalenderinformation kunde inte läsas in, så tillgängligheten kan vara ofullständig." + "calendar_degraded_notice": "Viss kalenderinformation kunde inte läsas in, så tillgängligheten kan vara ofullständig.", + + "directory_book": "Boka", + "directory_empty": "Inget att boka just nu.", + "directory_members": "Teammedlemmar", + "directory_person_subtitle": "Boka tid med %s", + "directory_team_subtitle": "Boka tid med %s-teamet" } diff --git a/internal/server/server.go b/internal/server/server.go index bae817ea..a9899265 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -462,6 +462,8 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge mux.HandleFunc("GET /embed.js", h.EmbedJS) mux.HandleFunc("GET /booking.css", h.BookingCSS) mux.HandleFunc("GET /book/{slug}", h.BookPage) + mux.HandleFunc("GET /u/{handle}", h.PersonPage) + mux.HandleFunc("GET /team/{slug}", h.TeamPage) // Built-in LiveKit video room (public): the page, its vendored assets, and the token // exchange. The signed room token in the join URL is the capability — no auth. From cefb3b08495a568d3cf18ccc5bdddb4a481110cc Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 19:24:37 +1200 Subject: [PATCH 067/250] fix(review): Vary header on directory pages, 409 backstop on handle race Directory pages vary by locale like book/manage but missed the header. PatchMe UPDATE maps a check-then-set handle race to 409 via the unique index instead of 500. --- internal/handler/directory.go | 1 + internal/handler/setup.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/internal/handler/directory.go b/internal/handler/directory.go index 257c6e11..6a6bfe9b 100644 --- a/internal/handler/directory.go +++ b/internal/handler/directory.go @@ -102,6 +102,7 @@ func (h *Handler) renderDirectory(w http.ResponseWriter, r *http.Request, data d data.TermsURL = brand.TermsURL data.DemoMode = h.demoMode w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.Header().Set("Vary", "Accept-Language, Cookie") // see the same header in book.go's BookPage if err := directoryTmpl.Execute(w, data); err != nil { h.logger.ErrorContext(r.Context(), "directory: render", "error", err) } diff --git a/internal/handler/setup.go b/internal/handler/setup.go index ebc5aabf..ca79d058 100644 --- a/internal/handler/setup.go +++ b/internal/handler/setup.go @@ -10,6 +10,7 @@ import ( "strings" "time" + "github.com/calnode/calnode/internal/db" "github.com/calnode/calnode/internal/uid" ) @@ -311,6 +312,12 @@ func (h *Handler) PatchMe(w http.ResponseWriter, r *http.Request) { boolToInt(current.NotifyHostBooking), boolToInt(current.NotifyHostCancel), boolToInt(current.NotifyHostReschedule), user.ID); err != nil { + if db.IsUniqueViolation(err) { + // Check-then-set race on the handle (or a legacy duplicate): the + // index is the backstop so two users can never share a page. + h.writeError(w, http.StatusConflict, "handle is already in use") + return + } h.logger.ErrorContext(r.Context(), "patch me", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") return From 2e98536735fdd2bc750c98628e188176d87a030a Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 22 Sep 2026 19:33:32 +1200 Subject: [PATCH 068/250] feat(review follow-ups): dashboard profile link, members page column, overlap warning Dashboard shows /u/{handle} once set; members table gains a Page column (ListUsers exposes handle) marking handle-less members unlinkable; override list warns when same-date custom blocks overlap and merge. --- frontend/src/lib/api.ts | 1 + frontend/src/routes/+page.svelte | 44 +++++++++++++++---- frontend/src/routes/availability/+page.svelte | 26 +++++++++++ frontend/src/routes/members/+page.svelte | 8 ++++ internal/handler/users.go | 5 ++- 5 files changed, 74 insertions(+), 10 deletions(-) diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index d85b1846..b8f1f973 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -231,6 +231,7 @@ export type TeamMember = { id: string; email: string; name: string; + handle?: string; timezone: string; is_admin: boolean; is_owner: boolean; diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 15fcc66a..9f1b6040 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -1,7 +1,7 @@ Dashboard — Calnode @@ -118,6 +124,28 @@
    {/if} + {#if myHandle && origin} +
    +

    Your profile page

    +
    + + {origin}/u/{myHandle} + + +
    +
    + {/if} {:else}

    Getting started

    diff --git a/frontend/src/routes/availability/+page.svelte b/frontend/src/routes/availability/+page.svelte index cfb1460d..76464108 100644 --- a/frontend/src/routes/availability/+page.svelte +++ b/frontend/src/routes/availability/+page.svelte @@ -185,6 +185,29 @@ } } + // Dates whose custom-hours blocks overlap: they merge into one window at slot + // time, so flag them rather than silently showing two rows that act as one. + const overlappingOverrideDates = $derived.by((): string[] => { + const byDate = new Map(); + for (const ov of overrides) { + if (ov.reason !== 'custom_hours' || !ov.start_time || !ov.end_time) continue; + const arr = byDate.get(ov.date) ?? []; + arr.push(ov); + byDate.set(ov.date, arr); + } + const out: string[] = []; + for (const [date, blocks] of byDate) { + const sorted = [...blocks].sort((a, b) => (a.start_time ?? '').localeCompare(b.start_time ?? '')); + for (let i = 1; i < sorted.length; i++) { + if ((sorted[i].start_time ?? '') < (sorted[i - 1].end_time ?? '')) { + out.push(date); + break; + } + } + } + return out; + }); + @@ -389,6 +412,9 @@
    {#if overridesError}

    {overridesError}

    {/if} + {#if overlappingOverrideDates.length > 0} +

    Overlapping blocks on {overlappingOverrideDates.map((d) => fmtDate(d, $prefs)).join(', ')} merge into one window — trim them if that wasn't the intent.

    + {/if} {#if overridesLoading}

    Loading…

    diff --git a/frontend/src/routes/members/+page.svelte b/frontend/src/routes/members/+page.svelte index 8695f639..d48acd7d 100644 --- a/frontend/src/routes/members/+page.svelte +++ b/frontend/src/routes/members/+page.svelte @@ -431,6 +431,7 @@ Name Role Teams + Page Auth Joined {#if $currentUser?.is_admin}{/if} @@ -472,6 +473,13 @@ {/each}
    + + {#if m.handle} + /u/{m.handle} + {:else} + — + {/if} +
    {#each authBadge(m) as b} diff --git a/internal/handler/users.go b/internal/handler/users.go index 945fa834..48ddf681 100644 --- a/internal/handler/users.go +++ b/internal/handler/users.go @@ -22,7 +22,7 @@ func (h *Handler) ListUsers(w http.ResponseWriter, r *http.Request) { } rows, err := h.db.QueryContext(r.Context(), ` SELECT u.id, u.email, u.name, u.iana_timezone, u.is_admin, u.is_owner, u.email_login, - COALESCE(u.provider,''), COALESCE(u.avatar_url,''), u.created_at, + COALESCE(u.provider,''), COALESCE(u.avatar_url,''), COALESCE(u.handle,''), u.created_at, u.archived_at, COALESCE(u.archived_by,''), COALESCE(ab.name,'') FROM users u LEFT JOIN users ab ON ab.id = u.archived_by `+where+` ORDER BY u.created_at ASC`) @@ -41,6 +41,7 @@ func (h *Handler) ListUsers(w http.ResponseWriter, r *http.Request) { ID string `json:"id"` Email string `json:"email"` Name string `json:"name"` + Handle string `json:"handle,omitempty"` Timezone string `json:"timezone"` IsAdmin bool `json:"is_admin"` IsOwner bool `json:"is_owner"` @@ -62,7 +63,7 @@ func (h *Handler) ListUsers(w http.ResponseWriter, r *http.Request) { var isAdmin, isOwner, emailLogin int var archivedAt sql.NullString if err := rows.Scan(&u.ID, &u.Email, &u.Name, &u.Timezone, &isAdmin, &isOwner, &emailLogin, - &u.Provider, &u.AvatarURL, &u.CreatedAt, &archivedAt, &u.ArchivedBy, &u.ArchivedByName); err != nil { + &u.Provider, &u.AvatarURL, &u.Handle, &u.CreatedAt, &archivedAt, &u.ArchivedBy, &u.ArchivedByName); err != nil { continue } u.IsAdmin = isAdmin != 0 From 95d4f174d04295e4b3aa6c660ae1e837fff38229 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 24 Sep 2026 07:12:24 +1200 Subject: [PATCH 069/250] fix(cancel): fall back to 'host' when canceller has no name or email Edge caught reviewing PR #97 (MinosChatzidakis): the server-side attribution assumed at least one of Name/Email is set. Belt and braces for service/system callers acting without a full profile. --- internal/handler/booking_handler.go | 41 ++++++++++++++++------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 10498fbc..a5c48205 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -592,27 +592,27 @@ type attendeeJSON struct { } type bookingJSON struct { - ID string `json:"id"` - EventTypeID string `json:"event_type_id"` - EventTypeSlug string `json:"event_type_slug,omitempty"` - HostID string `json:"host_id"` - HostName string `json:"host_name,omitempty"` // set in the admin "All bookings" view - StartAt string `json:"start_at"` - EndAt string `json:"end_at"` - Status string `json:"status"` - CancellationReason string `json:"cancellation_reason,omitempty"` - LocationValue string `json:"location_value,omitempty"` - LocationType string `json:"location_type,omitempty"` - CreatedAt string `json:"created_at"` - UpdatedAt string `json:"updated_at"` - PaymentStatus string `json:"payment_status,omitempty" jsonschema:"payment state for paid event types: paid, refunded, or pending; absent for free bookings"` - AmountPaidCents int `json:"amount_paid_cents,omitempty" jsonschema:"amount charged in minor units (e.g. cents); absent for free bookings"` - AmountPaidCurrency string `json:"amount_paid_currency,omitempty" jsonschema:"ISO 4217 currency of the charge (lowercase)"` + ID string `json:"id"` + EventTypeID string `json:"event_type_id"` + EventTypeSlug string `json:"event_type_slug,omitempty"` + HostID string `json:"host_id"` + HostName string `json:"host_name,omitempty"` // set in the admin "All bookings" view + StartAt string `json:"start_at"` + EndAt string `json:"end_at"` + Status string `json:"status"` + CancellationReason string `json:"cancellation_reason,omitempty"` + LocationValue string `json:"location_value,omitempty"` + LocationType string `json:"location_type,omitempty"` + CreatedAt string `json:"created_at"` + UpdatedAt string `json:"updated_at"` + PaymentStatus string `json:"payment_status,omitempty" jsonschema:"payment state for paid event types: paid, refunded, or pending; absent for free bookings"` + AmountPaidCents int `json:"amount_paid_cents,omitempty" jsonschema:"amount charged in minor units (e.g. cents); absent for free bookings"` + AmountPaidCurrency string `json:"amount_paid_currency,omitempty" jsonschema:"ISO 4217 currency of the charge (lowercase)"` // ConfirmFailed flags a booking whose initial confirmation email failed after // retry — operator-visible so a lost confirmation can be followed up manually. - ConfirmFailed bool `json:"confirm_failed,omitempty"` - Attendees []attendeeJSON `json:"attendees,omitempty"` - Hosts []hostBrief `json:"hosts,omitempty"` // assigned host(s) for display; set on the public create response + ConfirmFailed bool `json:"confirm_failed,omitempty"` + Attendees []attendeeJSON `json:"attendees,omitempty"` + Hosts []hostBrief `json:"hosts,omitempty"` // assigned host(s) for display; set on the public create response } // hostBrief is an assigned host's identity for the booking-confirmation screen. @@ -1634,6 +1634,9 @@ func (h *Handler) CancelBooking(w http.ResponseWriter, r *http.Request) { if strings.TrimSpace(user.Name) == "" { attribution = "Cancelled by " + user.Email } + if strings.TrimSpace(user.Name) == "" && strings.TrimSpace(user.Email) == "" { + attribution = "Cancelled by host" + } // Admins (and the owner) may cancel any booking — needed to resolve a // departing member's meetings. Non-admin hosts can cancel only their own. From 333c7a8f8043d128a80e7208e726e782442e07ee Mon Sep 17 00:00:00 2001 From: KitKat31337 <4126578+KitKat31337@users.noreply.github.com> Date: Fri, 25 Sep 2026 02:24:14 -0700 Subject: [PATCH 070/250] feat(mailer): select SMTP AUTH LOGIN when PLAIN is unavailable --- internal/mailer/smtp.go | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/internal/mailer/smtp.go b/internal/mailer/smtp.go index b15e5511..5816ce7c 100644 --- a/internal/mailer/smtp.go +++ b/internal/mailer/smtp.go @@ -90,6 +90,52 @@ func newDialers(deadline time.Time, host string) (net.Dialer, tls.Dialer) { } } +// loginAuth implements the two-challenge AUTH LOGIN exchange. Credentials are +// only sent after the connection has been upgraded to TLS. +type loginAuth struct { + username string + password string + step int +} + +func (a *loginAuth) Start(server *smtp.ServerInfo) (string, []byte, error) { + if !server.TLS { + return "", nil, errors.New("mailer: AUTH LOGIN requires TLS") + } + return "LOGIN", nil, nil +} + +func (a *loginAuth) Next(_ []byte, more bool) ([]byte, error) { + if !more { + return nil, nil + } + switch a.step { + case 0: + a.step++ + return []byte(a.username), nil + case 1: + a.step++ + return []byte(a.password), nil + default: + return nil, errors.New("mailer: unexpected AUTH LOGIN challenge") + } +} + +func (s *SMTP) authForMethods(methods string) (smtp.Auth, error) { + available := strings.Fields(strings.ToUpper(methods)) + for _, method := range available { + if method == "PLAIN" { + return smtp.PlainAuth("", s.username, s.password, s.host), nil + } + } + for _, method := range available { + if method == "LOGIN" { + return &loginAuth{username: s.username, password: s.password}, nil + } + } + return nil, errors.New("mailer: SMTP server does not offer AUTH PLAIN or LOGIN") +} + func (s *SMTP) Send(ctx context.Context, msg Message) error { addr := net.JoinHostPort(s.connectHost, s.connectPort) // Built before anything is dialed, so an unusable recipient costs no connection. @@ -150,7 +196,11 @@ func (s *SMTP) Send(ctx context.Context, msg Message) error { defer c.Close() if s.username != "" { - auth := smtp.PlainAuth("", s.username, s.password, s.host) + _, methods := c.Extension("AUTH") + auth, err := s.authForMethods(methods) + if err != nil { + return err + } if err := c.Auth(auth); err != nil { // Don't wrap err — SMTP auth responses can contain server-side // detail that may expose credential information in logs. From 87b231263b44a8185b44619b30d8c5c751a373f0 Mon Sep 17 00:00:00 2001 From: KitKat31337 <4126578+KitKat31337@users.noreply.github.com> Date: Fri, 25 Sep 2026 02:24:24 -0700 Subject: [PATCH 071/250] test(mailer): cover SMTP AUTH selection and LOGIN exchange --- internal/mailer/smtp_test.go | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/internal/mailer/smtp_test.go b/internal/mailer/smtp_test.go index 1421172f..1bdd1dad 100644 --- a/internal/mailer/smtp_test.go +++ b/internal/mailer/smtp_test.go @@ -4,11 +4,60 @@ import ( "context" "errors" "net" + "net/smtp" "sync/atomic" "testing" "time" ) +func TestSMTPAuthForMethods(t *testing.T) { + s := &SMTP{host: "smtp.office365.com", username: "user@example.com", password: "secret"} + + // Office 365 advertises LOGIN and XOAUTH2, but not PLAIN. + auth, err := s.authForMethods("LOGIN XOAUTH2") + if err != nil { + t.Fatalf("select LOGIN: %v", err) + } + if _, ok := auth.(*loginAuth); !ok { + t.Fatalf("AUTH LOGIN XOAUTH2 selected %T; want AUTH LOGIN", auth) + } + + // Prefer the existing mechanism when a server supports both. + auth, err = s.authForMethods("LOGIN PLAIN") + if err != nil { + t.Fatalf("select PLAIN: %v", err) + } + if _, ok := auth.(*loginAuth); ok { + t.Fatal("AUTH LOGIN PLAIN selected LOGIN; want PLAIN") + } + if _, err := s.authForMethods("XOAUTH2"); err == nil { + t.Fatal("XOAUTH2-only server should reject unsupported password authentication") + } +} + +func TestLoginAuthRequiresTLSAndAnswersChallenges(t *testing.T) { + auth := &loginAuth{username: "user@example.com", password: "secret"} + if _, _, err := auth.Start(&smtp.ServerInfo{TLS: false}); err == nil { + t.Fatal("AUTH LOGIN accepted an unencrypted connection") + } + mechanism, initial, err := auth.Start(&smtp.ServerInfo{TLS: true}) + if err != nil || mechanism != "LOGIN" || initial != nil { + t.Fatalf("Start = %q, %q, %v; want LOGIN and no initial response", mechanism, initial, err) + } + for _, want := range []string{"user@example.com", "secret"} { + response, err := auth.Next(nil, true) + if err != nil || string(response) != want { + t.Fatalf("challenge response = %q, %v; want %q", response, err, want) + } + } + if _, err := auth.Next(nil, true); err == nil { + t.Fatal("AUTH LOGIN accepted a third challenge") + } + if response, err := auth.Next(nil, false); err != nil || response != nil { + t.Fatalf("completed exchange = %q, %v; want no response", response, err) + } +} + // A server that accepts the TCP connection but never writes the initial SMTP greeting // reproduces the exact class of hang this test guards against: a port/TLS-mode mismatch // (e.g. STARTTLS spoken to an implicit-TLS port) or an unresponsive server, where the From 805a023a53e09c3cdcb1a2ea6cc34f05b1a81679 Mon Sep 17 00:00:00 2001 From: KitKat31337 <4126578+KitKat31337@users.noreply.github.com> Date: Fri, 25 Sep 2026 02:41:10 -0700 Subject: [PATCH 072/250] docs(mailer): document SMTP authentication selection --- docs/ARCHITECTURE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 9a505ddf..77fcc2e0 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -645,6 +645,12 @@ as the desired state: genuinely broken SMTP config. Explicit credentials state intent. `GET /v1/settings/email` returns the live `transport`, and the admin UI badges it, so filled-in SMTP fields are never mistaken for SMTP delivery. +- **SMTP authentication:** after the configured TLS handshake, if any, `smtp.go` + reads the server's advertised AUTH mechanisms. It uses PLAIN when + available, otherwise LOGIN if offered (as with some Microsoft 365 servers). + LOGIN refuses to send credentials without TLS; if neither mechanism is offered, + sending fails with an unsupported-authentication error. Authentication failures + omit the server's full response from logs to avoid exposing credential details. - **TCP relay:** `EMAIL_SMTP_CONNECT_HOST` / `EMAIL_SMTP_CONNECT_PORT` are loaded by `internal/config` and passed through `SMTPConfig` / `BuildMailer` at boot and settings reload. They change only the dial address; TLS and authentication keep the original SMTP host. Active overrides are logged. - **The dial must stay bounded.** `defaultSMTPTimeout` once applied only via `conn.SetDeadline`, which runs *after* the dial returns, leaving the dial itself bounded From 36270d1a3095f4cbea8c4cc8c9dd56ceedff602f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2026 09:45:03 +0000 Subject: [PATCH 073/250] @KitKat31337 has signed the CLA in Calnode/calnode#100 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index b9ced6f9..f0a06fc7 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -39,6 +39,14 @@ "created_at": "2026-09-23T16:01:37Z", "repoId": 1277491008, "pullRequestNo": 97 + }, + { + "name": "KitKat31337", + "id": 4126578, + "comment_id": 5830298853, + "created_at": "2026-09-25T09:44:52Z", + "repoId": 1277491008, + "pullRequestNo": 100 } ] } \ No newline at end of file From bdb1fd660eddcaea21664508bb760d1f56d4e7b1 Mon Sep 17 00:00:00 2001 From: KitKat31337 <4126578+KitKat31337@users.noreply.github.com> Date: Fri, 25 Sep 2026 02:54:30 -0700 Subject: [PATCH 074/250] docs(changelog): note SMTP AUTH LOGIN support --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df8be69a..d1ece98f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,6 +92,12 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad CSP and would break the embedding this exists for. ### Fixed +- **SMTP email works with servers that offer AUTH LOGIN but not AUTH PLAIN.** + Calnode previously used PLAIN for every authenticated SMTP connection, which + failed against servers such as Microsoft 365 that advertise `LOGIN XOAUTH2` + after STARTTLS. It now prefers PLAIN when offered and uses LOGIN otherwise. + LOGIN requires TLS, and servers offering neither supported method return a + clear error. - **Rescheduling on the manage page works again.** Its slot list called an `esc()` helper that only ever existed on the booking page, so any day with availability threw before rendering and could not be rescheduled. The helper is now defined From bc549fbe77b26bf3276f9359e2182ea5a13548d8 Mon Sep 17 00:00:00 2001 From: KitKat31337 <4126578+KitKat31337@users.noreply.github.com> Date: Fri, 25 Sep 2026 02:59:12 -0700 Subject: [PATCH 075/250] test(mailer): assert PLAIN authentication mechanism --- internal/mailer/smtp_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/mailer/smtp_test.go b/internal/mailer/smtp_test.go index 1bdd1dad..80d158d6 100644 --- a/internal/mailer/smtp_test.go +++ b/internal/mailer/smtp_test.go @@ -27,8 +27,12 @@ func TestSMTPAuthForMethods(t *testing.T) { if err != nil { t.Fatalf("select PLAIN: %v", err) } - if _, ok := auth.(*loginAuth); ok { - t.Fatal("AUTH LOGIN PLAIN selected LOGIN; want PLAIN") + if auth == nil { + t.Fatal("AUTH LOGIN PLAIN selected no authentication mechanism; want PLAIN") + } + mechanism, _, err := auth.Start(&smtp.ServerInfo{Name: s.host, TLS: true}) + if err != nil || mechanism != "PLAIN" { + t.Fatalf("AUTH LOGIN PLAIN selected %q (error: %v); want PLAIN", mechanism, err) } if _, err := s.authForMethods("XOAUTH2"); err == nil { t.Fatal("XOAUTH2-only server should reject unsupported password authentication") From 56fa877df234286996cdc29776d390580b7b0173 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Sat, 26 Sep 2026 18:44:20 +1200 Subject: [PATCH 076/250] fix(calendar): keep distinct Microsoft accounts distinct without tenant tweaks (#99) Entra tenants omit preferred_username/email claims by default, so the account identifier came back empty and saving account two deleted account one. Request profile+email scopes so the claims arrive, fall back to the stable tid:oid pair when they still don't, and refuse the connection with an actionable error instead of storing an empty dedup key. --- .env.example | 4 +- internal/calendar/microsoft/microsoft.go | 42 +++++++-- internal/calendar/microsoft/microsoft_test.go | 88 +++++++++++++++++++ internal/handler/calendar.go | 5 ++ 4 files changed, 130 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index 90ff278b..41f84771 100644 --- a/.env.example +++ b/.env.example @@ -52,7 +52,9 @@ GOOGLE_CLIENT_SECRET= # (the calendar callback is shared with Google — one shared handler routes by # provider). MICROSOFT_TENANT defaults to "common" so both work/school and # personal Microsoft accounts can connect; only change it to restrict sign-in -# to a single organisation's tenant. +# to a single organisation's tenant. Calnode requests the openid, profile, and +# email scopes so it can tell connected accounts apart — no Entra token-configuration +# changes needed to connect several Microsoft 365 accounts side by side (#99). MICROSOFT_CLIENT_ID= MICROSOFT_CLIENT_SECRET= MICROSOFT_TENANT=common diff --git a/internal/calendar/microsoft/microsoft.go b/internal/calendar/microsoft/microsoft.go index 8005fa7b..849dc6d6 100644 --- a/internal/calendar/microsoft/microsoft.go +++ b/internal/calendar/microsoft/microsoft.go @@ -15,6 +15,7 @@ import ( "encoding/base64" "encoding/hex" "encoding/json" + "errors" "fmt" "io" "log/slog" @@ -66,8 +67,11 @@ func New(db *sql.DB, clientID, clientSecret, tenant, redirectURL, encKeyHex stri RedirectURL: redirectURL, // offline_access → refresh token; Calendars.ReadWrite → read free/busy + // write events; openid → an id_token whose `tid` claim tells us whether - // this is a work/school or personal account (Teams links need work). - Scopes: []string{"openid", "offline_access", "https://graph.microsoft.com/Calendars.ReadWrite"}, + // this is a work/school or personal account (Teams links need work); + // profile + email → the preferred_username/email claims that identify + // which account connected, so a second account can't collapse onto the + // first when the tenant omits them by default (#99). + Scopes: []string{"openid", "profile", "email", "offline_access", "https://graph.microsoft.com/Calendars.ReadWrite"}, }, key: key, db: db, @@ -103,6 +107,12 @@ func (c *Client) DecryptState(state string) (string, error) { return string(b), err } +// ErrNoAccountIdentity means the id_token carried no usable account identifier +// (no preferred_username, email, or oid claim). The caller must surface this, +// not store the connection: an empty identifier would collide with — and delete — +// another empty-identifier connection (#99). +var ErrNoAccountIdentity = errors.New("microsoft: id_token identifies no account (no preferred_username, email, or oid claim)") + // Exchange converts an auth code into OAuth tokens and persists them for userID. // calendarID is unused for Graph (events go to /me/events) but kept for the // calendar.Provider interface; stored as a placeholder. @@ -115,14 +125,22 @@ func (c *Client) Exchange(ctx context.Context, userID, code, calendarID string) calendarID = "primary" } kind := accountKindFromIDToken(tok) - email := accountEmailFromIDToken(tok) + email := accountIdentityFromIDToken(tok) + if email == "" { + // Never treat a missing identifier as a deduplication key: saveToken + // deletes the row it is about to replace, so one blank identity would + // wipe the other account (#99). Fail loudly at connect instead. + return ErrNoAccountIdentity + } return c.saveToken(ctx, userID, calendarID, email, kind, tok) } -// accountEmailFromIDToken reads the connected account's email/UPN from the id_token -// (preferred_username, falling back to email). "" if unavailable — used to identify accounts -// so a user can connect several Microsoft accounts. -func accountEmailFromIDToken(tok *oauth2.Token) string { +// accountIdentityFromIDToken identifies the connected account for the +// calendar_connections row: the email/UPN (preferred_username, falling back to +// email) when the tenant sends it, else the stable tid:oid pair. It is an opaque +// account key, not necessarily an email address — "" only when the token carries +// nothing usable at all. +func accountIdentityFromIDToken(tok *oauth2.Token) string { raw, _ := tok.Extra("id_token").(string) parts := strings.Split(raw, ".") if len(parts) != 3 { @@ -135,6 +153,8 @@ func accountEmailFromIDToken(tok *oauth2.Token) string { var claims struct { PreferredUsername string `json:"preferred_username"` Email string `json:"email"` + TID string `json:"tid"` + OID string `json:"oid"` } if json.Unmarshal(payload, &claims) != nil { return "" @@ -142,7 +162,13 @@ func accountEmailFromIDToken(tok *oauth2.Token) string { if claims.PreferredUsername != "" { return claims.PreferredUsername } - return claims.Email + if claims.Email != "" { + return claims.Email + } + if claims.TID != "" && claims.OID != "" { + return claims.TID + ":" + claims.OID + } + return "" } // consumersTenantID is the fixed tenant a personal Microsoft account reports in diff --git a/internal/calendar/microsoft/microsoft_test.go b/internal/calendar/microsoft/microsoft_test.go index 568db8f7..698896dc 100644 --- a/internal/calendar/microsoft/microsoft_test.go +++ b/internal/calendar/microsoft/microsoft_test.go @@ -400,6 +400,24 @@ func mkIDToken(tid string) string { return "header." + payload + ".sig" } +func mkIDTokenClaims(claims map[string]string) string { + parts := make([]string, 0, len(claims)*2) + for k, v := range claims { + part, _ := json.Marshal(v) + parts = append(parts, `"`+k+`":`+string(part)) + } + payload := base64.RawURLEncoding.EncodeToString([]byte(`{` + strings.Join(parts, ",") + `}`)) + return "header." + payload + ".sig" +} + +func idToken(t *testing.T, raw string) *oauth2.Token { + t.Helper() + if raw == "" { + return &oauth2.Token{} + } + return (&oauth2.Token{}).WithExtra(map[string]any{"id_token": raw}) +} + func TestAccountKindFromIDToken(t *testing.T) { cases := []struct { name, idToken, want string @@ -421,6 +439,76 @@ func TestAccountKindFromIDToken(t *testing.T) { } } +func TestAccountIdentityFromIDToken(t *testing.T) { + cases := []struct { + name string + claims map[string]string + raw string + want string + }{ + {"preferred_username wins", map[string]string{"preferred_username": "a@x.com", "email": "b@x.com"}, "", "a@x.com"}, + {"email fallback", map[string]string{"email": "b@x.com"}, "", "b@x.com"}, + {"tid:oid fallback", map[string]string{"tid": "t1", "oid": "o1"}, "", "t1:o1"}, + {"oid without tid is nothing", map[string]string{"oid": "o1"}, "", ""}, + {"no id_token", nil, "", ""}, + {"malformed", nil, "not-a-jwt", ""}, + } + for _, tc := range cases { + var tok *oauth2.Token + if tc.raw != "" { + tok = idToken(t, tc.raw) + } else if tc.claims != nil { + tok = idToken(t, mkIDTokenClaims(tc.claims)) + } else { + tok = idToken(t, "") + } + if got := accountIdentityFromIDToken(tok); got != tc.want { + t.Errorf("%s: accountIdentityFromIDToken=%q; want %q", tc.name, got, tc.want) + } + } +} + +func TestExchangeScopesRequestIdentity(t *testing.T) { + c := newTestClient(t) + var scopes []string + for _, s := range c.config.Scopes { + scopes = append(scopes, s) + } + for _, want := range []string{"openid", "profile", "email", "offline_access"} { + found := false + for _, s := range scopes { + if s == want { + found = true + } + } + if !found { + t.Errorf("scopes=%v; want %q (account identification, #99)", scopes, want) + } + } +} + +// TestSaveToken_distinctFallbackIdentitiesCoexist is the #99 regression: two accounts +// whose tenants send no email claims must not collapse onto each other. +func TestSaveToken_distinctFallbackIdentitiesCoexist(t *testing.T) { + c := newTestClient(t) + ctx := context.Background() + seedUser(t, c.db, "u1") + tok := &oauth2.Token{AccessToken: "a", RefreshToken: "r", Expiry: time.Now().Add(time.Hour)} + if err := c.saveToken(ctx, "u1", "primary", "t1:o1", "work", tok); err != nil { + t.Fatalf("save first: %v", err) + } + if err := c.saveToken(ctx, "u1", "primary", "t1:o2", "work", tok); err != nil { + t.Fatalf("save second: %v", err) + } + var n int + if err := c.db.QueryRow(`SELECT COUNT(*) FROM calendar_connections WHERE user_id = 'u1'`).Scan(&n); err != nil { + t.Fatalf("count: %v", err) + } + if n != 2 { + t.Errorf("connections = %d; want 2 (no replacement)", n) + } +} + func TestSaveToken_refreshPreservesKind(t *testing.T) { c := newTestClient(t) seedUser(t, c.db, "u1") diff --git a/internal/handler/calendar.go b/internal/handler/calendar.go index 2514781e..ef0497f2 100644 --- a/internal/handler/calendar.go +++ b/internal/handler/calendar.go @@ -9,6 +9,7 @@ import ( "github.com/calnode/calnode/internal/caldav" "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/calendar/microsoft" ) // stateSep separates the provider name from the userID inside the (encrypted) @@ -93,6 +94,10 @@ func (h *Handler) CalendarCallback(w http.ResponseWriter, r *http.Request) { if err := p.Exchange(r.Context(), userID, code, "primary"); err != nil { h.logger.ErrorContext(r.Context(), "calendar callback: exchange", "error", err, "user_id", userID) + if errors.Is(err, microsoft.ErrNoAccountIdentity) { + h.writeError(w, http.StatusBadRequest, "Microsoft did not identify the account: add the profile and email scopes (or the ID-token email optional claim) in the Entra app registration, then connect again") + return + } h.writeError(w, http.StatusInternalServerError, "internal error") return } From eb5727021faba68f236edf7d996f6dae4209f16f Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Sat, 26 Sep 2026 18:49:22 +1200 Subject: [PATCH 077/250] fix(livekit): re-mint room join URLs on reschedule (#98) Room names are stable but signed URLs expire past the meeting end, so a rescheduled booking kept pointing at tokens that died with the original date. rescheduleSideEffects now re-mints both links (same room, new expiry) and refreshes the stored location before emails go out. --- internal/handler/booking_handler.go | 26 ++++ .../livekit_reschedule_internal_test.go | 119 ++++++++++++++++++ internal/handler/manage_handler.go | 5 + 3 files changed, 150 insertions(+) create mode 100644 internal/handler/livekit_reschedule_internal_test.go diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index a5c48205..fcfb363f 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -1123,6 +1123,32 @@ func (h *Handler) mintMeetingLink(ctx context.Context, b *booking.Booking, in bo return meetURL, autoGenMeet, livekitHostURL } +// remintLiveKitLinks re-mints a LiveKit booking's join URLs after a reschedule. The +// room itself is stable ("booking-"), but the signed URLs expire shortly after +// the meeting end — without this, the reschedule email, the manage page, and the +// stored record keep pointing at tokens that die with the original date (#98). +// Updates bookings.location_value (attendee link) and b in place; the room column +// is unchanged. No-op when LiveKit is disabled or the booking never minted a room. +func (h *Handler) remintLiveKitLinks(ctx context.Context, b *booking.Booking) { + lk := h.getLiveKit() + if lk == nil { + return + } + var room string + if err := h.db.QueryRowContext(ctx, + `SELECT COALESCE(livekit_room,'') FROM bookings WHERE id = ?`, b.ID).Scan(&room); err != nil || room == "" { + return + } + exp := b.EndAt.Add(2 * time.Hour) + attendeeURL := lk.BookingJoinURL(h.baseURL, room, "", exp) + if _, err := h.db.ExecContext(ctx, + `UPDATE bookings SET location_value = ? WHERE id = ?`, attendeeURL, b.ID); err != nil { + h.logger.Error("livekit: refresh location on reschedule", "error", err, "booking_id", b.ID) + return + } + b.LocationValue = attendeeURL +} + // hostEventLocation picks the Location for a host's calendar event. That event adds the // attendee as a guest (see gcal's CreateEvent), so the calendar provider (Google/Microsoft/ // CalDAV) emails this value straight to the attendee via its own native invite — bypassing diff --git a/internal/handler/livekit_reschedule_internal_test.go b/internal/handler/livekit_reschedule_internal_test.go new file mode 100644 index 00000000..9cda7cd4 --- /dev/null +++ b/internal/handler/livekit_reschedule_internal_test.go @@ -0,0 +1,119 @@ +package handler + +import ( + "context" + "log/slog" + "net/url" + "strings" + "testing" + "time" + + "github.com/calnode/calnode/internal/booking" + "github.com/calnode/calnode/internal/db" + "github.com/calnode/calnode/internal/livekit" +) + +func newLiveKitTestHandler(t *testing.T, withLiveKit bool) *Handler { + t.Helper() + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatalf("db.Open: %v", err) + } + if err := db.Migrate(database); err != nil { + t.Fatalf("db.Migrate: %v", err) + } + t.Cleanup(func() { database.Close() }) + h := New(database, slog.Default()) + h.baseURL = "https://calnode.example.com" + if withLiveKit { + h.SetLiveKit(livekit.New("wss://lk.example.com", "key", "secret", [32]byte{1, 2, 3})) + } + ctx := context.Background() + database.ExecContext(ctx, + `INSERT INTO users (id, email, name, iana_timezone) VALUES ('u1','h@example.com','Host','UTC')`) //nolint:errcheck + database.ExecContext(ctx, + `INSERT INTO event_types (id, user_id, slug, name, duration_minutes) VALUES ('et1','u1','meet','Meet',30)`) //nolint:errcheck + return h +} + +func seedLiveKitBooking(t *testing.T, h *Handler, end time.Time, room, location string) booking.Booking { + t.Helper() + ctx := context.Background() + start := end.Add(-30 * time.Minute) + _, err := h.db.ExecContext(ctx, + `INSERT INTO bookings (id, event_type_id, host_id, start_at, end_at, status, location_value, livekit_room) + VALUES ('b1','et1','u1',?,?, 'confirmed',?,?)`, + start.Format(time.RFC3339), end.Format(time.RFC3339), location, room) + if err != nil { + t.Fatalf("seed booking: %v", err) + } + return booking.Booking{ID: "b1", EventTypeID: "et1", HostID: "u1", + StartAt: start, EndAt: end, Status: "confirmed", LocationValue: location} +} + +// TestRemintLiveKitLinks_refreshesExpiredURLs is the #98 regression: after a reschedule +// past the original end, the stored join URL must carry the new expiry. +func TestRemintLiveKitLinks_refreshesExpiredURLs(t *testing.T) { + h := newLiveKitTestHandler(t, true) + ctx := context.Background() + lk := h.getLiveKit() + + oldEnd := time.Now().UTC().Add(-time.Hour) // original meeting already over + oldURL := lk.BookingJoinURL(h.baseURL, "booking-b1", "", oldEnd.Add(2*time.Hour)) + b := seedLiveKitBooking(t, h, oldEnd, "booking-b1", oldURL) + + // Reschedule to tomorrow: same room, new end. + b.EndAt = time.Now().UTC().Add(25 * time.Hour).Truncate(time.Second) + b.StartAt = b.EndAt.Add(-30 * time.Minute) + h.remintLiveKitLinks(ctx, &b) + + var stored string + if err := h.db.QueryRowContext(ctx, `SELECT location_value FROM bookings WHERE id = 'b1'`).Scan(&stored); err != nil { + t.Fatalf("read location: %v", err) + } + if stored == oldURL { + t.Fatal("location_value unchanged after reschedule; want a re-minted URL") + } + if b.LocationValue != stored { + t.Error("in-memory booking not updated alongside the stored row") + } + u, err := url.Parse(stored) + if err != nil { + t.Fatalf("parse URL: %v", err) + } + if !strings.HasPrefix(u.Path, "/room/booking-b1") { + t.Errorf("URL path = %q; want the same room", u.Path) + } + lc := livekit.New("wss://lk.example.com", "key", "secret", [32]byte{1, 2, 3}) + _, _, exp, err := lc.VerifyRoomToken(u.Query().Get("t")) + if err != nil { + t.Fatalf("fresh token does not verify: %v", err) + } + if !exp.Equal(b.EndAt.Add(2 * time.Hour)) { + t.Errorf("token expiry = %v; want new end + 2h", exp) + } +} + +func TestRemintLiveKitLinks_skipsWhenNothingToDo(t *testing.T) { + ctx := context.Background() + end := time.Now().UTC().Add(time.Hour) + + // LiveKit disabled: untouched. + h := newLiveKitTestHandler(t, false) + b := seedLiveKitBooking(t, h, end, "booking-b1", "https://calnode.example.com/room/booking-b1?t=old") + h.remintLiveKitLinks(ctx, &b) + var stored string + h.db.QueryRowContext(ctx, `SELECT location_value FROM bookings WHERE id = 'b1'`).Scan(&stored) //nolint:errcheck + if stored != "https://calnode.example.com/room/booking-b1?t=old" { + t.Errorf("location changed with LiveKit disabled: %q", stored) + } + + // LiveKit on but no room minted (non-LiveKit booking): untouched. + h2 := newLiveKitTestHandler(t, true) + b2 := seedLiveKitBooking(t, h2, end, "", "https://meet.example.com/manual") + h2.remintLiveKitLinks(ctx, &b2) + h2.db.QueryRowContext(ctx, `SELECT location_value FROM bookings WHERE id = 'b1'`).Scan(&stored) //nolint:errcheck + if stored != "https://meet.example.com/manual" { + t.Errorf("non-LiveKit location changed: %q", stored) + } +} diff --git a/internal/handler/manage_handler.go b/internal/handler/manage_handler.go index 79172663..191ef1ad 100644 --- a/internal/handler/manage_handler.go +++ b/internal/handler/manage_handler.go @@ -290,6 +290,11 @@ func (h *Handler) rescheduleSideEffects(bCopy booking.Booking, capturedEtID stri ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) defer cancel() + // LiveKit join URLs expire with the original meeting: re-mint them first so the + // email data loaded below, the manage page, and the stored record all carry + // links valid past the new end (#98). Same room, new expiry. + h.remintLiveKitLinks(ctx, &bCopy) + d, err := h.loadCancellationData(ctx, &bCopy) if err != nil { h.logger.Error("reschedule: load email data", "error", err, "booking_id", bCopy.ID) From fccf552722dec0a149754e76adaaf34525b4955c Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Mon, 28 Sep 2026 09:32:25 +1300 Subject: [PATCH 078/250] chore(ci): gofmt microsoft test, annotate G104 rows.Close findings --- internal/calendar/microsoft/microsoft_test.go | 2 +- internal/handler/directory.go | 2 +- internal/handler/users.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/calendar/microsoft/microsoft_test.go b/internal/calendar/microsoft/microsoft_test.go index 698896dc..e02f39bc 100644 --- a/internal/calendar/microsoft/microsoft_test.go +++ b/internal/calendar/microsoft/microsoft_test.go @@ -367,7 +367,7 @@ func TestListCalendars_followsNextLink(t *testing.T) { w.Header().Set("Content-Type", "application/json") if r.URL.Query().Get("$skiptoken") == "" { _ = json.NewEncoder(w).Encode(map[string]any{ - "value": []map[string]any{graphCalendars[0]}, + "value": []map[string]any{graphCalendars[0]}, "@odata.nextLink": srv.URL + "/me/calendars?$skiptoken=page2", }) return diff --git a/internal/handler/directory.go b/internal/handler/directory.go index 6a6bfe9b..6066f9f7 100644 --- a/internal/handler/directory.go +++ b/internal/handler/directory.go @@ -191,7 +191,7 @@ func (h *Handler) TeamPage(w http.ResponseWriter, r *http.Request) { } members = append(members, m) } - mRows.Close() + mRows.Close() // #nosec G104 -- rows already fully consumed above; nothing actionable on close error if err := mRows.Err(); err != nil { h.logger.ErrorContext(r.Context(), "team page: members rows", "error", err) http.Error(w, "Internal server error", http.StatusInternalServerError) diff --git a/internal/handler/users.go b/internal/handler/users.go index 48ddf681..441bdafb 100644 --- a/internal/handler/users.go +++ b/internal/handler/users.go @@ -88,7 +88,7 @@ func (h *Handler) ListUsers(w http.ResponseWriter, r *http.Request) { // Close before the next query: the pool is a single connection, and an open // cursor holds it (exhausted is not closed) — querying while rows is open // deadlocks. - rows.Close() + rows.Close() // #nosec G104 -- rows already fully consumed above; nothing actionable on close error if err := rows.Err(); err != nil { h.logger.ErrorContext(r.Context(), "list users: rows", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") From 28ef33d03e1adec524211707cbe170121ff8783d Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Mon, 28 Sep 2026 10:04:35 +1300 Subject: [PATCH 079/250] chore(audit): annotate G202 on directoryItems dynamic WHERE --- internal/handler/directory.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/handler/directory.go b/internal/handler/directory.go index 6066f9f7..cb76df94 100644 --- a/internal/handler/directory.go +++ b/internal/handler/directory.go @@ -58,7 +58,7 @@ func (h *Handler) directoryItems(ctx context.Context, loc *i18n.Locale, where st rows, err := h.db.QueryContext(ctx, ` SELECT slug, name, duration_minutes, location_type, COALESCE(location_value,''), price_cents, currency - FROM event_types et WHERE `+where+` ORDER BY name`, args...) + FROM event_types et WHERE `+where+` ORDER BY name`, args...) // #nosec G202 -- where is one of two literals at the call sites; every value is bound via args... if err != nil { return nil, err } From 9e2f21bd65b39c3037b5b8f88ac9fc869bbc3b68 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Mon, 28 Sep 2026 10:13:44 +1300 Subject: [PATCH 080/250] chore(release): 0.10.0 --- CHANGELOG.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1ece98f..8c284e77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +## [0.10.0] - 2026-09-27 + ### Security - **Moving or cancelling a CalDAV booking no longer sends another account's app password to the server holding the event.** A host can connect several CalDAV accounts, and @@ -89,7 +91,25 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad cannot parse, which would leave the admin UI *more* embeddable than the setting being unset. And no `X-Frame-Options` is sent beside it: that header has no allow-list form, so the only value it could carry is `SAMEORIGIN`, which browsers honour instead of the - CSP and would break the embedding this exists for. + CSP and would break the embedding this exists for. + +- **Per-person and team booking pages.** A handle set in profile settings buys + `/u/{handle}`: every public, active event type the person owns or hosts, with + duration, location and price per type. Teams get `/team/{slug}` with their types + plus a member roster linking to each member's page. Archived users 404, and handles + are slugified, unique, and cleared by blanking the field. Answers + [#94](https://github.com/Calnode/calnode/issues/94). +- **Custom-hours date overrides take several blocks.** A date override used to hold a + single window while weekly rules take as many as you like, so a split day (open + morning and afternoon around a mid-day appointment) had no honest expression. Dates + now hold any number of custom blocks; a blocking override replaces the customs on + its date, an exact duplicate still 409s, and the list flags blocks that overlap + and merge. Answers + [#95](https://github.com/Calnode/calnode/issues/95). +- **SMTP through a separate relay address.** Some providers require the SMTP session + to open against a relay host distinct from the mail domain: the relay address is + now configured explicitly instead of derived. Thanks + [@marijnbent](https://github.com/marijnbent) ([#65](https://github.com/Calnode/calnode/pull/65)). ### Fixed - **SMTP email works with servers that offer AUTH LOGIN but not AUTH PLAIN.** @@ -149,6 +169,33 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad option. The calendar list read Graph's `canEdit` but left it out of `$select`, so Graph never returned it and every calendar decoded as not writable. It is now requested, and a test fails if that request omits any property the response decodes. +- **Cancellations name who cancelled.** The bookings page sent a hardcoded "cancelled by + admin" reason that the server stored verbatim, so a member cancelling their own booking + emailed as an admin cancel. The server now composes "Cancelled by {name}" from the + authenticated caller and ignores the client string; booker manage-link and system + cancels keep their own reasons. Answers + [#90](https://github.com/Calnode/calnode/issues/90). +- **The dashboard lists every booking link instead of crowning one.** With several event + types it showed a single "Your booking link" pointing at whichever came first. One + event type keeps the single-link box; several render a per-type list with names, copy + buttons, and the profile page link once a handle is set. Answers + [#93](https://github.com/Calnode/calnode/issues/93). +- **A rescheduled LiveKit meeting gets fresh join links.** Room names are stable but the + signed URLs expire past the meeting end, so rescheduling past the original date left + every stored link dead. Reschedule now re-mints both links on the same room with an + expiry past the new end before the emails go out. Answers + [#98](https://github.com/Calnode/calnode/issues/98). +- **A second Microsoft account no longer replaces the first.** Entra tenants omit the + `preferred_username`/`email` claims by default, so the account identifier came back + empty and saving the new connection deleted the old one. Calnode now requests the + `profile` and `email` scopes, falls back to the stable `tid:oid` pair, and refuses the + connection with an actionable error rather than storing an empty dedup key. Answers + [#99](https://github.com/Calnode/calnode/issues/99). +- **External calendars are rechecked before a booking is created.** Availability was + computed, then the booking was written without re-reading the providers, so an event + landing in the gap double-booked. Creation now rechecks and fails closed with + provider failures distinguished. Thanks + [@marijnbent](https://github.com/marijnbent) ([#66](https://github.com/Calnode/calnode/pull/66)). ## [0.9.0] - 2026-09-10 From 45b569f8ee78eec35c07c6c0a757ece060fcb2d3 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 29 Sep 2026 09:08:35 +1300 Subject: [PATCH 081/250] packaging: add in-tree NS8 module (packaging/ns8) Thin wrapper around the published app image: host-based Traefik route with cluster TLS, SQLite on the calnode-data volume, generated encryption key preserved across reconfigures. CI builds the module image with the same tag scheme as docker-publish.yml and release tags pin module and app to the same version. --- .github/workflows/ns8-module.yml | 80 + CLAUDE.md | 11 + packaging/ns8/README.md | 132 + packaging/ns8/build-images.sh | 95 + .../actions/configure-module/20configure | 120 + .../actions/configure-module/80start_services | 10 + .../configure-module/validate-input.json | 34 + .../actions/get-configuration/20read | 31 + .../get-configuration/validate-output.json | 23 + .../imageroot/systemd/user/calnode.service | 43 + packaging/ns8/tests/__init__.robot | 15 + packaging/ns8/tests/calnode.robot | 57 + packaging/ns8/ui/.browserslistrc | 3 + packaging/ns8/ui/.eslintrc.js | 14 + packaging/ns8/ui/.gitignore | 29 + packaging/ns8/ui/.yarnrc.yml | 8 + packaging/ns8/ui/Containerfile | 7 + packaging/ns8/ui/README.md | 3 + packaging/ns8/ui/babel.config.js | 3 + packaging/ns8/ui/container-entrypoint.sh | 11 + packaging/ns8/ui/package.json | 46 + .../ns8/ui/public/i18n/ar/translation.json | 57 + .../ns8/ui/public/i18n/de/translation.json | 57 + .../ns8/ui/public/i18n/en/translation.json | 60 + .../ns8/ui/public/i18n/es/translation.json | 57 + .../ns8/ui/public/i18n/eu/translation.json | 57 + .../ns8/ui/public/i18n/it/translation.json | 57 + .../ns8/ui/public/i18n/pt/translation.json | 57 + .../ns8/ui/public/i18n/pt_BR/translation.json | 57 + .../ns8/ui/public/i18n/ta/translation.json | 51 + .../ns8/ui/public/i18n/uk/translation.json | 5 + packaging/ns8/ui/public/index.html | 61 + packaging/ns8/ui/public/metadata.json | 19 + packaging/ns8/ui/public/shortcuts.json | 1 + packaging/ns8/ui/src/App.vue | 125 + .../ns8/ui/src/assets/module_default_logo.png | Bin 0 -> 4199 bytes .../ui/src/components/AppMobileSideMenu.vue | 77 + .../ns8/ui/src/components/AppSideMenu.vue | 18 + .../ui/src/components/AppSideMenuContent.vue | 91 + packaging/ns8/ui/src/i18n/index.js | 18 + packaging/ns8/ui/src/main.js | 58 + packaging/ns8/ui/src/router/index.js | 40 + packaging/ns8/ui/src/store/index.js | 46 + .../ns8/ui/src/styles/_carbon-utils.scss | 15 + packaging/ns8/ui/src/views/About.vue | 348 + packaging/ns8/ui/src/views/Settings.vue | 284 + packaging/ns8/ui/src/views/Status.vue | 519 + packaging/ns8/ui/vue.config.js | 40 + packaging/ns8/ui/yarn.lock | 12593 ++++++++++++++++ 49 files changed, 15643 insertions(+) create mode 100644 .github/workflows/ns8-module.yml create mode 100644 packaging/ns8/README.md create mode 100644 packaging/ns8/build-images.sh create mode 100644 packaging/ns8/imageroot/actions/configure-module/20configure create mode 100644 packaging/ns8/imageroot/actions/configure-module/80start_services create mode 100644 packaging/ns8/imageroot/actions/configure-module/validate-input.json create mode 100644 packaging/ns8/imageroot/actions/get-configuration/20read create mode 100644 packaging/ns8/imageroot/actions/get-configuration/validate-output.json create mode 100644 packaging/ns8/imageroot/systemd/user/calnode.service create mode 100644 packaging/ns8/tests/__init__.robot create mode 100644 packaging/ns8/tests/calnode.robot create mode 100644 packaging/ns8/ui/.browserslistrc create mode 100644 packaging/ns8/ui/.eslintrc.js create mode 100644 packaging/ns8/ui/.gitignore create mode 100644 packaging/ns8/ui/.yarnrc.yml create mode 100644 packaging/ns8/ui/Containerfile create mode 100644 packaging/ns8/ui/README.md create mode 100644 packaging/ns8/ui/babel.config.js create mode 100644 packaging/ns8/ui/container-entrypoint.sh create mode 100644 packaging/ns8/ui/package.json create mode 100644 packaging/ns8/ui/public/i18n/ar/translation.json create mode 100644 packaging/ns8/ui/public/i18n/de/translation.json create mode 100644 packaging/ns8/ui/public/i18n/en/translation.json create mode 100644 packaging/ns8/ui/public/i18n/es/translation.json create mode 100644 packaging/ns8/ui/public/i18n/eu/translation.json create mode 100644 packaging/ns8/ui/public/i18n/it/translation.json create mode 100644 packaging/ns8/ui/public/i18n/pt/translation.json create mode 100644 packaging/ns8/ui/public/i18n/pt_BR/translation.json create mode 100644 packaging/ns8/ui/public/i18n/ta/translation.json create mode 100644 packaging/ns8/ui/public/i18n/uk/translation.json create mode 100644 packaging/ns8/ui/public/index.html create mode 100644 packaging/ns8/ui/public/metadata.json create mode 100644 packaging/ns8/ui/public/shortcuts.json create mode 100644 packaging/ns8/ui/src/App.vue create mode 100644 packaging/ns8/ui/src/assets/module_default_logo.png create mode 100644 packaging/ns8/ui/src/components/AppMobileSideMenu.vue create mode 100644 packaging/ns8/ui/src/components/AppSideMenu.vue create mode 100644 packaging/ns8/ui/src/components/AppSideMenuContent.vue create mode 100644 packaging/ns8/ui/src/i18n/index.js create mode 100644 packaging/ns8/ui/src/main.js create mode 100644 packaging/ns8/ui/src/router/index.js create mode 100644 packaging/ns8/ui/src/store/index.js create mode 100644 packaging/ns8/ui/src/styles/_carbon-utils.scss create mode 100644 packaging/ns8/ui/src/views/About.vue create mode 100644 packaging/ns8/ui/src/views/Settings.vue create mode 100644 packaging/ns8/ui/src/views/Status.vue create mode 100644 packaging/ns8/ui/vue.config.js create mode 100644 packaging/ns8/ui/yarn.lock diff --git a/.github/workflows/ns8-module.yml b/.github/workflows/ns8-module.yml new file mode 100644 index 00000000..3ec8223b --- /dev/null +++ b/.github/workflows/ns8-module.yml @@ -0,0 +1,80 @@ +name: NS8 module publish + +# Builds the ns8-calnode module image from packaging/ns8. The module is a thin +# wrapper: this image carries configuration scripts and the settings UI, while +# the Calnode app itself is pulled from its own registry at install time. +# * PR → validate + build only. Nothing is pushed. +# * push to dev → push `:dev`, running app `:dev`. +# * push to main → push `:edge` + `:latest`, running app `:edge`. +# * push a `vX.Y.Z` tag → push `:X.Y.Z`, `:X.Y` and `:latest`, running app +# `:X.Y.Z`. Module and app tags move together, so a +# module release can never point at the wrong app. +on: + push: + branches: [main, dev] + tags: ['v*.*.*'] + pull_request: + +concurrency: + group: ns8-module-${{ github.ref }} + cancel-in-progress: true + +jobs: + validate: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Validate action scripts and schemas + working-directory: packaging/ns8 + run: | + python3 -m py_compile imageroot/actions/configure-module/20configure imageroot/actions/get-configuration/20read + python3 -c "import json, glob; [json.load(open(f)) for f in glob.glob('imageroot/actions/*/*.json') + glob.glob('ui/public/*.json') + ['ui/public/i18n/en/translation.json']]" + bash -n imageroot/actions/configure-module/80start_services + bash -n build-images.sh + grep -rn '__CALNODE_APP_IMAGE__' imageroot/systemd/user/calnode.service + + build: + needs: validate + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + + # Mirror the app tagging in docker-publish.yml: release tags pin both + # images to the same version, branches track the moving app tags. + - name: Resolve tags + id: tags + run: | + if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then + version="${GITHUB_REF_NAME#v}" + echo "module_tags=${version} ${version%.*} latest" >> "$GITHUB_OUTPUT" + echo "app_image=ghcr.io/calnode/calnode:${version}" >> "$GITHUB_OUTPUT" + elif [[ "${GITHUB_REF}" == refs/heads/main ]]; then + echo "module_tags=edge latest" >> "$GITHUB_OUTPUT" + echo "app_image=ghcr.io/calnode/calnode:edge" >> "$GITHUB_OUTPUT" + elif [[ "${GITHUB_REF}" == refs/heads/dev ]]; then + echo "module_tags=dev" >> "$GITHUB_OUTPUT" + echo "app_image=ghcr.io/calnode/calnode:dev" >> "$GITHUB_OUTPUT" + else + echo "module_tags=build" >> "$GITHUB_OUTPUT" + echo "app_image=ghcr.io/calnode/calnode:edge" >> "$GITHUB_OUTPUT" + fi + + # buildah is preinstalled on the ubuntu runners, same as the upstream + # NS8 publish workflow assumes. + - name: Build (push on branch pushes and on tags) + working-directory: packaging/ns8 + env: + REPOBASE: ghcr.io/${{ github.repository_owner }} + APP_IMAGE: ${{ steps.tags.outputs.app_image }} + IMAGETAGS: ${{ steps.tags.outputs.module_tags }} + run: | + push=0 + if [ "${{ github.event_name }}" != "pull_request" ]; then + push=1 + buildah login -u "${{ github.actor }}" --password-stdin ghcr.io <<<"${{ secrets.GITHUB_TOKEN }}" + fi + PUSH="$push" bash build-images.sh diff --git a/CLAUDE.md b/CLAUDE.md index 514448d4..1819bfde 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -237,3 +237,14 @@ at an unconditional `"zoom"`. - `pnpm` (not npm). Use `pnpm exec ` for local binaries. - Verify changes against the real app, not just builds — this codebase has been bitten by CSS that compiles fine but renders wrong. + +## Distribution packaging (packaging/) + +- One channel per directory: `packaging/ns8/` is the NethServer 8 module + (imageroot actions, systemd unit, Vue settings UI, robot tests). Future + channels (Umbrel, Coolify, TrueNAS, etc.) get siblings, never a mega-PR. +- The NS8 module is a thin wrapper around the published app image, built by + `.github/workflows/ns8-module.yml` with the same tag scheme as + `docker-publish.yml`. Release tags pin module and app to the same version. +- The committed systemd unit keeps a `__CALNODE_APP_IMAGE__` placeholder; + `packaging/ns8/build-images.sh` stamps the real app ref at build time. diff --git a/packaging/ns8/README.md b/packaging/ns8/README.md new file mode 100644 index 00000000..3f3d6721 --- /dev/null +++ b/packaging/ns8/README.md @@ -0,0 +1,132 @@ +# ns8-calnode + +NethServer 8 community module wrapping [Calnode](https://github.com/calnode/calnode), +the self-hostable scheduling and booking platform. Install it on your cluster +with one command and get Calnode on your own domain. No Calnode docs required. + +## How it works + +This module is a thin wrapper around the published Calnode container image +(`ghcr.io/calnode/calnode:latest`). Nothing is ported or rebuilt: the module +image only carries configuration scripts and the settings UI. At install time +the cluster pulls the Calnode image and runs it as a rootless container. + +Key facts: + +- App listens on port 3000 inside the container, published on 127.0.0.1 only. + There is no inbound port beyond the app itself. +- TLS is handled by the cluster Traefik proxy, not the module. Set the + hostname and the module registers a host-based route with Let's Encrypt. +- The whole database is one SQLite file on the `calnode-data` named volume. + The volume survives module updates. Never delete it unless you mean to + wipe all bookings, users and settings. +- First configuration generates a `CALNODE_ENCRYPTION_KEY` that unlocks the + database key vault. It is stored in the module state and covered by cluster + backup. If you lose both the volume and this key, bookings become + unreadable, so keep backups working. + +## Install + +On the cluster leader, as root: + +``` +add-module ghcr.io/calnode/ns8-calnode:latest 1 +``` + +Replace `calnode` with the actual registry namespace if you built your own +image (see Development). The command prints the instance name, usually +`ns8-calnode1`. + +Then configure it with your public hostname: + +``` +api-cli run module/ns8-calnode1/configure-module --data '{"host": "book.example.com", "lets_encrypt": true, "http2https": true}' +``` + +Or open the cluster admin UI, find the instance, and fill in the Settings page: +hostname, Let's Encrypt toggle, HTTP to HTTPS redirect toggle. + +Calnode is then live at `https://book.example.com`. Sign up the first admin +account in the web UI. Mail delivery (invites, reminders) is configured +inside Calnode under Settings, using your SMTP smarthost values. + +## Update + +Update from the Software Center like any other module. The container image is +swapped and the service restarts; the `calnode-data` volume is untouched, so +bookings, users and settings carry over. New module releases track new +Calnode app releases. + +To move an existing install to a new hostname, just run `configure-module` +again (or save the Settings page) with the new host. The encryption key and +the database are preserved. + +## Backup and restore + +Backups run through the standard cluster backup in the cluster admin UI. +Each backup of the instance contains: + +- the `calnode-data` volume (the SQLite database file, the whole app state) +- the module state, including `calnode.env` with `CALNODE_ENCRYPTION_KEY` + +Restore to the same or a replacement node from the cluster admin backup +section, then re-run `configure-module` with the same hostname if the route +needs recreating. Keep at least one tested backup: the encryption key and +the database are only useful together. + +UNTESTED: no live NS8 node was reachable while writing this, so install, +configure, update, backup and restore steps above are documented from the +NS8 module layout but have not been run against a real cluster. The +automated test suite in `tests/` covers install, configure, HTTP check and +removal once a node is available. + +## Uninstall + +To uninstall the instance, keeping its data for a later reinstall: + +``` +remove-module --preserve ns8-calnode1 +``` + +To wipe everything including bookings: + +``` +remove-module --no-preserve ns8-calnode1 +``` + +## Development + +This module lives in the Calnode repo under `packaging/ns8/` and ships from +the same CI as the app. The root workflow `.github/workflows/ns8-module.yml` +builds the module image on every PR (no push) and publishes on branch and +tag pushes, mirroring the app tags in `docker-publish.yml`: + +- push to `main` pushes module `:edge` and `:latest`, running app `:edge` +- push to `dev` pushes module `:dev`, running app `:dev` +- push a `vX.Y.Z` tag pushes module `:X.Y.Z`, `:X.Y` and `:latest`, running + app `:X.Y.Z`, so a module release always runs the matching app release + +To build locally on a machine with podman and buildah, from this directory: + +``` +bash build-images.sh +``` + +It prints the `buildah push` commands for your registry. Override the app +reference per build with e.g. `APP_IMAGE=ghcr.io/calnode/calnode:1.2.3 +IMAGETAGS="1.2.3 latest" PUSH=1 bash build-images.sh`. The systemd unit in +the tree keeps a `__CALNODE_APP_IMAGE__` placeholder that the script stamps +at build time, so the committed files never name an app tag. + +Running the test suite needs an NS8 test cluster; see the +[NS8 testing docs](https://github.com/NethServer/ns8-github-actions/blob/v1/README.md#running-tests-locally). +UNTESTED here: no test cluster was available. + +## UI translation + +Translated with [Weblate](https://hosted.weblate.org/projects/ns8/). + +To setup the translation process: + +- add [GitHub Weblate app](https://docs.weblate.org/en/latest/admin/code-hosting.html#code-hosting-github-notifications) to your repository +- add your repository to [hosted.weblate.org](https://hosted.weblate.org) or ask a NethServer developer to add it to ns8 Weblate project diff --git a/packaging/ns8/build-images.sh b/packaging/ns8/build-images.sh new file mode 100644 index 00000000..b373ec18 --- /dev/null +++ b/packaging/ns8/build-images.sh @@ -0,0 +1,95 @@ +#!/bin/bash + +# +# Copyright (C) 2023 Nethesis S.r.l. +# SPDX-License-Identifier: GPL-3.0-or-later +# + +# Build the ns8-calnode module image and optionally push it. +# +# Run from this directory (packaging/ns8). Environment: +# REPOBASE module image namespace, default ghcr.io/calnode +# APP_IMAGE Calnode app image the module runs, default +# ghcr.io/calnode/calnode:latest. Release CI passes the app +# tag matching the release, so module 1.2.3 always runs app +# 1.2.3 and the two can never drift apart. +# IMAGETAGS space-separated module tags to push, default "latest" +# PUSH=1 push after building. Default 0 prints the push commands. +# +# The module image only carries configuration scripts and the settings UI. +# The Calnode application itself is pulled from APP_IMAGE at install time. + +# Terminate on error +set -e + +# Must run from packaging/ns8 (uses relative imageroot and ui paths) +if [ ! -d imageroot ] || [ ! -d ui ]; then + echo "Run build-images.sh from the packaging/ns8 directory." >&2 + exit 1 +fi + +# Prepare variables for later use +repobase="${REPOBASE:-ghcr.io/calnode}" +reponame="ns8-calnode" +app_image="${APP_IMAGE:-ghcr.io/calnode/calnode:latest}" +read -r -a imagetags <<< "${IMAGETAGS:-latest}" + +# Stage imageroot with the app image reference stamped in, so the committed +# tree keeps a placeholder and releases pin the exact app tag. +stage=$(mktemp -d) +trap 'rm -rf "${stage}"' EXIT +cp -r imageroot "${stage}/imageroot" +sed -i "s#__CALNODE_APP_IMAGE__#${app_image}#g" \ + "${stage}/imageroot/systemd/user/calnode.service" +if grep -q "__CALNODE_APP_IMAGE__" -r "${stage}/imageroot"; then + echo "App image placeholder was not fully substituted." >&2 + exit 1 +fi + +# Create a new empty container image +container=$(buildah from scratch) + +# Reuse existing nodebuilder-ns8-calnode container, to speed up builds +if ! buildah containers --format "{{.ContainerName}}" | grep -q nodebuilder-ns8-calnode; then + echo "Pulling NodeJS runtime..." + buildah from --name nodebuilder-ns8-calnode -v "${PWD}:/usr/src:Z" docker.io/library/node:24.21.0-slim +fi + +echo "Build static UI files with node..." +buildah run \ + --workingdir=/usr/src/ui \ + --env="NODE_OPTIONS=--openssl-legacy-provider" \ + nodebuilder-ns8-calnode \ + sh -c "corepack enable && yarn install && yarn build" + +# Add the staged imageroot directory to the container image +buildah add "${container}" "${stage}/imageroot" /imageroot +buildah add "${container}" ui/dist /ui +# Setup the entrypoint, ask to reserve one TCP port with the label and set a rootless container +buildah config --entrypoint=/ \ + --label="org.nethserver.authorizations=traefik@node:routeadm" \ + --label="org.nethserver.tcp-ports-demand=1" \ + --label="org.nethserver.rootfull=0" \ + --label="org.nethserver.volumes=calnode-data" \ + --label="org.nethserver.images=${app_image}" \ + "${container}" +# Commit the image +buildah commit "${container}" "${repobase}/${reponame}:build" + +# Warning! docker:// protocol expects lowercase letters (,,) +repobase="${repobase,,}" +reponame="${reponame,,}" + +if [ "${PUSH:-0}" = "1" ]; then + for imagetag in "${imagetags[@]}"; do + buildah tag "${repobase}/${reponame}:build" "${repobase}/${reponame}:${imagetag}" + buildah push "${repobase}/${reponame}:${imagetag}" "docker://${repobase}/${reponame}:${imagetag}" + done +else + printf "Built %s:%s (app %s).\nPublish with:\n\n" "${repobase}/${reponame}" "build" "${app_image}" + for imagetag in "${imagetags[@]}"; do + printf " buildah tag %s:build %s:%s\n" "${repobase}/${reponame}" "${repobase}/${reponame}" "${imagetag}" + printf " buildah push %s:%s docker://%s:%s\n" "${repobase}/${reponame}" "${imagetag}" "${repobase}/${reponame}" "${imagetag}" + done + printf "\nOr rerun with PUSH=1 IMAGETAGS=\"...\" to push directly.\n" +fi diff --git a/packaging/ns8/imageroot/actions/configure-module/20configure b/packaging/ns8/imageroot/actions/configure-module/20configure new file mode 100644 index 00000000..c23ccad0 --- /dev/null +++ b/packaging/ns8/imageroot/actions/configure-module/20configure @@ -0,0 +1,120 @@ +#!/usr/bin/env python3 + +# +# Copyright (C) 2023 Nethesis S.r.l. +# SPDX-License-Identifier: GPL-3.0-or-later +# + +# +# Configure a calnode instance: +# 1. persist the public hostname and TLS flags to state/config.json +# 2. write the container env file state/calnode.env (BASE_URL follows +# the hostname; the encryption key is generated once and preserved +# across reconfigures, since losing it locks the SQLite data key) +# 3. register a host-based Traefik route (TLS is handled by the cluster) +# 4. pull the Calnode image so a first install works offline of updates +# +import json +import os +import secrets +import sys + +import agent +import agent.tasks + +STATE_DIR = os.getcwd() +ENV_FILE = os.path.join(STATE_DIR, "calnode.env") +CONFIG_FILE = os.path.join(STATE_DIR, "config.json") +CALNODE_IMAGE = "ghcr.io/calnode/calnode:latest" + + +def read_env_file(path): + values = {} + try: + with open(path, "r", encoding="utf-8") as handle: + for line in handle.read().splitlines(): + line = line.strip() + if not line or line.startswith("#") or "=" not in line: + continue + key, _, value = line.partition("=") + values[key.strip()] = value.strip() + except FileNotFoundError: + pass + return values + + +def read_config(): + try: + with open(CONFIG_FILE, "r", encoding="utf-8") as handle: + data = json.load(handle) + return data if isinstance(data, dict) else {} + except (FileNotFoundError, ValueError): + return {} + + +request = json.load(sys.stdin) + +host = str(request.get("host", "")).strip().lower() +lets_encrypt = bool(request.get("lets_encrypt", True)) +http2https = bool(request.get("http2https", True)) +provided_key = str(request.get("encryption_key", "") or "") + +if not host: + print("host is required", file=sys.stderr) + sys.exit(1) + +previous = read_config() +old_host = str(previous.get("host", "") or "") + +# Refuse to steal a hostname that another route already answers, unless +# it is our own previously configured hostname. +if host != old_host: + try: + if agent.http_route_in_use(domain=host): + print(f"hostname {host} is already in use", file=sys.stderr) + sys.exit(2) + except AttributeError: + pass # older core without the helper: Traefik decides + +existing_env = read_env_file(ENV_FILE) +encryption_key = provided_key or existing_env.get("CALNODE_ENCRYPTION_KEY", "") +if not encryption_key: + encryption_key = secrets.token_hex(32) + +with open(ENV_FILE, "w", encoding="utf-8") as handle: + handle.write("# Written by configure-module. CALNODE_ENCRYPTION_KEY\n") + handle.write("# unlocks the database key vault: it is covered by cluster\n") + handle.write("# backup together with the calnode-data volume. Losing both\n") + handle.write("# means bookings become unreadable, so keep backups working.\n") + handle.write("PORT=3000\n") + handle.write("DATABASE_URL=sqlite:///data/calnode.db\n") + handle.write(f"BASE_URL=https://{host}\n") + handle.write(f"CALNODE_ENCRYPTION_KEY={encryption_key}\n") +os.chmod(ENV_FILE, 0o600) + +with open(CONFIG_FILE, "w", encoding="utf-8") as handle: + json.dump( + {"host": host, "lets_encrypt": lets_encrypt, "http2https": http2https}, + handle, + indent=2, + ) + +# Make sure the app image is present before the service starts. +agent.run_helper("podman", "pull", CALNODE_IMAGE).check_returncode() + +# Register a host-based route. Since the "instance" attribute starts with +# MODULE_ID, the route is removed automatically with the module. +response = agent.tasks.run( + agent_id=agent.resolve_agent_id("traefik@node"), + action="set-route", + data={ + "instance": os.environ["MODULE_ID"], + "url": "http://127.0.0.1:" + os.environ["TCP_PORT"], + "host": host, + "http2https": http2https, + "lets_encrypt": lets_encrypt, + }, +) + +# Check if traefik configuration has been successful +agent.assert_exp(response["exit_code"] == 0) diff --git a/packaging/ns8/imageroot/actions/configure-module/80start_services b/packaging/ns8/imageroot/actions/configure-module/80start_services new file mode 100644 index 00000000..f0bd1f51 --- /dev/null +++ b/packaging/ns8/imageroot/actions/configure-module/80start_services @@ -0,0 +1,10 @@ +#!/bin/bash + +# +# Copyright (C) 2023 Nethesis S.r.l. +# SPDX-License-Identifier: GPL-3.0-or-later +# + +# If the control reaches this step, the service can be enabled and started + +systemctl --user enable --now calnode.service diff --git a/packaging/ns8/imageroot/actions/configure-module/validate-input.json b/packaging/ns8/imageroot/actions/configure-module/validate-input.json new file mode 100644 index 00000000..b04a15b9 --- /dev/null +++ b/packaging/ns8/imageroot/actions/configure-module/validate-input.json @@ -0,0 +1,34 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "configure-module input", + "$id": "http://schema.nethserver.org/calnode/configure-module-input.json", + "description": "Configure calnode", + "type": "object", + "properties": { + "host": { + "type": "string", + "description": "Public fully qualified domain name Calnode is reached at", + "minLength": 1, + "maxLength": 253, + "pattern": "^(?=.{1,253}$)[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" + }, + "lets_encrypt": { + "type": "boolean", + "description": "Obtain a Let's Encrypt certificate for the hostname", + "default": true + }, + "http2https": { + "type": "boolean", + "description": "Redirect plain HTTP to HTTPS", + "default": true + }, + "encryption_key": { + "type": "string", + "description": "Optional existing CALNODE_ENCRYPTION_KEY, only needed when restoring or migrating data from another install", + "minLength": 16, + "maxLength": 128 + } + }, + "required": ["host"], + "additionalProperties": false +} diff --git a/packaging/ns8/imageroot/actions/get-configuration/20read b/packaging/ns8/imageroot/actions/get-configuration/20read new file mode 100644 index 00000000..888cc2f7 --- /dev/null +++ b/packaging/ns8/imageroot/actions/get-configuration/20read @@ -0,0 +1,31 @@ +#!/usr/bin/env python3 + +# +# Copyright (C) 2023 Nethesis S.r.l. +# SPDX-License-Identifier: GPL-3.0-or-later +# + +import json +import os +import sys + +CONFIG_FILE = os.path.join(os.getcwd(), "config.json") + +config = {"host": "", "lets_encrypt": True, "http2https": True, "configured": False} + +try: + with open(CONFIG_FILE, "r", encoding="utf-8") as handle: + stored = json.load(handle) + if isinstance(stored, dict): + if stored.get("host"): + config["host"] = stored["host"] + config["configured"] = True + if isinstance(stored.get("lets_encrypt"), bool): + config["lets_encrypt"] = stored["lets_encrypt"] + if isinstance(stored.get("http2https"), bool): + config["http2https"] = stored["http2https"] +except (FileNotFoundError, ValueError): + pass + +# The encryption key is never returned here: it stays in state/calnode.env. +json.dump(config, fp=sys.stdout) diff --git a/packaging/ns8/imageroot/actions/get-configuration/validate-output.json b/packaging/ns8/imageroot/actions/get-configuration/validate-output.json new file mode 100644 index 00000000..7a030f49 --- /dev/null +++ b/packaging/ns8/imageroot/actions/get-configuration/validate-output.json @@ -0,0 +1,23 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "get-configuration output", + "$id": "http://schema.nethserver.org/calnode/get-configuration-output.json", + "description": "Get calnode configuration", + "type": "object", + "properties": { + "host": { + "type": "string" + }, + "lets_encrypt": { + "type": "boolean" + }, + "http2https": { + "type": "boolean" + }, + "configured": { + "type": "boolean" + } + }, + "required": ["host", "lets_encrypt", "http2https", "configured"], + "additionalProperties": false +} diff --git a/packaging/ns8/imageroot/systemd/user/calnode.service b/packaging/ns8/imageroot/systemd/user/calnode.service new file mode 100644 index 00000000..1ded145b --- /dev/null +++ b/packaging/ns8/imageroot/systemd/user/calnode.service @@ -0,0 +1,43 @@ +# +# Copyright (C) 2023 Nethesis S.r.l. +# SPDX-License-Identifier: GPL-3.0-or-later +# + +# +# This systemd unit starts a calnode instance using Podman. +# Most parts of this file come from podman-generate-systemd. +# +# Calnode is a single static Go binary with an embedded SQLite database. +# The database file lives on the calnode-data named volume: never remove +# that volume or point the unit at a different one, or all bookings, +# users and settings are lost. TLS is terminated by the cluster Traefik +# instance, so the container only listens on 127.0.0.1. +# +[Unit] +Description=calnode server +After=network-online.target +Wants=network-online.target + +[Service] +Environment=PODMAN_SYSTEMD_UNIT=%n +EnvironmentFile=%E/state/environment +WorkingDirectory=%E/state +Restart=always +ExecStartPre=/bin/rm -f %t/calnode.pid %t/calnode.ctr-id +ExecStart=/usr/bin/podman run \ + --detach \ + --conmon-pidfile=%t/calnode.pid \ + --cidfile=%t/calnode.ctr-id \ + --cgroups=no-conmon \ + --replace --name=%N \ + --publish=127.0.0.1:${TCP_PORT}:3000 \ + --volume=calnode-data:/data \ + --env-file=calnode.env \ + __CALNODE_APP_IMAGE__ +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/calnode.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/calnode.ctr-id +PIDFile=%t/calnode.pid +Type=forking + +[Install] +WantedBy=default.target diff --git a/packaging/ns8/tests/__init__.robot b/packaging/ns8/tests/__init__.robot new file mode 100644 index 00000000..ac07ce23 --- /dev/null +++ b/packaging/ns8/tests/__init__.robot @@ -0,0 +1,15 @@ +*** Settings *** +Library SSHLibrary + +*** Variables *** +${SSH_KEYFILE} %{HOME}/.ssh/id_ecdsa + +*** Keywords *** +Connect to the node + Open Connection ${NODE_ADDR} + Login With Public Key root ${SSH_KEYFILE} + ${output} = Execute Command systemctl is-system-running --wait + Should Be True '${output}' == 'running' or '${output}' == 'degraded' + +*** Settings *** +Suite Setup Connect to the Node diff --git a/packaging/ns8/tests/calnode.robot b/packaging/ns8/tests/calnode.robot new file mode 100644 index 00000000..1eafc657 --- /dev/null +++ b/packaging/ns8/tests/calnode.robot @@ -0,0 +1,57 @@ +*** Settings *** +Library SSHLibrary + +*** Variables *** +${ADMIN_USER} admin +${ADMIN_PASSWORD} Nethesis,1234 +${TEST_HOST} calnode.example.test +${module_id} ${EMPTY} + +*** Keywords *** +Login to cluster-admin + New Page https://${NODE_ADDR}/cluster-admin/ + Fill Text text="Username" ${ADMIN_USER} + Click button >> text="Continue" + Fill Text text="Password" ${ADMIN_PASSWORD} + Click button >> text="Log in" + Wait For Elements State css=#main-content visible timeout=10s + +*** Test Cases *** +Check if ns8-calnode is installed correctly + ${output} ${rc} = Execute Command add-module ${IMAGE_URL} 1 + ... return_rc=True + Should Be Equal As Integers ${rc} 0 + &{output} = Evaluate ${output} + Set Global Variable ${module_id} ${output.module_id} + +Take screenshots + [Tags] ui + Import Library Browser + New Browser chromium headless=True + New Context ignoreHTTPSErrors=True + Login to cluster-admin + Go To https://${NODE_ADDR}/cluster-admin/#/apps/${module_id} + Wait For Elements State iframe >>> h2 >> text="Status" visible timeout=10s + Sleep 5s + Take Screenshot filename=${OUTPUT DIR}/browser/screenshot/1._Status.png + Go To https://${NODE_ADDR}/cluster-admin/#/apps/${module_id}?page=settings + Wait For Elements State iframe >>> h2 >> text="Settings" visible timeout=10s + Sleep 5s + Take Screenshot filename=${OUTPUT DIR}/browser/screenshot/2._Settings.png + Close Browser + +Check if ns8-calnode can be configured + ${rc} = Execute Command api-cli run module/${module_id}/configure-module --data '{"host": "${TEST_HOST}", "lets_encrypt": false, "http2https": false}' + ... return_rc=True return_stdout=False + Should Be Equal As Integers ${rc} 0 + +Check if ns8-calnode works as expected + # Host-based route: pass the hostname explicitly since it does not resolve here + ${rc} = Execute Command curl -f -H 'Host: ${TEST_HOST}' http://127.0.0.1/ + ... return_rc=True return_stdout=False + Should Be Equal As Integers ${rc} 0 + +Check if ns8-calnode is removed correctly + ${rc} = Execute Command remove-module --no-preserve ${module_id} + ... return_rc=True return_stdout=False + Should Be Equal As Integers ${rc} 0 diff --git a/packaging/ns8/ui/.browserslistrc b/packaging/ns8/ui/.browserslistrc new file mode 100644 index 00000000..214388fe --- /dev/null +++ b/packaging/ns8/ui/.browserslistrc @@ -0,0 +1,3 @@ +> 1% +last 2 versions +not dead diff --git a/packaging/ns8/ui/.eslintrc.js b/packaging/ns8/ui/.eslintrc.js new file mode 100644 index 00000000..75603c23 --- /dev/null +++ b/packaging/ns8/ui/.eslintrc.js @@ -0,0 +1,14 @@ +module.exports = { + root: true, + env: { + node: true, + }, + extends: ["plugin:vue/essential", "eslint:recommended", "@vue/prettier"], + parserOptions: { + parser: "@babel/eslint-parser", + }, + rules: { + "no-console": "off", + "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", + }, +}; diff --git a/packaging/ns8/ui/.gitignore b/packaging/ns8/ui/.gitignore new file mode 100644 index 00000000..c646e7d9 --- /dev/null +++ b/packaging/ns8/ui/.gitignore @@ -0,0 +1,29 @@ +.DS_Store +node_modules +/dist + + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +# Yarn v4 node-modules rules +.yarn/* +!.yarn/patches +!.yarn/releases +!.yarn/plugins diff --git a/packaging/ns8/ui/.yarnrc.yml b/packaging/ns8/ui/.yarnrc.yml new file mode 100644 index 00000000..063ed601 --- /dev/null +++ b/packaging/ns8/ui/.yarnrc.yml @@ -0,0 +1,8 @@ +approvedGitRepositories: + - "**" + +enableScripts: true + +nodeLinker: node-modules + +npmMinimalAgeGate: 0 diff --git a/packaging/ns8/ui/Containerfile b/packaging/ns8/ui/Containerfile new file mode 100644 index 00000000..dfb079c3 --- /dev/null +++ b/packaging/ns8/ui/Containerfile @@ -0,0 +1,7 @@ +FROM node:24-bookworm +RUN corepack enable \ + && yarn set version stable +WORKDIR /app +ENV NODE_OPTIONS=--openssl-legacy-provider +EXPOSE 8080 +ENTRYPOINT ["./container-entrypoint.sh"] diff --git a/packaging/ns8/ui/README.md b/packaging/ns8/ui/README.md new file mode 100644 index 00000000..8fd3e2f2 --- /dev/null +++ b/packaging/ns8/ui/README.md @@ -0,0 +1,3 @@ +# NS8 calnode UI development + +To develop calnode UI please refer to [this section of the Developer manual](https://nethserver.github.io/ns8-core/ui/modules/#module-ui-development). diff --git a/packaging/ns8/ui/babel.config.js b/packaging/ns8/ui/babel.config.js new file mode 100644 index 00000000..162a3ea9 --- /dev/null +++ b/packaging/ns8/ui/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ["@vue/cli-plugin-babel/preset"], +}; diff --git a/packaging/ns8/ui/container-entrypoint.sh b/packaging/ns8/ui/container-entrypoint.sh new file mode 100644 index 00000000..758d5a05 --- /dev/null +++ b/packaging/ns8/ui/container-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +if [[ -z "$1" ]]; then + echo "Missing parameter: append 'watch' or 'build'" +elif [[ "$1" = "watch" ]]; then + yarn install && yarn watch +elif [[ "$1" == "build" ]]; then + yarn install && yarn build +else + echo "Parameter not recognized: '$1'. Only 'watch' or 'build' are allowed" +fi diff --git a/packaging/ns8/ui/package.json b/packaging/ns8/ui/package.json new file mode 100644 index 00000000..3138661c --- /dev/null +++ b/packaging/ns8/ui/package.json @@ -0,0 +1,46 @@ +{ + "name": "ui", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "watch": "vue-cli-service build --watch", + "format": "prettier --write src/" + }, + "dependencies": { + "@carbon/icons-vue": "^10.37.0", + "@carbon/vue": "^2.40.0", + "@nethserver/ns8-ui-lib": "^2.0.0", + "await-to-js": "^3.0.0", + "axios": "^1.18.1", + "carbon-components": "^10.41.0", + "core-js": "^3.6.5", + "lottie-web-vue": "^1.2.0", + "sass": "^1.34.1", + "vue": "^2.7.0", + "vue-axios": "^3.2.4", + "vue-date-fns": "^2.0.1", + "vue-debounce": "^4.0.0", + "vue-i18n": "^8.24.4", + "vue-loader": "^15.10.0", + "vue-router": "^3.2.0", + "vuex": "^3.4.0" + }, + "devDependencies": { + "@babel/eslint-parser": "^7.11.0", + "@vue/cli-plugin-babel": "~4.5.18", + "@vue/cli-plugin-eslint": "~4.5.18", + "@vue/cli-plugin-router": "~4.5.18", + "@vue/cli-plugin-vuex": "~4.5.18", + "@vue/cli-service": "~4.5.18", + "@vue/eslint-config-prettier": "^6.0.0", + "eslint": "^6.7.2", + "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-vue": "^6.2.2", + "prettier": "^2.2.1", + "sass-loader": "^10.1.1" + }, + "packageManager": "yarn@4.18.0" +} diff --git a/packaging/ns8/ui/public/i18n/ar/translation.json b/packaging/ns8/ui/public/i18n/ar/translation.json new file mode 100644 index 00000000..753d1f1f --- /dev/null +++ b/packaging/ns8/ui/public/i18n/ar/translation.json @@ -0,0 +1,57 @@ +{ + "error": { + "403": "العملية غير مصرح بها", + "401": "مصادقة غير صالحة", + "generic_error": "حدث خطأ", + "error": "خطأ", + "network_timeout": "انتهت مهلة الخادم", + "404": "لم يتم العثور على المصدر", + "network_error": "خطا في الاتصال", + "validation_error": "خطئ في التحقق", + "cannot_retrieve_module_info": "لا يمكن استرداد معلومات الـ module", + "cannot_retrieve_installed_modules": "لا يمكن استرداد الـ moduls المثبتة" + }, + "common": { + "required": "مطلوب", + "work_in_progress": "جاري المعالجة", + "processing": "جاري المعالجة" + }, + "about": { + "title": "معلومات" + }, + "action": { + "list-backup-repositories": "قائمة مستودعات النسخ الاحتياطي", + "list-backups": "قائمة النسخ الاحتياطية", + "get-status": "معلومات الحالة", + "get-configuration": "احصل على التهيئة", + "configure-module": "تهيئة الـmodule", + "get-module-info": "احصل على معلومات الـ module", + "get-name": "احصل على إسم", + "list-installed-modules": "قائمة الـ modules المثبتة" + }, + "task": { + "cannot_create_task": "لا يمكن إنشاء المهمة {action}" + }, + "settings": { + "title": "إعدادات", + "save": "حفظ", + "configure_instance": "تهيئة {instance}", + "test_field": "حقل اختبار" + }, + "status": { + "title": "الحالة", + "app_instance": "تطبيق instance", + "services": "الخدمة | الخدمات", + "app_images": "صورة التطبيق | صور التطبيق", + "app_volumes": "حجم التطبيق | احجام التطبيق", + "mount": "تحميل (تلقيم)", + "no_services": "لا خدمات", + "installation_node": "تثبيت Node", + "node": "Node", + "name": "الاسم", + "size": "الحجم", + "created": "تم الانشاء", + "no_images": "لا يوجد صور", + "no_volumes": "لايوجد احجام" + } +} diff --git a/packaging/ns8/ui/public/i18n/de/translation.json b/packaging/ns8/ui/public/i18n/de/translation.json new file mode 100644 index 00000000..a5b82653 --- /dev/null +++ b/packaging/ns8/ui/public/i18n/de/translation.json @@ -0,0 +1,57 @@ +{ + "error": { + "403": "Vorgang nicht autorisiert", + "cannot_retrieve_installed_modules": "Fehler beim Abruf installierter Module", + "401": "Authentifizierung fehlerhaft", + "cannot_retrieve_module_info": "Fehler beim Abruf der Modul-Info", + "generic_error": "Etwas ist schief gegangen", + "error": "Fehler", + "network_timeout": "Netzwerk-Zeitüberschreitung", + "404": "Ressource nicht gefunden", + "network_error": "Netzwerk-Fehler", + "validation_error": "Fehler bei der Validierung" + }, + "settings": { + "test_field": "Testfeld", + "configure_instance": "{instance} konfigurieren", + "save": "Speichern", + "title": "Einstellungen" + }, + "common": { + "required": "Erforderlich", + "work_in_progress": "In Bearbeitung", + "processing": "Verarbeitung läuft..." + }, + "status": { + "created": "Erstellt", + "size": "Größe", + "name": "Name", + "no_images": "Keine Abbilder", + "app_volumes": "App Volumen | App Volumen", + "services": "Dienst | Dienste", + "app_images": "App Abbild | App Abbilder", + "no_services": "Keine Dienste", + "app_instance": "App Instanz", + "mount": "Mount", + "title": "Status", + "installation_node": "Knoten der Installation", + "node": "Knoten", + "no_volumes": "Keine Volumen" + }, + "about": { + "title": "Über" + }, + "action": { + "list-backup-repositories": "Backup-Speicherorte auflisten", + "get-module-info": "Modul-Info abrufen", + "list-installed-modules": "Installierte Module auflisten", + "list-backups": "Backups auflisten", + "get-status": "Status abrufen", + "configure-module": "Modul konfigurieren", + "get-configuration": "Konfiguration abrufen", + "get-name": "Name abrufen" + }, + "task": { + "cannot_create_task": "Aufgabe {action} kann nicht erstellt werden" + } +} diff --git a/packaging/ns8/ui/public/i18n/en/translation.json b/packaging/ns8/ui/public/i18n/en/translation.json new file mode 100644 index 00000000..87328a18 --- /dev/null +++ b/packaging/ns8/ui/public/i18n/en/translation.json @@ -0,0 +1,60 @@ +{ + "common": { + "required": "Required", + "work_in_progress": "Work in progress", + "processing": "Processing..." + }, + "status": { + "title": "Status", + "app_instance": "App instance", + "services": "Service | Services", + "app_images": "App image | App images", + "app_volumes": "App volume | App volumes", + "installation_node": "Installation node", + "node": "Node", + "name": "Name", + "size": "Size", + "created": "Created", + "mount": "Mount", + "no_services": "No services", + "no_images": "No images", + "no_volumes": "No volumes" + }, + "settings": { + "title": "Settings", + "configure_instance": "Configure {instance}", + "save": "Save", + "host": "Hostname", + "host_helper": "Public address Calnode is reached at, e.g. book.example.com", + "lets_encrypt": "Obtain a Let's Encrypt certificate", + "http2https": "Redirect HTTP to HTTPS" + }, + "about": { + "title": "About" + }, + "task": { + "cannot_create_task": "Cannot create task {action}" + }, + "action": { + "get-status": "Get status", + "get-configuration": "Get configuration", + "configure-module": "Configure module", + "get-module-info": "Get module info", + "get-name": "Get name", + "list-backup-repositories": "List backup repositories", + "list-backups": "List backups", + "list-installed-modules": "List installed modules" + }, + "error": { + "error": "Error", + "generic_error": "Something went wrong", + "validation_error": "Validation error", + "network_error": "Network error", + "network_timeout": "Network timeout", + "401": "Invalid authentication", + "403": "Operation not authorized", + "404": "Resource not found", + "cannot_retrieve_module_info": "Cannot retrieve module info", + "cannot_retrieve_installed_modules": "Cannot retrieve installed modules" + } +} diff --git a/packaging/ns8/ui/public/i18n/es/translation.json b/packaging/ns8/ui/public/i18n/es/translation.json new file mode 100644 index 00000000..da1961e4 --- /dev/null +++ b/packaging/ns8/ui/public/i18n/es/translation.json @@ -0,0 +1,57 @@ +{ + "error": { + "403": "Operación no autorizada", + "cannot_retrieve_installed_modules": "No se pueden recuperar los módulos instalados", + "401": "Autentificación inválida", + "cannot_retrieve_module_info": "No se puede recuperar la información del módulo", + "generic_error": "Algo ha salido mal", + "error": "Error", + "network_timeout": "Tiempo de espera de la red agotado", + "404": "Recurso no encontrado", + "network_error": "Error en la red", + "validation_error": "Error en la validación" + }, + "settings": { + "test_field": "Campo de prueba", + "configure_instance": "Configurar {instance}", + "save": "Guardar", + "title": "Ajustes" + }, + "common": { + "required": "Obligatorio", + "work_in_progress": "Trabajando", + "processing": "Procesando..." + }, + "status": { + "created": "Creado", + "size": "Tamaño", + "name": "Nombre", + "no_images": "Sin imágenes", + "app_volumes": "Volumen de la aplicación| Volumen de las aplicaciones", + "services": "Servicio | Servicios", + "app_images": "Imagen de la aplicación| Imágenes de las aplicaciones", + "no_services": "Sin servicios", + "app_instance": "Instancia de la aplicación", + "mount": "Montar", + "title": "Estado", + "installation_node": "Nodo de la instalación", + "node": "Nodo", + "no_volumes": "Sin volumenes" + }, + "about": { + "title": "Acerca de" + }, + "action": { + "list-backup-repositories": "Mostrar repositorios de respaldo", + "get-module-info": "Obtener información del módulo", + "list-installed-modules": "Lista de módulos instalados", + "list-backups": "Mostrar copias de seguridad", + "get-status": "Obtener el estado", + "configure-module": "Configurar el módulo", + "get-configuration": "Obtener los ajustes", + "get-name": "Obtener el nombre" + }, + "task": { + "cannot_create_task": "No se puede crear la tarea {action}" + } +} diff --git a/packaging/ns8/ui/public/i18n/eu/translation.json b/packaging/ns8/ui/public/i18n/eu/translation.json new file mode 100644 index 00000000..38649d94 --- /dev/null +++ b/packaging/ns8/ui/public/i18n/eu/translation.json @@ -0,0 +1,57 @@ +{ + "error": { + "403": "Operation not authorized", + "cannot_retrieve_installed_modules": "Cannot retrieve installed modules", + "401": "Invalid authentication", + "cannot_retrieve_module_info": "Cannot retrieve module info", + "generic_error": "Something went wrong", + "error": "Error", + "network_timeout": "Network timeout", + "404": "Resource not found", + "network_error": "Network error", + "validation_error": "Validation error" + }, + "settings": { + "test_field": "Proba-eremua", + "configure_instance": "Configure {instance}", + "save": "Save", + "title": "Settings" + }, + "common": { + "required": "Beharrezkoa", + "work_in_progress": "Work in progress", + "processing": "Processing..." + }, + "status": { + "created": "Created", + "size": "Size", + "name": "Name", + "no_images": "No images", + "app_volumes": "App volume | App volumes", + "services": "Service | Services", + "app_images": "App image | App images", + "no_services": "No services", + "app_instance": "App instance", + "mount": "Mount", + "title": "Status", + "installation_node": "Installation node", + "node": "Node", + "no_volumes": "No volumes" + }, + "about": { + "title": "Honi buruz" + }, + "action": { + "list-backup-repositories": "List backup repositories", + "get-module-info": "Get module info", + "list-installed-modules": "List installed modules", + "list-backups": "List backups", + "get-status": "Get status", + "configure-module": "Configure module", + "get-configuration": "Get configuration", + "get-name": "Get name" + }, + "task": { + "cannot_create_task": "Cannot create task {action}" + } +} diff --git a/packaging/ns8/ui/public/i18n/it/translation.json b/packaging/ns8/ui/public/i18n/it/translation.json new file mode 100644 index 00000000..5e1952c3 --- /dev/null +++ b/packaging/ns8/ui/public/i18n/it/translation.json @@ -0,0 +1,57 @@ +{ + "common": { + "required": "Obbligatorio", + "processing": "In elaborazione…", + "work_in_progress": "In lavorazione" + }, + "status": { + "node": "Nodo", + "services": "Servizio | Servizi", + "no_volumes": "Nessun volume", + "title": "Stato", + "name": "Nome", + "size": "Dimensione", + "created": "Creato", + "no_services": "Nessun servizio", + "no_images": "Nessuna immagine", + "app_images": "Immagine app|Immagini app", + "app_instance": "Istanza app", + "app_volumes": "Volume app|Volumi app", + "installation_node": "Nodo di installazione", + "mount": "Percorso di mount" + }, + "settings": { + "save": "Salva", + "title": "Impostazioni", + "configure_instance": "Configura {instance}", + "test_field": "Campo di test" + }, + "error": { + "error": "Errore", + "404": "Risorsa non trovata", + "validation_error": "Errore di validazione", + "network_error": "Errore di rete", + "cannot_retrieve_installed_modules": "Impossibile elencare moduli installati", + "cannot_retrieve_module_info": "Impossibile recuperare info modulo", + "network_timeout": "Timeout di rete", + "generic_error": "Qualcosa è andato storto", + "401": "Autenticazione non valida", + "403": "Operazione non autorizzata" + }, + "action": { + "configure-module": "Configura modulo", + "get-configuration": "Visualizza configurazione", + "get-status": "Visualizza stato", + "get-module-info": "Visualizza info modulo", + "get-name": "Visualizza nome", + "list-backup-repositories": "Elenca repository di backup", + "list-backups": "Elenca backup", + "list-installed-modules": "Elenca moduli installati" + }, + "task": { + "cannot_create_task": "Impossibile eseguire il task {action}" + }, + "about": { + "title": "Informazioni" + } +} diff --git a/packaging/ns8/ui/public/i18n/pt/translation.json b/packaging/ns8/ui/public/i18n/pt/translation.json new file mode 100644 index 00000000..4ca6726a --- /dev/null +++ b/packaging/ns8/ui/public/i18n/pt/translation.json @@ -0,0 +1,57 @@ +{ + "error": { + "403": "Operation not authorized", + "cannot_retrieve_installed_modules": "Cannot retrieve installed modules", + "401": "Invalid authentication", + "cannot_retrieve_module_info": "Cannot retrieve module info", + "generic_error": "Something went wrong", + "error": "Error", + "network_timeout": "Network timeout", + "404": "Resource not found", + "network_error": "Network error", + "validation_error": "Validation error" + }, + "settings": { + "test_field": "Campo de teste", + "configure_instance": "Configure {instance}", + "save": "Save", + "title": "Settings" + }, + "common": { + "required": "Required", + "work_in_progress": "Work in progress", + "processing": "Processing..." + }, + "status": { + "created": "Created", + "size": "Size", + "name": "Name", + "no_images": "No images", + "app_volumes": "App volume | App volumes", + "services": "Service | Services", + "app_images": "App image | App images", + "no_services": "No services", + "app_instance": "App instance", + "mount": "Mount", + "title": "Status", + "installation_node": "Installation node", + "node": "Node", + "no_volumes": "No volumes" + }, + "about": { + "title": "About" + }, + "action": { + "list-backup-repositories": "List backup repositories", + "get-module-info": "Get module info", + "list-installed-modules": "List installed modules", + "list-backups": "List backups", + "get-status": "Get status", + "configure-module": "Configure module", + "get-configuration": "Get configuration", + "get-name": "Get name" + }, + "task": { + "cannot_create_task": "Cannot create task {action}" + } +} diff --git a/packaging/ns8/ui/public/i18n/pt_BR/translation.json b/packaging/ns8/ui/public/i18n/pt_BR/translation.json new file mode 100644 index 00000000..bcdcb52c --- /dev/null +++ b/packaging/ns8/ui/public/i18n/pt_BR/translation.json @@ -0,0 +1,57 @@ +{ + "common": { + "required": "Required", + "work_in_progress": "Work in progress", + "processing": "Processing..." + }, + "status": { + "services": "Service | Services", + "app_instance": "App instance", + "title": "Status", + "created": "Created", + "size": "Size", + "name": "Name", + "no_images": "No images", + "app_volumes": "App volume | App volumes", + "app_images": "App image | App images", + "no_services": "No services", + "mount": "Mount", + "installation_node": "Installation node", + "node": "Node", + "no_volumes": "No volumes" + }, + "error": { + "403": "Operation not authorized", + "401": "Invalid authentication", + "generic_error": "Something went wrong", + "error": "Error", + "network_timeout": "Network timeout", + "404": "Resource not found", + "network_error": "Network error", + "validation_error": "Validation error", + "cannot_retrieve_installed_modules": "Cannot retrieve installed modules", + "cannot_retrieve_module_info": "Cannot retrieve module info" + }, + "about": { + "title": "About" + }, + "action": { + "list-backup-repositories": "List backup repositories", + "list-backups": "List backups", + "get-module-info": "Get module info", + "list-installed-modules": "List installed modules", + "get-status": "Get status", + "configure-module": "Configure module", + "get-configuration": "Get configuration", + "get-name": "Get name" + }, + "task": { + "cannot_create_task": "Cannot create task {action}" + }, + "settings": { + "title": "Settings", + "configure_instance": "Configure {instance}", + "save": "Save", + "test_field": "Test field" + } +} diff --git a/packaging/ns8/ui/public/i18n/ta/translation.json b/packaging/ns8/ui/public/i18n/ta/translation.json new file mode 100644 index 00000000..107113d4 --- /dev/null +++ b/packaging/ns8/ui/public/i18n/ta/translation.json @@ -0,0 +1,51 @@ +{ + "error": { + "network_timeout": "பிணையம் நேரம் முடிந்தது", + "403": "செயல்பாடு அங்கீகரிக்கப்படவில்லை", + "cannot_retrieve_installed_modules": "நிறுவப்பட்ட தொகுதிகளை மீட்டெடுக்க முடியாது", + "401": "தவறான ஏற்பு", + "cannot_retrieve_module_info": "தொகுதி தகவலை மீட்டெடுக்க முடியாது", + "generic_error": "ஏதோ தவறு நடந்தது", + "error": "பிழை", + "404": "சான்று கிடைக்கவில்லை", + "network_error": "பிணைய பிழை", + "validation_error": "சரிபார்ப்பு பிழை" + }, + "common": { + "required": "தேவை", + "work_in_progress": "வேலை முன்னேற்றத்தில் உள்ளது" + }, + "status": { + "created": "உருவாக்கப்பட்டது", + "size": "அளவு", + "name": "பெயர்", + "no_images": "படங்கள் இல்லை", + "app_volumes": "பயன்பாட்டு தொகுதி | பயன்பாட்டு தொகுதிகள்", + "services": "பணி | சேவைகள்", + "app_images": "பயன்பாட்டு படம் | பயன்பாட்டு படங்கள்", + "no_services": "சேவைகள் இல்லை", + "app_instance": "பயன்பாட்டு நிகழ்வு", + "mount": "மவுண்ட்", + "title": "நிலை", + "installation_node": "நிறுவல் முனை", + "node": "கணு", + "no_volumes": "தொகுதிகள் இல்லை" + }, + "about": { + "title": "பற்றி" + }, + "action": { + "get-module-info": "தொகுதி தகவலைப் பெறுங்கள்", + "get-status": "அந்தச்தைப் பெறுங்கள்", + "configure-module": "தொகுதியை உள்ளமைக்கவும்", + "get-configuration": "உள்ளமைவைப் பெறுங்கள்", + "get-name": "பெயரைப் பெறுங்கள்" + }, + "task": { + "cannot_create_task": "பணியை உருவாக்க முடியாது {action}" + }, + "settings": { + "save": "சேமி", + "title": "அமைப்புகள்" + } +} diff --git a/packaging/ns8/ui/public/i18n/uk/translation.json b/packaging/ns8/ui/public/i18n/uk/translation.json new file mode 100644 index 00000000..3b7f2f23 --- /dev/null +++ b/packaging/ns8/ui/public/i18n/uk/translation.json @@ -0,0 +1,5 @@ +{ + "settings": { + "test_field": "Тестове поле" + } +} diff --git a/packaging/ns8/ui/public/index.html b/packaging/ns8/ui/public/index.html new file mode 100644 index 00000000..6e37fe83 --- /dev/null +++ b/packaging/ns8/ui/public/index.html @@ -0,0 +1,61 @@ + + + + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + +
    + +
    + + + diff --git a/packaging/ns8/ui/public/metadata.json b/packaging/ns8/ui/public/metadata.json new file mode 100644 index 00000000..78f075ce --- /dev/null +++ b/packaging/ns8/ui/public/metadata.json @@ -0,0 +1,19 @@ +{ + "name": "ns8-calnode", + "description": { + "en": "Calnode scheduling and booking platform" + }, + "categories": ["productivity"], + "authors": [ + { + "name": "Calnode", + "email": "hello@calnode.com" + } + ], + "docs": { + "documentation_url": "https://github.com/calnode/calnode", + "bug_url": "https://github.com/calnode/calnode/issues", + "code_url": "https://github.com/calnode/ns8-calnode" + }, + "source": "ghcr.io/calnode/ns8-calnode" +} diff --git a/packaging/ns8/ui/public/shortcuts.json b/packaging/ns8/ui/public/shortcuts.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/packaging/ns8/ui/public/shortcuts.json @@ -0,0 +1 @@ +[] diff --git a/packaging/ns8/ui/src/App.vue b/packaging/ns8/ui/src/App.vue new file mode 100644 index 00000000..9743a306 --- /dev/null +++ b/packaging/ns8/ui/src/App.vue @@ -0,0 +1,125 @@ + + + + + + diff --git a/packaging/ns8/ui/src/assets/module_default_logo.png b/packaging/ns8/ui/src/assets/module_default_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..29e55971a9003a4b75562b5a33063a07dbceda00 GIT binary patch literal 4199 zcmV-t5SZ_YP)w)+=l4jes&cC#g~EBj zbYO=5ng-+pc|h*4zX0t($FRR`z*(S9f7Pps+%E1{h(Q|b0+2%C9H0tV2`of&c)3l* zHKK{(C{P2`s*2oYQ&~b7a{`b;VLvw2S%}Es%*bls-D)MosjTuf_2|x;kmjcfKYn`^mCf);HRu%b((}oO^76On$ z;Z?x%z*47e5yTPT1yzv`Ic0BkV0V}@Hns) z2nshKz34={53i|;JRrJo;R29C;VR&DV3yE=)1OnoqpBj;iY!!^0HjdZ3%mq8$=L7N z+l2~j2cAwx}XBVj+ec9w=zq0Uyew;8sHfljB#;>QGGdLA3)!qf6PvcT!gb=r2GWFQ9k^% z&Bi25QKp9#WmzmM4N#utr6|+O#7qzQeh*y(D$S87Es+?_ktj!-BUE4PA>3)-Udz9$ z46^AAvTVIS1F8A__GadZqLO0R$5rYcI!_(D_ z)Cbst!_F`8d)PXsfb-v&%(lA=n3sg}0jA|<@ZFht)PKE#olAqWl^`Wg6HStQ{cB|>!MGRP^JYry`h3< zzML;i-M3|Xd1-C|r#4h@@1!h2rN$+`0Q6LBjzsrLXw~ZbYsx4NB($V$8jl43Jg-mw-@JG28AgKtyf1VRAOd*4;)~ zmOVlnjene;%bsN=_?=aOGW0*!1)zr)I}+si%H0J#Tq$=0=F}W^ zFDn*W<}m(tXejy68lVaXGH`xpdM;1S$`@TM0QXGH*6J z6bHOi27P?BG(ctoPxU4_$Oo5ud857~Av+E=_Hd}N2LP`GE6TEXNX}tPWzbX=zhglm z)r~!T-X%OQ6llJ#fg$q%QYidCz*j_Cv42G=_fO6?_1U(*7%zX+##`Y|E_RQeJ}2n& zu)ZRT7v~mmN1nN1Ut>>{+u!+|?t#(%2-u|qMZ+&nj zA?E``qAJgwXyu7xEv7#IgIN>E_F2;*?1`#uIDDC21JB-;?PXQDBl80p=>32}0SImX zC-^-qFAErc?vGddc=$+DN>9iSKWXRRJ~ck*qrmTBd8u{IXzGpfU!Qjyer}P8rotvx z!VLi|6j}1>@+^Fk@zeI?AFeWBLH>f5PPWlGVBAw*dz-aSDq&T>7mJ>>AKToN7V*q07&dSmj_%E zS@P-oE4a&GVP@IEMvh$RwXDnueh(KPoMPC{7rlL+tC7UU_3T8K(hW(XHRNx);c9DBCI*ip&wXA{>Qj{=w`vc#fH;~Q*ODAySi zH9(<3?R1MV&4YHLrZCK`gc?ntB#W8rnst9wNq}!o&7oZIlCs6*`?zs@s!IY?l?1NG z1fJ^{;K-F;YW3Hr*X(J+Y#`5vc80D?3RLF$sLT!W$TTgcp*a%e{fj;9Z|LUW#U48P z({?0~>(&4^Ffr51W;w`aIY=a`a_EvKhF^v|Em?82kUS4=4PYyoUWs*+via%aiPUeL z%p=o+PR9ifCD(&n0|;YMwwHfjQq1wcnZyF;7J-J6H?GD!>B781KZn+ovDhG9Km;DZ zc$LJ(a&j{~99&(-UpcoL2+-~U5(|bK!$egrP$b^VY#*(oKSrwExx5SyKUq}dheHRPjgjCfX$UberY0hzy{iVjH4RB zYFhhZynCUWcQ0s>Kjm3o)=kRhyEF5cU0_}e-=5}}06N@0fQ2;nMEUud4(7c37gkqa z;=?9$OWMmy1LS5n(jRa40M>-Uy4=K}#vWExH&S!SII79-kyujV$cUiL1DtiD7qGjA|%Y}&~Sj;O@w}5>=wRBv{6;$_Q85*Tr>k`ItC1P87(OeFeiaAycw3381I5Q zXJbaQQK*9(5l}}(m+l1Z{V}R9#vhh>BzSG1btmE!2fRFXXZ#iSa~%VGWO1`&f}?Ol z05zgZcZ#>d#xrhTEe-JE+%KkpOO&9`!|tWU1PwZPdmF5oo=%V&xFLXAv@OH8JnuAg zo7#!<-0XaIEGSAk#oO!xKZnz>g_W^sH zu*fM|`(mtm{}Q3I;@09%TO31ZSX@L!c4FF8oG$2&!GXkhQE>42S%g|0k6cI z0zai$UJCr$DJA)Ow(+*U7;SwqTKi&L?ul};wa=F178Wq#ff1vf8MF`hx*)?`#PE)) z$X_@zX0%D_S8O)MMLZ+=bVLE@r%SzOt2r(rd2gf>!ytY_jF)XP#zj1%`f^kOsET|9 zIAV)AE+RRi`*K8#A`xG(*ccb_#PwlZ0qCbr@3qt%7m@6ZcXBwGON#Xb;K;@`mz3y4 z^IcpF1)wVO1z@WM2Dyl3tM0qFnB9%=8gME#dt3x^3e9JRm=b`h$OFKmkaA807yD6x zM|GbWVtPN4s>rp#_GGPc5yp1iSEfjGL)vo;i6(JLJ8IE>!@FpkpAI7mIP#tP?yMFId& z6}bWJK;jWYk6bL_INFonVATaJO--e%as^uF#Kl^w(b{}Vp8P>9&rPOxO4j2J5v^no zT5sR-xC~p8)9J&K&A`9l&KRbGigph-r!v%whb5zcxCMm5>wpmM+CieUpiS>4HN$5X z+XVpE7m#+NbrM~SsRcGAGq;~8Lh_U9KV&(u4Yx^%hl+NOmWyyc2&w^YDlinT0$vAZ z2`xDNIfWLy>>9`_E=@i3t%LqP&f~*&oD!OO#||Q xJRo=2U(ilZ?HKmA4ed + + + + + diff --git a/packaging/ns8/ui/src/components/AppSideMenu.vue b/packaging/ns8/ui/src/components/AppSideMenu.vue new file mode 100644 index 00000000..305c152e --- /dev/null +++ b/packaging/ns8/ui/src/components/AppSideMenu.vue @@ -0,0 +1,18 @@ + + + + diff --git a/packaging/ns8/ui/src/components/AppSideMenuContent.vue b/packaging/ns8/ui/src/components/AppSideMenuContent.vue new file mode 100644 index 00000000..b6f20ff9 --- /dev/null +++ b/packaging/ns8/ui/src/components/AppSideMenuContent.vue @@ -0,0 +1,91 @@ + + + + + + diff --git a/packaging/ns8/ui/src/i18n/index.js b/packaging/ns8/ui/src/i18n/index.js new file mode 100644 index 00000000..e86c7877 --- /dev/null +++ b/packaging/ns8/ui/src/i18n/index.js @@ -0,0 +1,18 @@ +export async function loadLanguage(lang) { + try { + const messages = await import( + /* webpackChunkName: "lang-[request]" */ `../../public/i18n/${lang}/translation.json` + ); + return messages; + } catch (error) { + console.warn( + `Cannot import ${lang} language messages, falling back to English.`, + error + ); + + // fallback to english + if (lang !== "en") { + return loadLanguage("en"); + } + } +} diff --git a/packaging/ns8/ui/src/main.js b/packaging/ns8/ui/src/main.js new file mode 100644 index 00000000..e6e17f1b --- /dev/null +++ b/packaging/ns8/ui/src/main.js @@ -0,0 +1,58 @@ +// +// Copyright (C) 2023 Nethesis S.r.l. +// SPDX-License-Identifier: GPL-3.0-or-later +// +import Vue from "vue"; +import App from "./App.vue"; +import router from "./router"; +import store from "./store"; + +import CarbonComponentsVue from "@carbon/vue"; +Vue.use(CarbonComponentsVue); + +import axios from "axios"; +axios.defaults.timeout = 10000; +import VueAxios from "vue-axios"; +Vue.use(VueAxios, axios); + +import ns8Lib from "@nethserver/ns8-ui-lib"; +Vue.use(ns8Lib); + +import VueDateFns from "vue-date-fns"; +Vue.use(VueDateFns); + +import LottieAnimation from "lottie-web-vue"; +Vue.use(LottieAnimation); + +import vueDebounce from "vue-debounce"; +Vue.use(vueDebounce); + +// filters +import { Filters } from "@nethserver/ns8-ui-lib"; +for (const f in Filters) { + Vue.filter(f, Filters[f]); +} + +Vue.config.productionTip = false; + +// i18n +import VueI18n from "vue-i18n"; +import { loadLanguage } from "./i18n"; + +loadI18n(); + +async function loadI18n() { + const navigatorLang = navigator.language.substring(0, 2); + const messages = await loadLanguage(navigatorLang); + Vue.use(VueI18n); + const i18n = new VueI18n(); + i18n.setLocaleMessage(navigatorLang, messages.default); + i18n.locale = navigatorLang; + + new Vue({ + router, + store, + i18n, + render: (h) => h(App), + }).$mount("#ns8-app"); +} diff --git a/packaging/ns8/ui/src/router/index.js b/packaging/ns8/ui/src/router/index.js new file mode 100644 index 00000000..e1551e50 --- /dev/null +++ b/packaging/ns8/ui/src/router/index.js @@ -0,0 +1,40 @@ +// +// Copyright (C) 2023 Nethesis S.r.l. +// SPDX-License-Identifier: GPL-3.0-or-later +// +import Vue from "vue"; +import VueRouter from "vue-router"; +import Status from "../views/Status.vue"; +import Settings from "../views/Settings.vue"; + +Vue.use(VueRouter); + +const routes = [ + { + path: "/", + name: "Status", + component: Status, + alias: "/status", // important + }, + { + path: "/settings", + name: "Settings", + component: Settings, + }, + { + path: "/about", + name: "About", + // route level code-splitting + // this generates a separate chunk (about.[hash].js) for this route + // which is lazy-loaded when the route is visited. + component: () => + import(/* webpackChunkName: "about" */ "../views/About.vue"), + }, +]; + +const router = new VueRouter({ + base: process.env.BASE_URL, + routes, +}); + +export default router; diff --git a/packaging/ns8/ui/src/store/index.js b/packaging/ns8/ui/src/store/index.js new file mode 100644 index 00000000..2c2478b7 --- /dev/null +++ b/packaging/ns8/ui/src/store/index.js @@ -0,0 +1,46 @@ +// +// Copyright (C) 2023 Nethesis S.r.l. +// SPDX-License-Identifier: GPL-3.0-or-later +// +import Vue from "vue"; +import Vuex from "vuex"; + +Vue.use(Vuex); + +export default new Vuex.Store({ + state: { + appName: "", + instanceName: "", + instanceLabel: "", + core: null, + }, + mutations: { + setInstanceName(state, instanceName) { + state.instanceName = instanceName; + }, + setInstanceLabel(state, instanceLabel) { + state.instanceLabel = instanceLabel; + }, + setCore(state, core) { + state.core = core; + }, + setAppName(state, appName) { + state.appName = appName; + }, + }, + actions: { + setInstanceNameInStore(context, instanceName) { + context.commit("setInstanceName", instanceName); + }, + setInstanceLabelInStore(context, instanceLabel) { + context.commit("setInstanceLabel", instanceLabel); + }, + setCoreInStore(context, core) { + context.commit("setCore", core); + }, + setAppNameInStore(context, appName) { + context.commit("setAppName", appName); + }, + }, + modules: {}, +}); diff --git a/packaging/ns8/ui/src/styles/_carbon-utils.scss b/packaging/ns8/ui/src/styles/_carbon-utils.scss new file mode 100644 index 00000000..75d81b6a --- /dev/null +++ b/packaging/ns8/ui/src/styles/_carbon-utils.scss @@ -0,0 +1,15 @@ +@import "~carbon-components/scss/globals/scss/vendor/@carbon/type/scss/font-family.scss"; +@import "~carbon-components/scss/globals/scss/vendor/@carbon/layout/scss/breakpoint.scss"; +@import "~carbon-components/scss/globals/scss/typography.scss"; +@import "~carbon-components/scss/globals/scss/vars.scss"; + +$breakpoint-x-large: 1311px; +$breakpoint-large: 1055px; +$breakpoint-medium: 671px; +$breakpoint-small: 319px; +$notification-drawer-width: 27rem; +$notification-drawer-width-small-screen: 16rem; +$app-drawer-width: 27rem; +$app-drawer-width-small-screen: 16rem; +$side-menu-width: 16rem; +$side-menu-collapsed-width: 3rem; diff --git a/packaging/ns8/ui/src/views/About.vue b/packaging/ns8/ui/src/views/About.vue new file mode 100644 index 00000000..9f6f2f66 --- /dev/null +++ b/packaging/ns8/ui/src/views/About.vue @@ -0,0 +1,348 @@ + + + + + + + + diff --git a/packaging/ns8/ui/src/views/Settings.vue b/packaging/ns8/ui/src/views/Settings.vue new file mode 100644 index 00000000..30a32350 --- /dev/null +++ b/packaging/ns8/ui/src/views/Settings.vue @@ -0,0 +1,284 @@ + + + + + + diff --git a/packaging/ns8/ui/src/views/Status.vue b/packaging/ns8/ui/src/views/Status.vue new file mode 100644 index 00000000..a0dc3131 --- /dev/null +++ b/packaging/ns8/ui/src/views/Status.vue @@ -0,0 +1,519 @@ + + + + + + diff --git a/packaging/ns8/ui/vue.config.js b/packaging/ns8/ui/vue.config.js new file mode 100644 index 00000000..2e65436c --- /dev/null +++ b/packaging/ns8/ui/vue.config.js @@ -0,0 +1,40 @@ +module.exports = { + publicPath: "./", + // added to fix the build of https://github.com/NethServer/ns8-calnode/pull/114 + transpileDependencies: ["axios"], + configureWebpack: { + optimization: { + splitChunks: { + // Cap chunk size so the single vendor bundle is split into a few + // cache-friendly chunks (not one ~2 MiB blob, not dozens of tiny files) + maxSize: 500000, + }, + }, + }, + chainWebpack: (config) => { + config.module + .rule("images") + .use("url-loader") + .loader("url-loader") + .tap((options) => { + // Do not base64 encode images URLs. Needed to always generate module logo image + options.limit = -1; + return options; + }); + }, + css: { + loaderOptions: { + sass: { + sassOptions: { + silenceDeprecations: [ + "import", + "global-builtin", + "color-functions", + "if-function", + "legacy-js-api", + ], + }, + }, + }, + }, +}; diff --git a/packaging/ns8/ui/yarn.lock b/packaging/ns8/ui/yarn.lock new file mode 100644 index 00000000..ad5cc758 --- /dev/null +++ b/packaging/ns8/ui/yarn.lock @@ -0,0 +1,12593 @@ +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! + +__metadata: + version: 10 + cacheKey: 10c0 + +"@achrinza/node-ipc@npm:9.2.2": + version: 9.2.2 + resolution: "@achrinza/node-ipc@npm:9.2.2" + dependencies: + "@node-ipc/js-queue": "npm:2.0.3" + event-pubsub: "npm:4.3.0" + js-message: "npm:1.0.7" + checksum: 10c0/f98ba359a1aabf7ebdf8d68a1b8cc68e10376b7a196638c700bd87f48591e6d71313ac7463642b249b2d36219d28ae278888d10f345e6afb3f21cec9b29bd5b1 + languageName: node + linkType: hard + +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.27.1, @babel/code-frame@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/code-frame@npm:7.29.7" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.29.7" + js-tokens: "npm:^4.0.0" + picocolors: "npm:^1.1.1" + checksum: 10c0/169fc2080169a40c1760155eaaaf739bcb882df0bec76a83adbda5493645bc17270a3434b8848c494b1933e96fe1d147370001e3cda09a39f43ae30f08ef2069 + languageName: node + linkType: hard + +"@babel/compat-data@npm:^7.28.6, @babel/compat-data@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/compat-data@npm:7.29.7" + checksum: 10c0/47913f05e08a45a1c9df38c02b4b49e391005085b489432647a1abe112e5d9c75e3be8ea5972b7f6da4ec5d1339922ceb9ea02b8a25d4ed1cb8636e5261f344e + languageName: node + linkType: hard + +"@babel/core@npm:^7.11.0": + version: 7.29.7 + resolution: "@babel/core@npm:7.29.7" + dependencies: + "@babel/code-frame": "npm:^7.29.7" + "@babel/generator": "npm:^7.29.7" + "@babel/helper-compilation-targets": "npm:^7.29.7" + "@babel/helper-module-transforms": "npm:^7.29.7" + "@babel/helpers": "npm:^7.29.7" + "@babel/parser": "npm:^7.29.7" + "@babel/template": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + "@jridgewell/remapping": "npm:^2.3.5" + convert-source-map: "npm:^2.0.0" + debug: "npm:^4.1.0" + gensync: "npm:^1.0.0-beta.2" + json5: "npm:^2.2.3" + semver: "npm:^6.3.1" + checksum: 10c0/112fb09c24de7a1de64d1de2c31fe65c4e6af4cb2fb6e6d99ea5373e6fc51e75b88581c0efae4c4c68f119a02a988c7106e95011a41530a2fb8ed793c7eaa07b + languageName: node + linkType: hard + +"@babel/eslint-parser@npm:^7.11.0": + version: 7.29.9 + resolution: "@babel/eslint-parser@npm:7.29.9" + dependencies: + "@nicolo-ribaudo/eslint-scope-5-internals": "npm:5.1.1-v1" + eslint-visitor-keys: "npm:^2.1.0" + semver: "npm:^6.3.1" + peerDependencies: + "@babel/core": ^7.11.0 + eslint: ^7.5.0 || ^8.0.0 || ^9.0.0 + checksum: 10c0/f97d9eb23ad53e9263235e9efe204908494922fb89a4cf623e174d7e62a112c52850990cc19b9ef5043af6e2ca87b1772f998175571ac8cb9967689d6e036bd8 + languageName: node + linkType: hard + +"@babel/generator@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/generator@npm:7.29.7" + dependencies: + "@babel/parser": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + "@jridgewell/gen-mapping": "npm:^0.3.12" + "@jridgewell/trace-mapping": "npm:^0.3.28" + jsesc: "npm:^3.0.2" + checksum: 10c0/9bf72b01b5bd0ea5b1288a0e37dbd360bff2f2b1ce73342c0d40fb3db2ec3dc004ada5ffa925c5e12939a416eed59e600d562b8ecd938ce0d27dfd0eb6c6c2b7 + languageName: node + linkType: hard + +"@babel/helper-annotate-as-pure@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-annotate-as-pure@npm:7.29.7" + dependencies: + "@babel/types": "npm:^7.29.7" + checksum: 10c0/c56536b52d17632d89d49db2063ed6102f0e3bbadf6a0ccb74e6599d6a77173b644c7fe8c3ef17c7a162709d55b75ee5145ef6db917d16ba7f375fbffcf2e942 + languageName: node + linkType: hard + +"@babel/helper-compilation-targets@npm:^7.28.6, @babel/helper-compilation-targets@npm:^7.29.7, @babel/helper-compilation-targets@npm:^7.9.6": + version: 7.29.7 + resolution: "@babel/helper-compilation-targets@npm:7.29.7" + dependencies: + "@babel/compat-data": "npm:^7.29.7" + "@babel/helper-validator-option": "npm:^7.29.7" + browserslist: "npm:^4.24.0" + lru-cache: "npm:^5.1.1" + semver: "npm:^6.3.1" + checksum: 10c0/4c15fd4c69a0a7047799a28a88460c19cede0a0ee8af994ea169114986f4af48b92c7393a4a3fee0456c11a656eece3448a6ed06354453d6c27cccf17195453b + languageName: node + linkType: hard + +"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-create-class-features-plugin@npm:7.29.7" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.29.7" + "@babel/helper-member-expression-to-functions": "npm:^7.29.7" + "@babel/helper-optimise-call-expression": "npm:^7.29.7" + "@babel/helper-replace-supers": "npm:^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + semver: "npm:^6.3.1" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/75f34905b5e708b473f1e9b33e07b2fcc8f4c60676df8bc74541bb91c77f387c32a948dd04d5071e469ba454d72d0a872e3ace40fbb1d1e7aaa8569efcf09ed4 + languageName: node + linkType: hard + +"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-create-regexp-features-plugin@npm:7.29.7" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.29.7" + regexpu-core: "npm:^6.3.1" + semver: "npm:^6.3.1" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/c9008c5aafe3b4707964394179cefcb1624d3917b911f308b49719ab8861bc403d82a8f5e046906a18de7082ca393ebae335218c74f52c3fcd81e442c4ae0ce8 + languageName: node + linkType: hard + +"@babel/helper-define-polyfill-provider@npm:^0.6.5, @babel/helper-define-polyfill-provider@npm:^0.6.8": + version: 0.6.8 + resolution: "@babel/helper-define-polyfill-provider@npm:0.6.8" + dependencies: + "@babel/helper-compilation-targets": "npm:^7.28.6" + "@babel/helper-plugin-utils": "npm:^7.28.6" + debug: "npm:^4.4.3" + lodash.debounce: "npm:^4.0.8" + resolve: "npm:^1.22.11" + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 10c0/306a169f2cb285f368578219ef18ea9702860d3d02d64334f8d45ea38648be0b9e1edad8c8f732fa34bb4206ccbb9883c395570fd57ab7bbcf293bc5964c5b3a + languageName: node + linkType: hard + +"@babel/helper-globals@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-globals@npm:7.29.7" + checksum: 10c0/f38417c40b1129a1b2b519ca961b9040c8827d1444fd74068702286b91b77089431dc76b6b9d5c1496e5da2a4f3ad329c6946e688ba3fa0d1d0b3d2b4f34f36a + languageName: node + linkType: hard + +"@babel/helper-member-expression-to-functions@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-member-expression-to-functions@npm:7.29.7" + dependencies: + "@babel/traverse": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + checksum: 10c0/eef7940ce0797208854a5af1049a98fee9abbffb5c619640c69ff5a555f8e3552295bb18756490b02bc6af7df8c1babcb83f12203aac2deb9dfecfc78846e12d + languageName: node + linkType: hard + +"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.27.1, @babel/helper-module-imports@npm:^7.29.7, @babel/helper-module-imports@npm:^7.8.3": + version: 7.29.7 + resolution: "@babel/helper-module-imports@npm:7.29.7" + dependencies: + "@babel/traverse": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + checksum: 10c0/6adf60d97356027413342a092f818d9678c4f5caff716a33e3284b5ae14e47a9e88059d421dde4ee4894691260039a12602c0e7becadc175602194b40dfa345d + languageName: node + linkType: hard + +"@babel/helper-module-transforms@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-module-transforms@npm:7.29.7" + dependencies: + "@babel/helper-module-imports": "npm:^7.29.7" + "@babel/helper-validator-identifier": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/ee5a2172c24a42be696836f4b0d947489c9729d8adf5821885cf77d1ad5333e3c447368e9a71f67df1099570490553dccf9f888ef0a92a48aa63cb086bd8c7e1 + languageName: node + linkType: hard + +"@babel/helper-optimise-call-expression@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-optimise-call-expression@npm:7.29.7" + dependencies: + "@babel/types": "npm:^7.29.7" + checksum: 10c0/fd0244b9bfbb487db02d59aa2703c6991d654ea5f3f39d912682842bdca2e87b5ae8643b0ce8069bf5fbee39d1aa9db7abefeb5e6ba1aa650dca12777cf5b7e2 + languageName: node + linkType: hard + +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.27.1, @babel/helper-plugin-utils@npm:^7.28.6, @babel/helper-plugin-utils@npm:^7.29.7, @babel/helper-plugin-utils@npm:^7.8.0": + version: 7.29.7 + resolution: "@babel/helper-plugin-utils@npm:7.29.7" + checksum: 10c0/380477a06133274a2759f9355929cb60a95e8b8fee624a1ae1fa349e1d1645b89daca456f72833f6d1062bffa12ee4271c5bf0cc5a61c0166cdc24c7591e2408 + languageName: node + linkType: hard + +"@babel/helper-remap-async-to-generator@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-remap-async-to-generator@npm:7.29.7" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.29.7" + "@babel/helper-wrap-function": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/d71a4f2c7e4523568b1fbeb4d85823bda7ebcd48263b2862ee8194b0a647b612e70d6a64472e0842fc7e557a16e9fa5d3c032af5c1308a342e2a3b49a87d4833 + languageName: node + linkType: hard + +"@babel/helper-replace-supers@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-replace-supers@npm:7.29.7" + dependencies: + "@babel/helper-member-expression-to-functions": "npm:^7.29.7" + "@babel/helper-optimise-call-expression": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/1c7ae37797f226e965ab85f6affa53d25a10c169c604a4daeb36f9df09e673471e6522f631c13761cf9fbafeca2ea14c241dea8d723a51039d561beb01d86ac4 + languageName: node + linkType: hard + +"@babel/helper-skip-transparent-expression-wrappers@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.29.7" + dependencies: + "@babel/traverse": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + checksum: 10c0/8c59493621487fc491f27adfc200af82a6aca3b9a5511e4e6050f8716593b4b243472cb56c8d2016e828b7ae12d605a819205aa8600ca08ee291dcd58d65c832 + languageName: node + linkType: hard + +"@babel/helper-string-parser@npm:^7.27.1": + version: 7.27.1 + resolution: "@babel/helper-string-parser@npm:7.27.1" + checksum: 10c0/8bda3448e07b5583727c103560bcf9c4c24b3c1051a4c516d4050ef69df37bb9a4734a585fe12725b8c2763de0a265aa1e909b485a4e3270b7cfd3e4dbe4b602 + languageName: node + linkType: hard + +"@babel/helper-string-parser@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-string-parser@npm:7.29.7" + checksum: 10c0/194bc0f1716e396d5ffde56ad6119745fb9557662c98611590e5e454906783a4ccb21ce93056b8eb69a4909044834e45d96e50ac695bbe9e3221648fe033c06c + languageName: node + linkType: hard + +"@babel/helper-validator-identifier@npm:^7.28.5": + version: 7.28.5 + resolution: "@babel/helper-validator-identifier@npm:7.28.5" + checksum: 10c0/42aaebed91f739a41f3d80b72752d1f95fd7c72394e8e4bd7cdd88817e0774d80a432451bcba17c2c642c257c483bf1d409dd4548883429ea9493a3bc4ab0847 + languageName: node + linkType: hard + +"@babel/helper-validator-identifier@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-validator-identifier@npm:7.29.7" + checksum: 10c0/4795354e7ae0dcafa72de1cd04ec51252dc1498517170beaf019e03effc5b7bf13c6b21a3949a77e07b8125be7f106ed1131350d8ebd4566ae874094a726d62b + languageName: node + linkType: hard + +"@babel/helper-validator-option@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-validator-option@npm:7.29.7" + checksum: 10c0/d2a06c6d0ac40ba4a2f219fc2cab249c7a94bacdb2686273b7f9598571c908809b48468ff588915a346e6cc7296f60b581023d1d498b747fed06f779d335c2cc + languageName: node + linkType: hard + +"@babel/helper-wrap-function@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helper-wrap-function@npm:7.29.7" + dependencies: + "@babel/template": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + checksum: 10c0/d765b341863ede049eb6923b9c20fc79fb6c64995a906b60a70c22fbffb21eef5d5a5cf15948c843047d31e8c902a85fa94ccfe5d30d0631a7b1e40e4d667c70 + languageName: node + linkType: hard + +"@babel/helpers@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/helpers@npm:7.29.7" + dependencies: + "@babel/template": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + checksum: 10c0/218e8d10953647c9f44775f5a022b227a182674853b5ea8631889deb7e1a3e4bc870388aaecf59bb8bd92a87f9a96220ed3f70a35bffec6bcf9169ecb67891ac + languageName: node + linkType: hard + +"@babel/parser@npm:^7.23.5": + version: 7.29.2 + resolution: "@babel/parser@npm:7.29.2" + dependencies: + "@babel/types": "npm:^7.29.0" + bin: + parser: ./bin/babel-parser.js + checksum: 10c0/e5a4e69e3ac7acdde995f37cf299a68458cfe7009dff66bd0962fd04920bef287201169006af365af479c08ff216bfefbb595e331f87f6ae7283858aebbc3317 + languageName: node + linkType: hard + +"@babel/parser@npm:^7.28.0, @babel/parser@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/parser@npm:7.29.7" + dependencies: + "@babel/types": "npm:^7.29.7" + bin: + parser: ./bin/babel-parser.js + checksum: 10c0/65133038f80b54a714d6027cb77cee3f9a6b5c4c6842ce674301e13947cbcbfa8055e63acaf1b84c085d34226a14425b2c2b97b829e0e226d2e8f1299942a51d + languageName: node + linkType: hard + +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/6877a4112797885bcf90f361131e2b63dcbbcb3e334c984c527e1e380eb7e81785219dcf99f1291eef4edc83907cb582204120d97d777807c252f9eb31fd2e6e + languageName: node + linkType: hard + +"@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/557565fc052b9ab306802b19b9cfc89be9aa7aa709447698dbb5080db356048d4c3dd94ccad8bcb4d5ef3c4002947a340d1c326acde0d95950c3773472f46282 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/5b949826cfadd9d90c3cfba01cc917f218ba2da05b2a2dc4781bd3805c150eb858ba52d2f3972c8ae6cc887257ac4d114fdda6d695a30510137abae5c76bf054 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/727a464410623fb47d47a2803562b8bb9fb4b915de94cc51bd3149937522b85e6a5d19c71207ac5269c51684f282a918785e78e359435d1f4ac889dc4f258855 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.29.7" + "@babel/plugin-transform-optional-chaining": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.13.0 + checksum: 10c0/9ccc704d1382771b2a6a4f1281b2f63d7be47fb0ebc9890e2f820e2a645b77aaf207ec8e6136854bb059715eac5fd7cab436b054c3b3b4a472b9fd0c73ee98b3 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/547bddf129eed825c0a3c706828c579bfedd0fa850054ded515e90af91fa1a643bb88461e49b59946d95737622766ae0db2c04346ee319e06e49852c270a2c2f + languageName: node + linkType: hard + +"@babel/plugin-proposal-class-properties@npm:^7.8.3": + version: 7.18.6 + resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6" + dependencies: + "@babel/helper-create-class-features-plugin": "npm:^7.18.6" + "@babel/helper-plugin-utils": "npm:^7.18.6" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/d5172ac6c9948cdfc387e94f3493ad86cb04035cf7433f86b5d358270b1b9752dc25e176db0c5d65892a246aca7bdb4636672e15626d7a7de4bc0bd0040168d9 + languageName: node + linkType: hard + +"@babel/plugin-proposal-decorators@npm:^7.8.3": + version: 7.29.7 + resolution: "@babel/plugin-proposal-decorators@npm:7.29.7" + dependencies: + "@babel/helper-create-class-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/plugin-syntax-decorators": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/9c0ce48ac70952d4419f0ceb250cefe2eff96d1e7393bcb7db2e15abe655ee04e25e6f7ce4346f27bdfa781a4386963e3e5c1d1ef7cb1c765a0d811debc9a645 + languageName: node + linkType: hard + +"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2": + version: 7.21.0-placeholder-for-preset-env.2 + resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/e605e0070da087f6c35579499e65801179a521b6842c15181a1e305c04fded2393f11c1efd09b087be7f8b083d1b75e8f3efcbc1292b4f60d3369e14812cff63 + languageName: node + linkType: hard + +"@babel/plugin-syntax-decorators@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-syntax-decorators@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/5a5644ecd899345a92788c2d3a832541a09ab1558accbde396036920d76405b8cb7b073eb01fad468181719962cc0dfdf8377c4744fc4ceb042432e03f64e13e + languageName: node + linkType: hard + +"@babel/plugin-syntax-dynamic-import@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.8.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5 + languageName: node + linkType: hard + +"@babel/plugin-syntax-import-assertions@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/d5628692a0ba2fadf469aaef20f4f0a216259eeb92d31fc23d48c9d201696099691f0dfaa895c657f9c591a7fab94f62545f20196326af1812ebab72cf34e9fe + languageName: node + linkType: hard + +"@babel/plugin-syntax-import-attributes@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-syntax-import-attributes@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/b9a47e869d8c06676297069895ae34e2bd244ec4c3bdf15002f1e69aed32eef0361044af22a43f271b8de5e23a40534fe6a74a63e7ab98e3d60a74b322444b49 + languageName: node + linkType: hard + +"@babel/plugin-syntax-jsx@npm:^7.2.0, @babel/plugin-syntax-jsx@npm:^7.27.1, @babel/plugin-syntax-jsx@npm:^7.8.3": + version: 7.29.7 + resolution: "@babel/plugin-syntax-jsx@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/1736000de183538ba8eef34520105508860e48b0c763254ba9158af5e814ed8bbceeedbb4281fbda33de787ae5b3870e92f60c6ae7131e7d322e451d57387896 + languageName: node + linkType: hard + +"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.18.6" + "@babel/helper-plugin-utils": "npm:^7.18.6" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/9144e5b02a211a4fb9a0ce91063f94fbe1004e80bde3485a0910c9f14897cf83fabd8c21267907cff25db8e224858178df0517f14333cfcf3380ad9a4139cb50 + languageName: node + linkType: hard + +"@babel/plugin-transform-arrow-functions@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-arrow-functions@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/03405abac83122b760c4d688a256c7a67961fd5a4396dfd119cf89a118984d31add38eeace38a158c63c3a4257a644e15da8836ee9e50876bf6876e988060be2 + languageName: node + linkType: hard + +"@babel/plugin-transform-async-generator-functions@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-remap-async-to-generator": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/efeeb26e8474d75b469b68fd7de74b757929b78aba5714ccb705a42f23d4e0de178ca09b59efd19113d42461bcf876dd9a919fd61f4e5e6fd1d1e5e7998e5bfe + languageName: node + linkType: hard + +"@babel/plugin-transform-async-to-generator@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-async-to-generator@npm:7.29.7" + dependencies: + "@babel/helper-module-imports": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-remap-async-to-generator": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/1aa514d28a2a87747f54e031cf6d2884a792a41c8bb9ebcf4d3d663284a4ae14e02c744ad76819ab09b96b6a0cdb60dd20e54c75f2eb9c3cc3fb255e0ef79e74 + languageName: node + linkType: hard + +"@babel/plugin-transform-block-scoped-functions@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/bb790629b9bce5215f932932222b50f371f8dfd30b874b7e6ea294213ddf10f427d5fc80dc7e1c0fba3568f02c1865290ce40aef89657570d98c4eb13b6af3c2 + languageName: node + linkType: hard + +"@babel/plugin-transform-block-scoping@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-block-scoping@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/ec4e45aefd4e1d276d0ee143bc521c2a3b38e59cc7dcef014d43c9a844416160d89f98953399e69e547a5743474d0986cb62155514109eab73b942beeb453a3f + languageName: node + linkType: hard + +"@babel/plugin-transform-class-properties@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-class-properties@npm:7.29.7" + dependencies: + "@babel/helper-create-class-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/c370700423439aa9f0c1f8c4b97f2ef7c2dc46a1b04ec3b10e83e6bae5e4e2159f56d8e4376c9d669b3cf827650cc3740170a36e3924e3e9970d27fd85f4e48a + languageName: node + linkType: hard + +"@babel/plugin-transform-class-static-block@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-class-static-block@npm:7.29.7" + dependencies: + "@babel/helper-create-class-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.12.0 + checksum: 10c0/d2fa7e8af5d05cee838bab20b624c2911ef6618c7ead146f6ace6421280d0e57487fc2b946b42832289a35764b559e584983b32e51bf5a85596495ba3452970f + languageName: node + linkType: hard + +"@babel/plugin-transform-classes@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-classes@npm:7.29.7" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.29.7" + "@babel/helper-compilation-targets": "npm:^7.29.7" + "@babel/helper-globals": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-replace-supers": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/53a55bc5348d82ca744dbfcfedf33ab79877e609a5308f43976de8c240bd09cee195a535bf54a01b28d7080eebe759735b1c6cf39f252eef469eefc1d838d2a2 + languageName: node + linkType: hard + +"@babel/plugin-transform-computed-properties@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-computed-properties@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/template": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/a8755338ffbfb374bafc2b3c22b00b025b8e5cf1cbac9c1ecdb3fb4c538508cb1b8f7a4e8c874b05df5166ff19ef105e65d54fefcf0546c628fa67214453b708 + languageName: node + linkType: hard + +"@babel/plugin-transform-destructuring@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-destructuring@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/74ff73303d32f8379f636741d3e48e2a20bbeb6e8b0d9343daad1952242f0ea78f319b4c871b5623739033b61459c9eed3d98f699fd192c45eab61ed8ad4c5ec + languageName: node + linkType: hard + +"@babel/plugin-transform-dotall-regex@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-dotall-regex@npm:7.29.7" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/1c3eecc214bae152fc9af66b6d7e045a58e364a1cbc18a6c8e0ecea2d470eb6171f35b454dde51dffb4e687245bc8ad9abb9e233cc708db5bd3bdced74a1511c + languageName: node + linkType: hard + +"@babel/plugin-transform-duplicate-keys@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-duplicate-keys@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/0d895326d8b29f6acaa8da72ebdc6393537311eaa33d8cab99cbb322a73c21be51d5d932a6d0c124e4f51539c5731dc3ed93084d3a2078a63db59dda6b00a724 + languageName: node + linkType: hard + +"@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:7.29.7" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/1dfecfb693ad6f1b6b779ac2fd676df048a051b83b4856f9ddced6217cd1f69b96259b01b5a67ee970fe531edf845944aadcc3f5dc74780331997f1dbf2de0da + languageName: node + linkType: hard + +"@babel/plugin-transform-dynamic-import@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-dynamic-import@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/9f824556ab369173e5945cceeb3b83516a2896b161a5cd9f14641e30b7d1535426eebbf04d1f3cfcac557e0148180650584b4ce552b09a6b03f03adf1fbc689c + languageName: node + linkType: hard + +"@babel/plugin-transform-explicit-resource-management@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-explicit-resource-management@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/plugin-transform-destructuring": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/083ef2bbc8c78ff80d70b1fe12604a8a2cc6a5ec68115c6efa4be7b5291b7576a092a102739af7c7e743cad79234b7cb7efe4216ca1913b598e0afc04a9962d5 + languageName: node + linkType: hard + +"@babel/plugin-transform-exponentiation-operator@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/1db57e065c5bceafcf7839d0c4cefd5723adba6d858df89d077d3f336364266a2dab71f1eb44746c14024736dd15fbe20ea392128c16b898abefc27cc1ca173f + languageName: node + linkType: hard + +"@babel/plugin-transform-export-namespace-from@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-export-namespace-from@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/6cd951e366c5c30223c409157e312d949feecfae8b4b4927053764ec71ff2bacf43aceda9b53239cd90d71caf4ae849c70549e0d3e31377dd8f42a0c283bdda2 + languageName: node + linkType: hard + +"@babel/plugin-transform-for-of@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-for-of@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/1d0143067df5f0d5ff0097099876da5d9d0fb7e2670939fde2523a0b14be2ea2cbcf736f874081d13ec5c3fca756f7aa1782a7c8cf17c262b0a493115a23b6b1 + languageName: node + linkType: hard + +"@babel/plugin-transform-function-name@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-function-name@npm:7.29.7" + dependencies: + "@babel/helper-compilation-targets": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/3ed2bca4f49356cd8fe1aa69daf5de63451be3b9271264eae536baf8d53476c63033e7fed6b5e97277cc10bdbfa10148f2f03315ca4cd94fae2b4ad5cb9b437f + languageName: node + linkType: hard + +"@babel/plugin-transform-json-strings@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-json-strings@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/6cc66ffbfa1dd50f1f225da0668740e93357ea84e67c798e9814085595d4f04a65d0d1368d15fd4b0022b7e76eded3a1c822791a93a8855b62897c836c547fff + languageName: node + linkType: hard + +"@babel/plugin-transform-literals@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-literals@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/bcfb8ca4092f2927ed61fdb75ddbadd701eda08ea2dd972f110d2ef1428643275c7adc7ce26847e15fbd573997e93654ff9afb4c1767a058e6d5843cbb9a4ae7 + languageName: node + linkType: hard + +"@babel/plugin-transform-logical-assignment-operators@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/b0b85f47bde7efd253b273bcbe317178df6f281b99f8399c04a3af1a8b0878ddb6e3d57e395292917d0376c337e57f4d64ad9f861001590a90f888c30abf2c51 + languageName: node + linkType: hard + +"@babel/plugin-transform-member-expression-literals@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-member-expression-literals@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/b8db313de0a4aeb3a617afcf9413774a53ec71a361030c89dbe2d05aa17310e9d33d4307727c898bfc9b07a9c676482fa8b0463840d1829c21323bc04623d556 + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-amd@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-modules-amd@npm:7.29.7" + dependencies: + "@babel/helper-module-transforms": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/425e9f99506968196a239944fe4eb51e144eadc2490b49a74798f92226f76b328d13b13e90e07962cd5df327994011570a3c2883b65091dde984b5bdff066c6b + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-commonjs@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.29.7" + dependencies: + "@babel/helper-module-transforms": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/9791cb524438b2a8ba6cb8715788fa1e202fbecd4e76b3ccab0af0819fd69212b40ae30d72ac377012f7149889f7792ed8bf91e97bbe9113ca9641f8ad3bf332 + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-systemjs@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.29.7" + dependencies: + "@babel/helper-module-transforms": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-validator-identifier": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/7b950bcc4a4b077b742b9299c8c9d4285e15854e23816d0b1c1177fafda4c153f3c3c4487c1b965afbf7a69a8788fc75656d0c591b91f0a5a543faabe738ca58 + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-umd@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-modules-umd@npm:7.29.7" + dependencies: + "@babel/helper-module-transforms": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/14545c7dfc8f95010766075d9cd4c1bf99a868c2dad7f780e9a609c6d94d23044f85672548b35a2162c027647386c0cfb85f68cee8f4e02352683acf6aade76d + languageName: node + linkType: hard + +"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.29.7" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/e16e270fc3640baf403497cbbab196cc0f18477576cf3535713c851f69c6e27b2902cc7502c3a863dce7f0432dc344ddcb14766a2af7cf37333aa864c7e5739b + languageName: node + linkType: hard + +"@babel/plugin-transform-new-target@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-new-target@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/9a192ded7083850d5b3c5629a3da4fe209298ac9d7a84d1495916a5c841cd4017e4d126d98a3b7c322eafae3851345fe2670377a16561b9cbd817e952f6fdbd5 + languageName: node + linkType: hard + +"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/b0c186fe38bc66830e1be76f06fabbae8a655d3896a841ba5ffa12d6c40bb9c8a6ecd38a7e2196034b1d7470653109b1ceac1ef5e46a5fdc9291d14afa56e0d0 + languageName: node + linkType: hard + +"@babel/plugin-transform-numeric-separator@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-numeric-separator@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/a0e79a9627717277cc21ede56d8e57da0ac5e0c9620c963da2526791657044b57eeeafe27f297754cfdea470dd590c763e9bc71d589f1850654f77f5f4f77ece + languageName: node + linkType: hard + +"@babel/plugin-transform-object-rest-spread@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-object-rest-spread@npm:7.29.7" + dependencies: + "@babel/helper-compilation-targets": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/plugin-transform-destructuring": "npm:^7.29.7" + "@babel/plugin-transform-parameters": "npm:^7.29.7" + "@babel/traverse": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/7963bcbb3165699cabad1ac5dcf03c26ffbe41c4a130283376d6e7a69ee6a353105c666e533e024bdf28862968434d1e13635846c8d8e7f5f9271407112aed1c + languageName: node + linkType: hard + +"@babel/plugin-transform-object-super@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-object-super@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-replace-supers": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/eacfa0f571cb9bbdb283253b41c7a3cafe03e6da81ea92f61d003971b3ada43a3f65e5392d31ba3fe7da6cd8b4210968729769f22d3f0feb418db9e66f167413 + languageName: node + linkType: hard + +"@babel/plugin-transform-optional-catch-binding@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/0df7a9cdaec349e4b893cb26b7ad45454b3ac01de722ccea5e8b4332d15f3e1bc2c130a18367052ce195c957178ad773121c5d586454c438d890585fc548dacc + languageName: node + linkType: hard + +"@babel/plugin-transform-optional-chaining@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-optional-chaining@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/71feacf9a7083030f4c69bf4e91db75f2fceae28e58c58b63db040006d908e15bc1e85a464f24ad659f17702e91a64eabbff9f1dd555ba33d78bb1af8a1d697a + languageName: node + linkType: hard + +"@babel/plugin-transform-parameters@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-parameters@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/ea1ff347e7b33b2483d18dcb9fb6c58f9819312f38235bf142e12f5355fcf77bb6640929734b12bd26b900c7abbb8cbd77ad06082d4c10d6e0e097ad016237e6 + languageName: node + linkType: hard + +"@babel/plugin-transform-private-methods@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-private-methods@npm:7.29.7" + dependencies: + "@babel/helper-create-class-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/d0dc12fa478d05e346dfb02fad2ed99b308d9a7324bada71530a62dc1ccbf07b4c2581ac677b7196b3994f191ef1922199e2c8f33957b726e2019ce07b4ced0f + languageName: node + linkType: hard + +"@babel/plugin-transform-private-property-in-object@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-private-property-in-object@npm:7.29.7" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.29.7" + "@babel/helper-create-class-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/6378b34725c6aab4b580cbb5d35ca45ba52213084d54c6672bc4282d86dc45937b8788ad450a9fb60ceb405e3c0d4b25e2804293c2509b54c5e0078babd56a8a + languageName: node + linkType: hard + +"@babel/plugin-transform-property-literals@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-property-literals@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/231ef97caeed1b79676978c9c04f203ba39f98da79097b733946aa29eb302d7cefc863d407f032a805080e8d20f70d7b2265c9c3ce634ca627d63c8f0f6e6e42 + languageName: node + linkType: hard + +"@babel/plugin-transform-regenerator@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-regenerator@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/b991ab501c1c2c323398054211f8cd992f1db438b5b5d548d63dc74ff9591d52a50385160fdba2b62aae4f9610a321355a8ff911f1c4bd80dc74b555cad61468 + languageName: node + linkType: hard + +"@babel/plugin-transform-regexp-modifiers@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-regexp-modifiers@npm:7.29.7" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/1c6c79f87a7163d33c1c9d787d239e3981755a66822ef0d41a95ce12e76277a247eaeeab29e3cf79bb6288e37e48a18accc13c3a9c351c06e4303b1d9b8b37cb + languageName: node + linkType: hard + +"@babel/plugin-transform-reserved-words@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-reserved-words@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/9eee586b7c7a9a34a659fd4d55ae8b156b03c8120a8459724062c212a59327ee8878168c0ce6bb5abd6c2a28aa87bc280b5180b1cbb2b03b12f7c71690f48718 + languageName: node + linkType: hard + +"@babel/plugin-transform-runtime@npm:^7.11.0": + version: 7.29.7 + resolution: "@babel/plugin-transform-runtime@npm:7.29.7" + dependencies: + "@babel/helper-module-imports": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + babel-plugin-polyfill-corejs2: "npm:^0.4.14" + babel-plugin-polyfill-corejs3: "npm:^0.13.0" + babel-plugin-polyfill-regenerator: "npm:^0.6.5" + semver: "npm:^6.3.1" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/570592fc99e55a976000532c5006ac7721b5c508fb905f4f919032291dcd3836617622d1c74177b1f872c88bb48c3f707cb6c2f7477d86d191d8b412d32385e9 + languageName: node + linkType: hard + +"@babel/plugin-transform-shorthand-properties@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-shorthand-properties@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/0f28300b873ce874c759917c7b22f68d5145a9c2d97df076e23dca99f8aa565dfceeb7e487af330e01d3e07d78f80d05b584aa411c60a63128b6a04a7633d45b + languageName: node + linkType: hard + +"@babel/plugin-transform-spread@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-spread@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/a3a5639eac8cc4a9cb3d8b2098a0a341b36e3ae11d29729cac1042d07a31b5290c32fa2c12cd2f122bf581bd0a65fec6b7b6c7446eef5a81e657739a579c0d5c + languageName: node + linkType: hard + +"@babel/plugin-transform-sticky-regex@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-sticky-regex@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/45b245f07841cc30a8e781a77bb09a2e86b2cc7f872785f315c92e2805825be43ac99f3ba63afcd4722307c648cb7d3f4f6f3e2b27d2d3e281414532a2601762 + languageName: node + linkType: hard + +"@babel/plugin-transform-template-literals@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-template-literals@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/961c2b42eb6d88042c2c213ed3b11ee1d92783ba63e1afe7e1a3392ec1a810556b5eec369fc5097a4a81f73ef92fa5d245bcf8b15d442e62a086bb1f64b50c95 + languageName: node + linkType: hard + +"@babel/plugin-transform-typeof-symbol@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-typeof-symbol@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/937408e0b9b2c8df6a6ce590421096fd793f77b417eb1f3f5ec560362e0a855d6ef66346c12cc7b337b8fa1d3ecf6b9b15674aa5ded54141adaed4cdeeed8528 + languageName: node + linkType: hard + +"@babel/plugin-transform-unicode-escapes@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-unicode-escapes@npm:7.29.7" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/65090012ede685913fb1020a585361dac366801d87caa577075924cac3c3ddd8e2a953bc6f75048dd480e62e529482e6ba68b945b0780087981c9ffff32e84f2 + languageName: node + linkType: hard + +"@babel/plugin-transform-unicode-property-regex@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.29.7" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/3a869cab02013209192da67ce911fa577eed03293331ee1d2c98498461f31fb5e99cbcb47f0c1c3211cf0c48fdd391060c77ac6a8f9978cd1f48e1096024cb73 + languageName: node + linkType: hard + +"@babel/plugin-transform-unicode-regex@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-unicode-regex@npm:7.29.7" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/1bd788fd953e9b9a662d9a5ec78750f48daa6ef142a141cc96c38278dff49cf082288fd568acc184386f9accb89fa145cf016cc615ef19bd110ff2162a88cfd7 + languageName: node + linkType: hard + +"@babel/plugin-transform-unicode-sets-regex@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.29.7" + dependencies: + "@babel/helper-create-regexp-features-plugin": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/7e07f6435b2ba32de80460ddcacc4214c9380984c00fd41ddaa79e4df3f06c022c1283e86bcae7ee09081f4e020f0bb76b26b9f98dc5ea7f4647f559544fe5f9 + languageName: node + linkType: hard + +"@babel/preset-env@npm:^7.11.0": + version: 7.29.7 + resolution: "@babel/preset-env@npm:7.29.7" + dependencies: + "@babel/compat-data": "npm:^7.29.7" + "@babel/helper-compilation-targets": "npm:^7.29.7" + "@babel/helper-plugin-utils": "npm:^7.29.7" + "@babel/helper-validator-option": "npm:^7.29.7" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.29.7" + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.29.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.29.7" + "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": "npm:^7.29.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.29.7" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.29.7" + "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2" + "@babel/plugin-syntax-import-assertions": "npm:^7.29.7" + "@babel/plugin-syntax-import-attributes": "npm:^7.29.7" + "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6" + "@babel/plugin-transform-arrow-functions": "npm:^7.29.7" + "@babel/plugin-transform-async-generator-functions": "npm:^7.29.7" + "@babel/plugin-transform-async-to-generator": "npm:^7.29.7" + "@babel/plugin-transform-block-scoped-functions": "npm:^7.29.7" + "@babel/plugin-transform-block-scoping": "npm:^7.29.7" + "@babel/plugin-transform-class-properties": "npm:^7.29.7" + "@babel/plugin-transform-class-static-block": "npm:^7.29.7" + "@babel/plugin-transform-classes": "npm:^7.29.7" + "@babel/plugin-transform-computed-properties": "npm:^7.29.7" + "@babel/plugin-transform-destructuring": "npm:^7.29.7" + "@babel/plugin-transform-dotall-regex": "npm:^7.29.7" + "@babel/plugin-transform-duplicate-keys": "npm:^7.29.7" + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.29.7" + "@babel/plugin-transform-dynamic-import": "npm:^7.29.7" + "@babel/plugin-transform-explicit-resource-management": "npm:^7.29.7" + "@babel/plugin-transform-exponentiation-operator": "npm:^7.29.7" + "@babel/plugin-transform-export-namespace-from": "npm:^7.29.7" + "@babel/plugin-transform-for-of": "npm:^7.29.7" + "@babel/plugin-transform-function-name": "npm:^7.29.7" + "@babel/plugin-transform-json-strings": "npm:^7.29.7" + "@babel/plugin-transform-literals": "npm:^7.29.7" + "@babel/plugin-transform-logical-assignment-operators": "npm:^7.29.7" + "@babel/plugin-transform-member-expression-literals": "npm:^7.29.7" + "@babel/plugin-transform-modules-amd": "npm:^7.29.7" + "@babel/plugin-transform-modules-commonjs": "npm:^7.29.7" + "@babel/plugin-transform-modules-systemjs": "npm:^7.29.7" + "@babel/plugin-transform-modules-umd": "npm:^7.29.7" + "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.29.7" + "@babel/plugin-transform-new-target": "npm:^7.29.7" + "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.29.7" + "@babel/plugin-transform-numeric-separator": "npm:^7.29.7" + "@babel/plugin-transform-object-rest-spread": "npm:^7.29.7" + "@babel/plugin-transform-object-super": "npm:^7.29.7" + "@babel/plugin-transform-optional-catch-binding": "npm:^7.29.7" + "@babel/plugin-transform-optional-chaining": "npm:^7.29.7" + "@babel/plugin-transform-parameters": "npm:^7.29.7" + "@babel/plugin-transform-private-methods": "npm:^7.29.7" + "@babel/plugin-transform-private-property-in-object": "npm:^7.29.7" + "@babel/plugin-transform-property-literals": "npm:^7.29.7" + "@babel/plugin-transform-regenerator": "npm:^7.29.7" + "@babel/plugin-transform-regexp-modifiers": "npm:^7.29.7" + "@babel/plugin-transform-reserved-words": "npm:^7.29.7" + "@babel/plugin-transform-shorthand-properties": "npm:^7.29.7" + "@babel/plugin-transform-spread": "npm:^7.29.7" + "@babel/plugin-transform-sticky-regex": "npm:^7.29.7" + "@babel/plugin-transform-template-literals": "npm:^7.29.7" + "@babel/plugin-transform-typeof-symbol": "npm:^7.29.7" + "@babel/plugin-transform-unicode-escapes": "npm:^7.29.7" + "@babel/plugin-transform-unicode-property-regex": "npm:^7.29.7" + "@babel/plugin-transform-unicode-regex": "npm:^7.29.7" + "@babel/plugin-transform-unicode-sets-regex": "npm:^7.29.7" + "@babel/preset-modules": "npm:0.1.6-no-external-plugins" + babel-plugin-polyfill-corejs2: "npm:^0.4.15" + babel-plugin-polyfill-corejs3: "npm:^0.14.0" + babel-plugin-polyfill-regenerator: "npm:^0.6.6" + core-js-compat: "npm:^3.48.0" + semver: "npm:^6.3.1" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/a6527c75e54c06c453e214496df83c2f6aa61da32d786e9a8921af05c4bc580c87ee64248122652df8d0f4b140d651b11282cd3dc3b61bb640b2a86b5812eabf + languageName: node + linkType: hard + +"@babel/preset-modules@npm:0.1.6-no-external-plugins": + version: 0.1.6-no-external-plugins + resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.0.0" + "@babel/types": "npm:^7.4.4" + esutils: "npm:^2.0.2" + peerDependencies: + "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0 + checksum: 10c0/9d02f70d7052446c5f3a4fb39e6b632695fb6801e46d31d7f7c5001f7c18d31d1ea8369212331ca7ad4e7877b73231f470b0d559162624128f1b80fe591409e6 + languageName: node + linkType: hard + +"@babel/runtime@npm:^7.11.0, @babel/runtime@npm:^7.21.0": + version: 7.29.7 + resolution: "@babel/runtime@npm:7.29.7" + checksum: 10c0/ca11572f7146b21e0bde6a9ed4bb6a89eafbee5f0944c7eb54d0d8a2dac962c33638a1d611e14faa71dfbb92b4b5f9236232208568a6b7d5c6f3f39ddb91771e + languageName: node + linkType: hard + +"@babel/template@npm:^7.27.2, @babel/template@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/template@npm:7.29.7" + dependencies: + "@babel/code-frame": "npm:^7.29.7" + "@babel/parser": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + checksum: 10c0/8bb7f900dcab0e9e1c5ffbc33ca10e0d26b7b2e2ca804becb73ee771b9c4ed6e2908a4ae4a14c08560febb45d2b6b9a173955e42ad404d05f8b04840a14d9c58 + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.28.0, @babel/traverse@npm:^7.29.7": + version: 7.29.7 + resolution: "@babel/traverse@npm:7.29.7" + dependencies: + "@babel/code-frame": "npm:^7.29.7" + "@babel/generator": "npm:^7.29.7" + "@babel/helper-globals": "npm:^7.29.7" + "@babel/parser": "npm:^7.29.7" + "@babel/template": "npm:^7.29.7" + "@babel/types": "npm:^7.29.7" + debug: "npm:^4.3.1" + checksum: 10c0/e256a1fbdb956555b76f3c285b1e453f6bedec8b3afb61751d99d933efd11c7d79caf5ddf2493570058a9f7deaa1b48324380d7c1aa1443fd9508becbf56331a + languageName: node + linkType: hard + +"@babel/types@npm:^7.28.2, @babel/types@npm:^7.29.7, @babel/types@npm:^7.4.4": + version: 7.29.7 + resolution: "@babel/types@npm:7.29.7" + dependencies: + "@babel/helper-string-parser": "npm:^7.29.7" + "@babel/helper-validator-identifier": "npm:^7.29.7" + checksum: 10c0/b6623994c69717fa27294f5fa46d59140338e2d86c6c1c13085c84ef7d53086ee357fbf4fe9abe3dd3da75734dc77c4c0df2f90fb29e667558bb3b3fb705e88f + languageName: node + linkType: hard + +"@babel/types@npm:^7.29.0": + version: 7.29.0 + resolution: "@babel/types@npm:7.29.0" + dependencies: + "@babel/helper-string-parser": "npm:^7.27.1" + "@babel/helper-validator-identifier": "npm:^7.28.5" + checksum: 10c0/23cc3466e83bcbfab8b9bd0edaafdb5d4efdb88b82b3be6728bbade5ba2f0996f84f63b1c5f7a8c0d67efded28300898a5f930b171bb40b311bca2029c4e9b4f + languageName: node + linkType: hard + +"@carbon/icon-helpers@npm:^10.37.0": + version: 10.74.0 + resolution: "@carbon/icon-helpers@npm:10.74.0" + dependencies: + "@ibm/telemetry-js": "npm:^1.5.0" + checksum: 10c0/8b5cc67d284d136fea71627f285e1c0826f672f75cdd6a2a3740d6e14c6c9ac7e138543a7d316db2a1bdfb42463f6ae5ec4bb3ef3765ca98c064504e32068859 + languageName: node + linkType: hard + +"@carbon/icon-helpers@npm:^10.76.0": + version: 10.77.0 + resolution: "@carbon/icon-helpers@npm:10.77.0" + dependencies: + "@ibm/telemetry-js": "npm:^1.5.0" + checksum: 10c0/785f4759da13f619890f35654c3871cc27738c1d1c81d04c7d3e15de3dbbcb4637e1bfb94eaf4c37f284a814fbb1a50ab51192eb483554ab82294e4319be2e4c + languageName: node + linkType: hard + +"@carbon/icons-vue@npm:10.63.0": + version: 10.63.0 + resolution: "@carbon/icons-vue@npm:10.63.0" + dependencies: + "@carbon/icon-helpers": "npm:^10.37.0" + checksum: 10c0/ce0ba55604e3c378936f3964d707279ff1c060aafd044d507a8b14d2f3f9650cfedadd68fc9fd171da0d1a62391146187dc030996d88abea003172bba2b12eca + languageName: node + linkType: hard + +"@carbon/icons-vue@npm:^10.37.0": + version: 10.130.0 + resolution: "@carbon/icons-vue@npm:10.130.0" + dependencies: + "@carbon/icon-helpers": "npm:^10.76.0" + "@ibm/telemetry-js": "npm:^1.5.0" + checksum: 10c0/50852b4185f64a13af2f38005fda033cc1a5bf2f72e260ece13048695e75bad176814d08447d309ead4e7e335c8cf5cbe2bea7884655aca2a3d0ffff33888945 + languageName: node + linkType: hard + +"@carbon/telemetry@npm:0.1.0, @carbon/telemetry@npm:^0.1.0": + version: 0.1.0 + resolution: "@carbon/telemetry@npm:0.1.0" + bin: + carbon-telemetry: bin/carbon-telemetry.js + checksum: 10c0/63ccb4de06beab043d8366da6391ba30e11e86479d84e58f3c486695cde5d93a5615034b3e5c802c50a54b18fe916cdcad075859d29510ea985b175974603c9e + languageName: node + linkType: hard + +"@carbon/vue@npm:^2.40.0": + version: 2.45.1 + resolution: "@carbon/vue@npm:2.45.1" + dependencies: + "@carbon/icons-vue": "npm:10.63.0" + "@carbon/telemetry": "npm:^0.1.0" + carbon-components: "npm:10.58.5" + flatpickr: "npm:4.6.13" + vue: "npm:^2.7.10" + checksum: 10c0/fb350fb841220d47977968d2cb4e1112a13c2609c781ae8472920e608096e17e38668d9098a3ceaefe247534fa6bf0f9c40ec9a42aaa85729f8a36fd32a573c5 + languageName: node + linkType: hard + +"@hapi/address@npm:2.x.x": + version: 2.1.4 + resolution: "@hapi/address@npm:2.1.4" + checksum: 10c0/d43068dd090fa1cb9324232b8cbe3235cd9106d5b8f5280262bddff27e95f383bee887bd30931f7765e10b111169681b92ff6ae46cc608686e65a17315f5c4bb + languageName: node + linkType: hard + +"@hapi/bourne@npm:1.x.x": + version: 1.3.2 + resolution: "@hapi/bourne@npm:1.3.2" + checksum: 10c0/c0f22d8577e36a86b12de7fd2356cb373a509c859ccdca3e73b017ade85fa7510235c2da46e32a530bee241ee056f7dac5af3f764585148694315d0847a20a8a + languageName: node + linkType: hard + +"@hapi/hoek@npm:8.x.x, @hapi/hoek@npm:^8.3.0": + version: 8.5.1 + resolution: "@hapi/hoek@npm:8.5.1" + checksum: 10c0/3279747618d3be88e384af2be9aff8366dd0cbdba61d37f162d896fe4432f90b3986f96f0e5815429a72e7b6b7293429a4aaff42c234e42ee6a66bb1f9fb14dd + languageName: node + linkType: hard + +"@hapi/joi@npm:^15.0.1": + version: 15.1.1 + resolution: "@hapi/joi@npm:15.1.1" + dependencies: + "@hapi/address": "npm:2.x.x" + "@hapi/bourne": "npm:1.x.x" + "@hapi/hoek": "npm:8.x.x" + "@hapi/topo": "npm:3.x.x" + checksum: 10c0/85170aa4a7d014d66b9db5a403d0790153756edfae52e0c6012309991b1ca10ed43700b28e68aa0b438704e0f7377b20bc212be01ac7cf64028a2fc8debb4da8 + languageName: node + linkType: hard + +"@hapi/topo@npm:3.x.x": + version: 3.1.6 + resolution: "@hapi/topo@npm:3.1.6" + dependencies: + "@hapi/hoek": "npm:^8.3.0" + checksum: 10c0/9948100dc6a3081bf29e88c7c2657a1612e46fe701d6f0cf5a5d3d656344c9cc6199d5489c563f231b65213288293673dec7d32845c59882a0f26c07dc461980 + languageName: node + linkType: hard + +"@ibm/telemetry-js@npm:^1.5.0": + version: 1.11.0 + resolution: "@ibm/telemetry-js@npm:1.11.0" + bin: + ibmtelemetry: dist/collect.js + checksum: 10c0/d43bde7dc6cd23a87ac9904cf0a728854d433c0808094b333963448a13b4bcb1cda6140b0bda643079e60fddc126d8a3516e63675f32e81354680dccde47011e + languageName: node + linkType: hard + +"@intervolga/optimize-cssnano-plugin@npm:^1.0.5": + version: 1.0.6 + resolution: "@intervolga/optimize-cssnano-plugin@npm:1.0.6" + dependencies: + cssnano: "npm:^4.0.0" + cssnano-preset-default: "npm:^4.0.0" + postcss: "npm:^7.0.0" + peerDependencies: + webpack: ^4.0.0 + checksum: 10c0/33fe91486b867a5f53f9c184f1867e51e89ab3251d976c51967bd64537cd2ca32c43fa87763487acc112d5be9e97ee8fc688042c0044bf316481344bd9a98605 + languageName: node + linkType: hard + +"@isaacs/fs-minipass@npm:^4.0.0": + version: 4.0.1 + resolution: "@isaacs/fs-minipass@npm:4.0.1" + dependencies: + minipass: "npm:^7.0.4" + checksum: 10c0/c25b6dc1598790d5b55c0947a9b7d111cfa92594db5296c3b907e2f533c033666f692a3939eadac17b1c7c40d362d0b0635dc874cbfe3e70db7c2b07cc97a5d2 + languageName: node + linkType: hard + +"@jridgewell/gen-mapping@npm:^0.3.12, @jridgewell/gen-mapping@npm:^0.3.5": + version: 0.3.13 + resolution: "@jridgewell/gen-mapping@npm:0.3.13" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.5.0" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10c0/9a7d65fb13bd9aec1fbab74cda08496839b7e2ceb31f5ab922b323e94d7c481ce0fc4fd7e12e2610915ed8af51178bdc61e168e92a8c8b8303b030b03489b13b + languageName: node + linkType: hard + +"@jridgewell/remapping@npm:^2.3.5": + version: 2.3.5 + resolution: "@jridgewell/remapping@npm:2.3.5" + dependencies: + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10c0/3de494219ffeb2c5c38711d0d7bb128097edf91893090a2dbc8ee0b55d092bb7347b1fd0f478486c5eab010e855c73927b1666f2107516d472d24a73017d1194 + languageName: node + linkType: hard + +"@jridgewell/resolve-uri@npm:^3.1.0": + version: 3.1.2 + resolution: "@jridgewell/resolve-uri@npm:3.1.2" + checksum: 10c0/d502e6fb516b35032331406d4e962c21fe77cdf1cbdb49c6142bcbd9e30507094b18972778a6e27cbad756209cfe34b1a27729e6fa08a2eb92b33943f680cf1e + languageName: node + linkType: hard + +"@jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.5.0, @jridgewell/sourcemap-codec@npm:^1.5.5": + version: 1.5.5 + resolution: "@jridgewell/sourcemap-codec@npm:1.5.5" + checksum: 10c0/f9e538f302b63c0ebc06eecb1dd9918dd4289ed36147a0ddce35d6ea4d7ebbda243cda7b2213b6a5e1d8087a298d5cf630fb2bd39329cdecb82017023f6081a0 + languageName: node + linkType: hard + +"@jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.28": + version: 0.3.31 + resolution: "@jridgewell/trace-mapping@npm:0.3.31" + dependencies: + "@jridgewell/resolve-uri": "npm:^3.1.0" + "@jridgewell/sourcemap-codec": "npm:^1.4.14" + checksum: 10c0/4b30ec8cd56c5fd9a661f088230af01e0c1a3888d11ffb6b47639700f71225be21d1f7e168048d6d4f9449207b978a235c07c8f15c07705685d16dc06280e9d9 + languageName: node + linkType: hard + +"@mrmlnc/readdir-enhanced@npm:^2.2.1": + version: 2.2.1 + resolution: "@mrmlnc/readdir-enhanced@npm:2.2.1" + dependencies: + call-me-maybe: "npm:^1.0.1" + glob-to-regexp: "npm:^0.3.0" + checksum: 10c0/01840f3c85e9a7cd0ed5e038cc00e7518809b9edda950598e22b1c9804832e39a75707aaa6eb0b023e72182a85e00041c7a01483e425b16257bd3d5e4c788d86 + languageName: node + linkType: hard + +"@nethserver/ns8-ui-lib@npm:^2.0.0": + version: 2.0.1 + resolution: "@nethserver/ns8-ui-lib@npm:2.0.1" + dependencies: + "@rollup/plugin-json": "npm:^4.1.0" + core-js: "npm:^3.15.2" + date-fns: "npm:^2.23.0" + date-fns-tz: "npm:^1.1.6" + vue-date-fns: "npm:^2.0.1" + peerDependencies: + vue: ^2.6.12 + checksum: 10c0/0a7e19b2ed067c1e6baf6921a901822a4aa14b2936dc3444694b10da8900cf740fa5d7b937b151c67223955c4397c3f37d6a2c69534b4ac76a8eeb6df9da9639 + languageName: node + linkType: hard + +"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1": + version: 5.1.1-v1 + resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1" + dependencies: + eslint-scope: "npm:5.1.1" + checksum: 10c0/75dda3e623b8ad7369ca22552d6beee337a814b2d0e8a32d23edd13fcb65c8082b32c5d86e436f3860dd7ade30d91d5db55d4ef9a08fb5a976c718ecc0d88a74 + languageName: node + linkType: hard + +"@node-ipc/js-queue@npm:2.0.3": + version: 2.0.3 + resolution: "@node-ipc/js-queue@npm:2.0.3" + dependencies: + easy-stack: "npm:1.0.1" + checksum: 10c0/8d97f018354b6d427605ddc8728aa9cb946676a43b648088264735643d78f0eb2dca5f7f6e52205f0a32c76ed5492ef3758f97c60b53c631c715f8e51610c9ed + languageName: node + linkType: hard + +"@nodelib/fs.stat@npm:^1.1.2": + version: 1.1.3 + resolution: "@nodelib/fs.stat@npm:1.1.3" + checksum: 10c0/dc28ccae626e817a61b1544285b0f86c4e94a4a23db777c2949f78866ec57b1e1ccd5554bc3ed8e965df0646b1019e184315d32e98428c15eef7409974b17598 + languageName: node + linkType: hard + +"@parcel/watcher-android-arm64@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-android-arm64@npm:2.5.6" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@parcel/watcher-darwin-arm64@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-darwin-arm64@npm:2.5.6" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@parcel/watcher-darwin-x64@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-darwin-x64@npm:2.5.6" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@parcel/watcher-freebsd-x64@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-freebsd-x64@npm:2.5.6" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm-glibc@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-linux-arm-glibc@npm:2.5.6" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm-musl@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-linux-arm-musl@npm:2.5.6" + conditions: os=linux & cpu=arm & libc=musl + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm64-glibc@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-linux-arm64-glibc@npm:2.5.6" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm64-musl@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-linux-arm64-musl@npm:2.5.6" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@parcel/watcher-linux-x64-glibc@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-linux-x64-glibc@npm:2.5.6" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@parcel/watcher-linux-x64-musl@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-linux-x64-musl@npm:2.5.6" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@parcel/watcher-win32-arm64@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-win32-arm64@npm:2.5.6" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@parcel/watcher-win32-ia32@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-win32-ia32@npm:2.5.6" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@parcel/watcher-win32-x64@npm:2.5.6": + version: 2.5.6 + resolution: "@parcel/watcher-win32-x64@npm:2.5.6" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@parcel/watcher@npm:^2.4.1": + version: 2.5.6 + resolution: "@parcel/watcher@npm:2.5.6" + dependencies: + "@parcel/watcher-android-arm64": "npm:2.5.6" + "@parcel/watcher-darwin-arm64": "npm:2.5.6" + "@parcel/watcher-darwin-x64": "npm:2.5.6" + "@parcel/watcher-freebsd-x64": "npm:2.5.6" + "@parcel/watcher-linux-arm-glibc": "npm:2.5.6" + "@parcel/watcher-linux-arm-musl": "npm:2.5.6" + "@parcel/watcher-linux-arm64-glibc": "npm:2.5.6" + "@parcel/watcher-linux-arm64-musl": "npm:2.5.6" + "@parcel/watcher-linux-x64-glibc": "npm:2.5.6" + "@parcel/watcher-linux-x64-musl": "npm:2.5.6" + "@parcel/watcher-win32-arm64": "npm:2.5.6" + "@parcel/watcher-win32-ia32": "npm:2.5.6" + "@parcel/watcher-win32-x64": "npm:2.5.6" + detect-libc: "npm:^2.0.3" + is-glob: "npm:^4.0.3" + node-addon-api: "npm:^7.0.0" + node-gyp: "npm:latest" + picomatch: "npm:^4.0.3" + dependenciesMeta: + "@parcel/watcher-android-arm64": + optional: true + "@parcel/watcher-darwin-arm64": + optional: true + "@parcel/watcher-darwin-x64": + optional: true + "@parcel/watcher-freebsd-x64": + optional: true + "@parcel/watcher-linux-arm-glibc": + optional: true + "@parcel/watcher-linux-arm-musl": + optional: true + "@parcel/watcher-linux-arm64-glibc": + optional: true + "@parcel/watcher-linux-arm64-musl": + optional: true + "@parcel/watcher-linux-x64-glibc": + optional: true + "@parcel/watcher-linux-x64-musl": + optional: true + "@parcel/watcher-win32-arm64": + optional: true + "@parcel/watcher-win32-ia32": + optional: true + "@parcel/watcher-win32-x64": + optional: true + checksum: 10c0/1e1d91f92e94e4640089a7cead243b2b81ca9aa8e1c862a97a25f589e84fbf1ad93abeb503f325c43a8c0e024ae0e74b48ec42c1cd84e8e423a3a87d25ded4f2 + languageName: node + linkType: hard + +"@rollup/plugin-json@npm:^4.1.0": + version: 4.1.0 + resolution: "@rollup/plugin-json@npm:4.1.0" + dependencies: + "@rollup/pluginutils": "npm:^3.0.8" + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 + checksum: 10c0/9fc4a3ee60929afcb5269ebda602914d1cf5dc020808f85be90c0a5a2ba9ca26136b0284a1935984861f0549a1e1db30fc372906c14425f5da4909f0fd21e5ea + languageName: node + linkType: hard + +"@rollup/pluginutils@npm:^3.0.8": + version: 3.1.0 + resolution: "@rollup/pluginutils@npm:3.1.0" + dependencies: + "@types/estree": "npm:0.0.39" + estree-walker: "npm:^1.0.1" + picomatch: "npm:^2.2.2" + peerDependencies: + rollup: ^1.20.0||^2.0.0 + checksum: 10c0/7151753160d15ba2b259461a6c25b3932150994ea52dba8fd3144f634c7647c2e56733d986e2c15de67c4d96a9ee7d6278efa6d2e626a7169898fd64adc0f90c + languageName: node + linkType: hard + +"@soda/friendly-errors-webpack-plugin@npm:^1.7.1": + version: 1.8.1 + resolution: "@soda/friendly-errors-webpack-plugin@npm:1.8.1" + dependencies: + chalk: "npm:^3.0.0" + error-stack-parser: "npm:^2.0.6" + string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: 10c0/221d1a255f0a7062fc54550484b5b675596fe38adb10d323894aa070de9a245e198e715a4ea56ef8368969158fa275f771d39aaa0cb552df53431d76dc0e5130 + languageName: node + linkType: hard + +"@soda/get-current-script@npm:^1.0.0": + version: 1.0.2 + resolution: "@soda/get-current-script@npm:1.0.2" + checksum: 10c0/f073459aa472ec2e0bc6e393586201334e9cddbe663e39b6ec4ca555e34412b1fd892f288b89e3b8f368bd78b2634ee5d7b58a6bd2843d5c10e64b53c6a9b2fb + languageName: node + linkType: hard + +"@types/body-parser@npm:*": + version: 1.19.6 + resolution: "@types/body-parser@npm:1.19.6" + dependencies: + "@types/connect": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/542da05c924dce58ee23f50a8b981fee36921850c82222e384931fda3e106f750f7880c47be665217d72dbe445129049db6eb1f44e7a06b09d62af8f3cca8ea7 + languageName: node + linkType: hard + +"@types/connect-history-api-fallback@npm:*": + version: 1.5.4 + resolution: "@types/connect-history-api-fallback@npm:1.5.4" + dependencies: + "@types/express-serve-static-core": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/1b4035b627dcd714b05a22557f942e24a57ca48e7377dde0d2f86313fe685bc0a6566512a73257a55b5665b96c3041fb29228ac93331d8133011716215de8244 + languageName: node + linkType: hard + +"@types/connect@npm:*": + version: 3.4.38 + resolution: "@types/connect@npm:3.4.38" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/2e1cdba2c410f25649e77856505cd60223250fa12dff7a503e492208dbfdd25f62859918f28aba95315251fd1f5e1ffbfca1e25e73037189ab85dd3f8d0a148c + languageName: node + linkType: hard + +"@types/estree@npm:0.0.39": + version: 0.0.39 + resolution: "@types/estree@npm:0.0.39" + checksum: 10c0/f0af6c95ac1988c4827964bd9d3b51d24da442e2188943f6dfcb1e1559103d5d024d564b2e9d3f84c53714a02a0a7435c7441138eb63d9af5de4dfc66cdc0d92 + languageName: node + linkType: hard + +"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^5.0.0": + version: 5.1.1 + resolution: "@types/express-serve-static-core@npm:5.1.1" + dependencies: + "@types/node": "npm:*" + "@types/qs": "npm:*" + "@types/range-parser": "npm:*" + "@types/send": "npm:*" + checksum: 10c0/ee88216e114368ef06bcafeceb74a7e8671b90900fb0ab1d49ff41542c3a344231ef0d922bf63daa79f0585f3eebe2ce5ec7f83facc581eff8bcdb136a225ef3 + languageName: node + linkType: hard + +"@types/express@npm:*": + version: 5.0.6 + resolution: "@types/express@npm:5.0.6" + dependencies: + "@types/body-parser": "npm:*" + "@types/express-serve-static-core": "npm:^5.0.0" + "@types/serve-static": "npm:^2" + checksum: 10c0/f1071e3389a955d4f9a38aae38634121c7cd9b3171ba4201ec9b56bd534aba07866839d278adc0dda05b942b05a901a02fd174201c3b1f70ce22b10b6c68f24b + languageName: node + linkType: hard + +"@types/glob@npm:^7.1.1": + version: 7.2.0 + resolution: "@types/glob@npm:7.2.0" + dependencies: + "@types/minimatch": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98 + languageName: node + linkType: hard + +"@types/http-errors@npm:*": + version: 2.0.5 + resolution: "@types/http-errors@npm:2.0.5" + checksum: 10c0/00f8140fbc504f47356512bd88e1910c2f07e04233d99c88c854b3600ce0523c8cd0ba7d1897667243282eb44c59abb9245959e2428b9de004f93937f52f7c15 + languageName: node + linkType: hard + +"@types/http-proxy@npm:^1.17.5": + version: 1.17.17 + resolution: "@types/http-proxy@npm:1.17.17" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/547e322a5eecf0b50d08f6a46bd89c8c8663d67dbdcd472da5daf968b03e63a82f6b3650443378abe6c10a46475dac52015f30e8c74ba2ea5820dd4e9cdef2d4 + languageName: node + linkType: hard + +"@types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8": + version: 7.0.15 + resolution: "@types/json-schema@npm:7.0.15" + checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db + languageName: node + linkType: hard + +"@types/minimatch@npm:*": + version: 5.1.2 + resolution: "@types/minimatch@npm:5.1.2" + checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562 + languageName: node + linkType: hard + +"@types/minimist@npm:^1.2.0": + version: 1.2.5 + resolution: "@types/minimist@npm:1.2.5" + checksum: 10c0/3f791258d8e99a1d7d0ca2bda1ca6ea5a94e5e7b8fc6cde84dd79b0552da6fb68ade750f0e17718f6587783c24254bbca0357648dd59dc3812c150305cabdc46 + languageName: node + linkType: hard + +"@types/node@npm:*": + version: 26.1.0 + resolution: "@types/node@npm:26.1.0" + dependencies: + undici-types: "npm:~8.3.0" + checksum: 10c0/61c22ad1ef215e24138cb8b7368fb68bab9de4c123b3f23d411749b015ba1b7d22f878ad54add26a0b69068d7e07c04af665069d8571b6c6c3b9b2fb73b7bd91 + languageName: node + linkType: hard + +"@types/normalize-package-data@npm:^2.4.0": + version: 2.4.4 + resolution: "@types/normalize-package-data@npm:2.4.4" + checksum: 10c0/aef7bb9b015883d6f4119c423dd28c4bdc17b0e8a0ccf112c78b4fe0e91fbc4af7c6204b04bba0e199a57d2f3fbbd5b4a14bf8739bf9d2a39b2a0aad545e0f86 + languageName: node + linkType: hard + +"@types/q@npm:^1.5.1": + version: 1.5.8 + resolution: "@types/q@npm:1.5.8" + checksum: 10c0/6b2903a03f23ce737503b8a4c409a4133f15009a70e125b5efd5d8c315a5426e64b574ee65288c9dd655c631dcc51c69e4b540b59905ad0b1398952ba367d88b + languageName: node + linkType: hard + +"@types/qs@npm:*": + version: 6.15.1 + resolution: "@types/qs@npm:6.15.1" + checksum: 10c0/1dfdbcb4cf2a8f66d57f0b9a9fe6b1c7091cb816687b6698c1351eaf31f62e412cea9b7453a9637b570cd5fad8dced527e5a9e69b4fcc6e318daacd8b749f094 + languageName: node + linkType: hard + +"@types/range-parser@npm:*": + version: 1.2.7 + resolution: "@types/range-parser@npm:1.2.7" + checksum: 10c0/361bb3e964ec5133fa40644a0b942279ed5df1949f21321d77de79f48b728d39253e5ce0408c9c17e4e0fd95ca7899da36841686393b9f7a1e209916e9381a3c + languageName: node + linkType: hard + +"@types/send@npm:*": + version: 1.2.1 + resolution: "@types/send@npm:1.2.1" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/7673747f8c2d8e67f3b1b3b57e9d4d681801a4f7b526ecf09987bb9a84a61cf94aa411c736183884dc762c1c402a61681eb1ef200d8d45d7e5ec0ab67ea5f6c1 + languageName: node + linkType: hard + +"@types/serve-static@npm:*, @types/serve-static@npm:^2": + version: 2.2.0 + resolution: "@types/serve-static@npm:2.2.0" + dependencies: + "@types/http-errors": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/a3c6126bdbf9685e6c7dc03ad34639666eff32754e912adeed9643bf3dd3aa0ff043002a7f69039306e310d233eb8e160c59308f95b0a619f32366bbc48ee094 + languageName: node + linkType: hard + +"@types/source-list-map@npm:*": + version: 0.1.6 + resolution: "@types/source-list-map@npm:0.1.6" + checksum: 10c0/1e6d8d4a48535c51368c65bb2c44a1c9fd9afe2eeefefa32cbf06f9c191f7b20f638b3aa755100de0a750b0ba6a76140e912f1bee75705bc2b9a58b5a5185539 + languageName: node + linkType: hard + +"@types/tapable@npm:^1": + version: 1.0.12 + resolution: "@types/tapable@npm:1.0.12" + checksum: 10c0/d6a080f5839b323eb96dd5b65a6c3161c1297d8c2433eb52437912d1c3df54e38fce12ce7a57650f6453d96942298bd0935436e2501d09e407b7f41634483131 + languageName: node + linkType: hard + +"@types/uglify-js@npm:*": + version: 3.17.5 + resolution: "@types/uglify-js@npm:3.17.5" + dependencies: + source-map: "npm:^0.6.1" + checksum: 10c0/e225d7da26a7a8b71e71f584ab2b4e14f9bd61e2ae4c72fa14d3d862ebfb8f3c1c24414048f23ea485e93618d3370e6c9d5e5af51b6a836d48ec453a26e419f4 + languageName: node + linkType: hard + +"@types/webpack-dev-server@npm:^3.11.0": + version: 3.11.6 + resolution: "@types/webpack-dev-server@npm:3.11.6" + dependencies: + "@types/connect-history-api-fallback": "npm:*" + "@types/express": "npm:*" + "@types/serve-static": "npm:*" + "@types/webpack": "npm:^4" + http-proxy-middleware: "npm:^1.0.0" + checksum: 10c0/3e2a933d7d8df70f1dc491dd53fe6c8d979fcb8a6646c0a589d6a5f65a88e04b8d30f37fead51b3005425be2ac368e4d1ad9b71b1d19a4797ccd0bc24e1e7296 + languageName: node + linkType: hard + +"@types/webpack-sources@npm:*": + version: 3.2.3 + resolution: "@types/webpack-sources@npm:3.2.3" + dependencies: + "@types/node": "npm:*" + "@types/source-list-map": "npm:*" + source-map: "npm:^0.7.3" + checksum: 10c0/74e9dfdd38bc345ce99442f3be5b5ad1efc7af5890304175c141717a7c0b38c152e6f7fe1d2875fc19aaa68964019ff4661678eba7fdeee8c3ad42dc6dbf6b62 + languageName: node + linkType: hard + +"@types/webpack@npm:^4, @types/webpack@npm:^4.0.0": + version: 4.41.40 + resolution: "@types/webpack@npm:4.41.40" + dependencies: + "@types/node": "npm:*" + "@types/tapable": "npm:^1" + "@types/uglify-js": "npm:*" + "@types/webpack-sources": "npm:*" + anymatch: "npm:^3.0.0" + source-map: "npm:^0.6.0" + checksum: 10c0/ecd530e5db4c21ec61795eec538026f96c126323836249a83e72805afd1d0b1141fc781f14d4a59d77f877523384b4c5d79dc391cfb901e7a781a9aa085f8198 + languageName: node + linkType: hard + +"@vue/babel-helper-vue-jsx-merge-props@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-helper-vue-jsx-merge-props@npm:1.4.0" + checksum: 10c0/176a75390b5d41599ecc9120a155a3a85b0559afc8b3aa32555c758c6c17e38a7373b068c3e74f9ba314e61529de8a75d262efe4bd441dfa35b531072ce30e4c + languageName: node + linkType: hard + +"@vue/babel-helper-vue-transform-on@npm:1.5.0": + version: 1.5.0 + resolution: "@vue/babel-helper-vue-transform-on@npm:1.5.0" + checksum: 10c0/848bb106349f446f6f3004bbf51505b9321bf6ffa2852b79ec7d28859e86279e6b022bf478f6239fe5d9d1cfc96849e7bdfa4add71b00f45459bf40e75496aea + languageName: node + linkType: hard + +"@vue/babel-plugin-jsx@npm:^1.0.3": + version: 1.5.0 + resolution: "@vue/babel-plugin-jsx@npm:1.5.0" + dependencies: + "@babel/helper-module-imports": "npm:^7.27.1" + "@babel/helper-plugin-utils": "npm:^7.27.1" + "@babel/plugin-syntax-jsx": "npm:^7.27.1" + "@babel/template": "npm:^7.27.2" + "@babel/traverse": "npm:^7.28.0" + "@babel/types": "npm:^7.28.2" + "@vue/babel-helper-vue-transform-on": "npm:1.5.0" + "@vue/babel-plugin-resolve-type": "npm:1.5.0" + "@vue/shared": "npm:^3.5.18" + peerDependencies: + "@babel/core": ^7.0.0-0 + peerDependenciesMeta: + "@babel/core": + optional: true + checksum: 10c0/83d0ee5c9ca8e38f3c716bb424a8df1dcb4996754ed41e80b5462ece95abf1687cdd4b532778ba4fc632a8404e930f33ac18943e8ce61c9af3580694ef0bcf3f + languageName: node + linkType: hard + +"@vue/babel-plugin-resolve-type@npm:1.5.0": + version: 1.5.0 + resolution: "@vue/babel-plugin-resolve-type@npm:1.5.0" + dependencies: + "@babel/code-frame": "npm:^7.27.1" + "@babel/helper-module-imports": "npm:^7.27.1" + "@babel/helper-plugin-utils": "npm:^7.27.1" + "@babel/parser": "npm:^7.28.0" + "@vue/compiler-sfc": "npm:^3.5.18" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/78235231cfc2a6d632adf23cb340cdd0760c787ab746fd7f8d8a88e46822a85c762f91a7544cad389f1f985893499b5066ddd6eb408dab903d9b2df66deac110 + languageName: node + linkType: hard + +"@vue/babel-plugin-transform-vue-jsx@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-plugin-transform-vue-jsx@npm:1.4.0" + dependencies: + "@babel/helper-module-imports": "npm:^7.0.0" + "@babel/plugin-syntax-jsx": "npm:^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props": "npm:^1.4.0" + html-tags: "npm:^2.0.0" + lodash.kebabcase: "npm:^4.1.1" + svg-tags: "npm:^1.0.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/791d0f252947f634bebe975816e0c17a4bf942460492bcde5dd8c663819949c2c54181712154470adbe7d023016ae989ab886ac6ac7519674e53b714ee690525 + languageName: node + linkType: hard + +"@vue/babel-preset-app@npm:^4.5.19": + version: 4.5.19 + resolution: "@vue/babel-preset-app@npm:4.5.19" + dependencies: + "@babel/core": "npm:^7.11.0" + "@babel/helper-compilation-targets": "npm:^7.9.6" + "@babel/helper-module-imports": "npm:^7.8.3" + "@babel/plugin-proposal-class-properties": "npm:^7.8.3" + "@babel/plugin-proposal-decorators": "npm:^7.8.3" + "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3" + "@babel/plugin-syntax-jsx": "npm:^7.8.3" + "@babel/plugin-transform-runtime": "npm:^7.11.0" + "@babel/preset-env": "npm:^7.11.0" + "@babel/runtime": "npm:^7.11.0" + "@vue/babel-plugin-jsx": "npm:^1.0.3" + "@vue/babel-preset-jsx": "npm:^1.2.4" + babel-plugin-dynamic-import-node: "npm:^2.3.3" + core-js: "npm:^3.6.5" + core-js-compat: "npm:^3.6.5" + semver: "npm:^6.1.0" + peerDependencies: + "@babel/core": "*" + core-js: ^3 + vue: ^2 || ^3.0.0-0 + peerDependenciesMeta: + core-js: + optional: true + vue: + optional: true + checksum: 10c0/7ab92eaddc71865830f3a09b31ee5f1f139e62a7cf91f5be86dc2c8d08733ee46d541e8b5ace33a1b0ff6ba5dd0cca8a5cc7da91a77450bab30e4ce01a62f1e8 + languageName: node + linkType: hard + +"@vue/babel-preset-jsx@npm:^1.2.4": + version: 1.4.0 + resolution: "@vue/babel-preset-jsx@npm:1.4.0" + dependencies: + "@vue/babel-helper-vue-jsx-merge-props": "npm:^1.4.0" + "@vue/babel-plugin-transform-vue-jsx": "npm:^1.4.0" + "@vue/babel-sugar-composition-api-inject-h": "npm:^1.4.0" + "@vue/babel-sugar-composition-api-render-instance": "npm:^1.4.0" + "@vue/babel-sugar-functional-vue": "npm:^1.4.0" + "@vue/babel-sugar-inject-h": "npm:^1.4.0" + "@vue/babel-sugar-v-model": "npm:^1.4.0" + "@vue/babel-sugar-v-on": "npm:^1.4.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + vue: "*" + peerDependenciesMeta: + vue: + optional: true + checksum: 10c0/20ab15ccd012788f81f656f4671bfce2216e39ee6e0d6e9f3beb6ddc26150fe9505efd92fc62238dc67eb98d8adc548fe077fa6a68c39003014156e2a3b6c641 + languageName: node + linkType: hard + +"@vue/babel-sugar-composition-api-inject-h@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-sugar-composition-api-inject-h@npm:1.4.0" + dependencies: + "@babel/plugin-syntax-jsx": "npm:^7.2.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/c8b1fd5693ef99ba5358a954db0208588760022d9591006467f15da21b14b7e1f679a290e9ff0deca54696f22a63d799715d9305a7e48de4762cfc6337e6fe78 + languageName: node + linkType: hard + +"@vue/babel-sugar-composition-api-render-instance@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-sugar-composition-api-render-instance@npm:1.4.0" + dependencies: + "@babel/plugin-syntax-jsx": "npm:^7.2.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/3ef9cd71b721557a56259f20320c457165802cad60d957d21fdabb4e8fabf2e55a7851ea8f4382278bf0e0bbec27a64700f5c668bf16993124f2b58dc3bf2376 + languageName: node + linkType: hard + +"@vue/babel-sugar-functional-vue@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-sugar-functional-vue@npm:1.4.0" + dependencies: + "@babel/plugin-syntax-jsx": "npm:^7.2.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/2e2c470ea31bc0f2a2b82f37406ddf02387b0e6b0e14d6905b989e956d0727283375f8147bd1d71afa138277b8380ff6b5d1d3e9639a420fdd9ffdb520d1d70e + languageName: node + linkType: hard + +"@vue/babel-sugar-inject-h@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-sugar-inject-h@npm:1.4.0" + dependencies: + "@babel/plugin-syntax-jsx": "npm:^7.2.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/364823f4d4b122c7740de2e9d6e50dbdd25f5c55b7cd2053e10c388543bf536ada26b038669388727d333277009f3a404aac15658aef0f017890c60a8e0115c1 + languageName: node + linkType: hard + +"@vue/babel-sugar-v-model@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-sugar-v-model@npm:1.4.0" + dependencies: + "@babel/plugin-syntax-jsx": "npm:^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props": "npm:^1.4.0" + "@vue/babel-plugin-transform-vue-jsx": "npm:^1.4.0" + camelcase: "npm:^5.0.0" + html-tags: "npm:^2.0.0" + svg-tags: "npm:^1.0.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/10cf44f2e7699487b1aeaa093ffa2721f0f046cdb958261e2df53fe82e39bf3e59bddcbbca527f69f7db97e518e40e55ec0314357052b84d8f948bce76aaa676 + languageName: node + linkType: hard + +"@vue/babel-sugar-v-on@npm:^1.4.0": + version: 1.4.0 + resolution: "@vue/babel-sugar-v-on@npm:1.4.0" + dependencies: + "@babel/plugin-syntax-jsx": "npm:^7.2.0" + "@vue/babel-plugin-transform-vue-jsx": "npm:^1.4.0" + camelcase: "npm:^5.0.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/2b60535a7cf27574bbfb36777181ce11d76081b96ac8ac1a71e341146a8a2d7f83a1400ada1e2b54023fa1ec90e9d1c0ff2f353870401c70b74fe988844f6c9b + languageName: node + linkType: hard + +"@vue/cli-overlay@npm:^4.5.19": + version: 4.5.19 + resolution: "@vue/cli-overlay@npm:4.5.19" + checksum: 10c0/f18a7e05db6e474df34a4e4c4acac7d171c56f9cbd85c2b73c6dd0f5b440a4209249e460bd8aa2e2a51fcff5ba8708f1ae0fb4862a79936d4312d2d44625a787 + languageName: node + linkType: hard + +"@vue/cli-plugin-babel@npm:~4.5.18": + version: 4.5.19 + resolution: "@vue/cli-plugin-babel@npm:4.5.19" + dependencies: + "@babel/core": "npm:^7.11.0" + "@vue/babel-preset-app": "npm:^4.5.19" + "@vue/cli-shared-utils": "npm:^4.5.19" + babel-loader: "npm:^8.1.0" + cache-loader: "npm:^4.1.0" + thread-loader: "npm:^2.1.3" + webpack: "npm:^4.0.0" + peerDependencies: + "@vue/cli-service": ^3.0.0 || ^4.0.0-0 + checksum: 10c0/38e0c73df8cb1977aeb62dfe4c487a3d2e60a7050fcbe1a2162d0dced39232fa262ac88fc8e002f0632d46de6b1241bb7cb43c2dbb560a76632f6677c1dc7060 + languageName: node + linkType: hard + +"@vue/cli-plugin-eslint@npm:~4.5.18": + version: 4.5.19 + resolution: "@vue/cli-plugin-eslint@npm:4.5.19" + dependencies: + "@vue/cli-shared-utils": "npm:^4.5.19" + eslint-loader: "npm:^2.2.1" + globby: "npm:^9.2.0" + inquirer: "npm:^7.1.0" + webpack: "npm:^4.0.0" + yorkie: "npm:^2.0.0" + peerDependencies: + "@vue/cli-service": ^3.0.0 || ^4.0.0-0 + eslint: ">= 1.6.0 < 7.0.0" + checksum: 10c0/01bd77af5393b0d22a2056dbf75ef0b7cdf494250566fc35a3c86d9094b61736ded8f0f3324bdc83632ebb0887f464273f601c0fc2e0f58570c7a8ad42511e56 + languageName: node + linkType: hard + +"@vue/cli-plugin-router@npm:^4.5.19, @vue/cli-plugin-router@npm:~4.5.18": + version: 4.5.19 + resolution: "@vue/cli-plugin-router@npm:4.5.19" + dependencies: + "@vue/cli-shared-utils": "npm:^4.5.19" + peerDependencies: + "@vue/cli-service": ^3.0.0 || ^4.0.0-0 + checksum: 10c0/f9ad3c174e8892bcd487678a0a0d11735c18f67c6d31f4e152c7bde386e3b25d116df9078d3f62556ceca516170b57c4aa32d230d5ebc09bde61b21575817ca9 + languageName: node + linkType: hard + +"@vue/cli-plugin-vuex@npm:^4.5.19, @vue/cli-plugin-vuex@npm:~4.5.18": + version: 4.5.19 + resolution: "@vue/cli-plugin-vuex@npm:4.5.19" + peerDependencies: + "@vue/cli-service": ^3.0.0 || ^4.0.0-0 + checksum: 10c0/9fb1d3ade8d19d8d38566f9615e87fb66b57f9563ed49d17f4401f737b1b2519096647dfef20ceaf2d28796742c0e748d46d2c41c4cfd042f1623fcbbfc20a40 + languageName: node + linkType: hard + +"@vue/cli-service@npm:~4.5.18": + version: 4.5.19 + resolution: "@vue/cli-service@npm:4.5.19" + dependencies: + "@intervolga/optimize-cssnano-plugin": "npm:^1.0.5" + "@soda/friendly-errors-webpack-plugin": "npm:^1.7.1" + "@soda/get-current-script": "npm:^1.0.0" + "@types/minimist": "npm:^1.2.0" + "@types/webpack": "npm:^4.0.0" + "@types/webpack-dev-server": "npm:^3.11.0" + "@vue/cli-overlay": "npm:^4.5.19" + "@vue/cli-plugin-router": "npm:^4.5.19" + "@vue/cli-plugin-vuex": "npm:^4.5.19" + "@vue/cli-shared-utils": "npm:^4.5.19" + "@vue/component-compiler-utils": "npm:^3.1.2" + "@vue/preload-webpack-plugin": "npm:^1.1.0" + "@vue/web-component-wrapper": "npm:^1.2.0" + acorn: "npm:^7.4.0" + acorn-walk: "npm:^7.1.1" + address: "npm:^1.1.2" + autoprefixer: "npm:^9.8.6" + browserslist: "npm:^4.12.0" + cache-loader: "npm:^4.1.0" + case-sensitive-paths-webpack-plugin: "npm:^2.3.0" + cli-highlight: "npm:^2.1.4" + clipboardy: "npm:^2.3.0" + cliui: "npm:^6.0.0" + copy-webpack-plugin: "npm:^5.1.1" + css-loader: "npm:^3.5.3" + cssnano: "npm:^4.1.10" + debug: "npm:^4.1.1" + default-gateway: "npm:^5.0.5" + dotenv: "npm:^8.2.0" + dotenv-expand: "npm:^5.1.0" + file-loader: "npm:^4.2.0" + fs-extra: "npm:^7.0.1" + globby: "npm:^9.2.0" + hash-sum: "npm:^2.0.0" + html-webpack-plugin: "npm:^3.2.0" + launch-editor-middleware: "npm:^2.2.1" + lodash.defaultsdeep: "npm:^4.6.1" + lodash.mapvalues: "npm:^4.6.0" + lodash.transform: "npm:^4.6.0" + mini-css-extract-plugin: "npm:^0.9.0" + minimist: "npm:^1.2.5" + pnp-webpack-plugin: "npm:^1.6.4" + portfinder: "npm:^1.0.26" + postcss-loader: "npm:^3.0.0" + ssri: "npm:^8.0.1" + terser-webpack-plugin: "npm:^1.4.4" + thread-loader: "npm:^2.1.3" + url-loader: "npm:^2.2.0" + vue-loader: "npm:^15.9.2" + vue-loader-v16: "npm:vue-loader@^16.1.0" + vue-style-loader: "npm:^4.1.2" + webpack: "npm:^4.0.0" + webpack-bundle-analyzer: "npm:^3.8.0" + webpack-chain: "npm:^6.4.0" + webpack-dev-server: "npm:^3.11.0" + webpack-merge: "npm:^4.2.2" + peerDependencies: + "@vue/compiler-sfc": ^3.0.0-beta.14 + vue-template-compiler: ^2.0.0 + dependenciesMeta: + vue-loader-v16: + optional: true + peerDependenciesMeta: + "@vue/compiler-sfc": + optional: true + less-loader: + optional: true + pug-plain-loader: + optional: true + raw-loader: + optional: true + sass-loader: + optional: true + stylus-loader: + optional: true + vue-template-compiler: + optional: true + bin: + vue-cli-service: bin/vue-cli-service.js + checksum: 10c0/7670266716016e264ee56c8e367f5cdbf03f5aabf670faf20acb7163ebfa646d578ee3feaa5cc2624554c6d325875d552260b3d6633f18ccde7a251224e25a7b + languageName: node + linkType: hard + +"@vue/cli-shared-utils@npm:^4.5.19": + version: 4.5.19 + resolution: "@vue/cli-shared-utils@npm:4.5.19" + dependencies: + "@achrinza/node-ipc": "npm:9.2.2" + "@hapi/joi": "npm:^15.0.1" + chalk: "npm:^2.4.2" + execa: "npm:^1.0.0" + launch-editor: "npm:^2.2.1" + lru-cache: "npm:^5.1.1" + open: "npm:^6.3.0" + ora: "npm:^3.4.0" + read-pkg: "npm:^5.1.1" + request: "npm:^2.88.2" + semver: "npm:^6.1.0" + strip-ansi: "npm:^6.0.0" + checksum: 10c0/410bc231db9581af02170cc28fc9f65a3ffe182e55546a496c94a8bf9c9c903ff6a23196b0bac6b53dbd3b2dcba7611330c05f06f2418fb9a410769f11f07345 + languageName: node + linkType: hard + +"@vue/compiler-core@npm:3.5.39": + version: 3.5.39 + resolution: "@vue/compiler-core@npm:3.5.39" + dependencies: + "@babel/parser": "npm:^7.29.7" + "@vue/shared": "npm:3.5.39" + entities: "npm:^7.0.1" + estree-walker: "npm:^2.0.2" + source-map-js: "npm:^1.2.1" + checksum: 10c0/97592f35505713b2024e92cf58806db0abe5519a1462c06269f71cb8ddcefa9ce680d192ddfa3ef456c741c91fb3955f2e414a27dd40ad1e145b8f051b389988 + languageName: node + linkType: hard + +"@vue/compiler-dom@npm:3.5.39": + version: 3.5.39 + resolution: "@vue/compiler-dom@npm:3.5.39" + dependencies: + "@vue/compiler-core": "npm:3.5.39" + "@vue/shared": "npm:3.5.39" + checksum: 10c0/0e3fb865209b918bb59d19d1b9d8349c6474dcae977fb74a264481d9af45f65632752c7ae42a7dd552e9b6de0612678bef4db713a5f8afacaab12e17b1c5bbb6 + languageName: node + linkType: hard + +"@vue/compiler-sfc@npm:2.7.16": + version: 2.7.16 + resolution: "@vue/compiler-sfc@npm:2.7.16" + dependencies: + "@babel/parser": "npm:^7.23.5" + postcss: "npm:^8.4.14" + prettier: "npm:^1.18.2 || ^2.0.0" + source-map: "npm:^0.6.1" + dependenciesMeta: + prettier: + optional: true + checksum: 10c0/eaeeef054c939e6cd7591199e2b998ae33d0afd65dc1b5675b54361f0c657c08ae82945791a1a8ca76762e1c1f8e69a00595daf280b854cbc3370ed5c5a34bcd + languageName: node + linkType: hard + +"@vue/compiler-sfc@npm:^3.5.18": + version: 3.5.39 + resolution: "@vue/compiler-sfc@npm:3.5.39" + dependencies: + "@babel/parser": "npm:^7.29.7" + "@vue/compiler-core": "npm:3.5.39" + "@vue/compiler-dom": "npm:3.5.39" + "@vue/compiler-ssr": "npm:3.5.39" + "@vue/shared": "npm:3.5.39" + estree-walker: "npm:^2.0.2" + magic-string: "npm:^0.30.21" + postcss: "npm:^8.5.15" + source-map-js: "npm:^1.2.1" + checksum: 10c0/1361005ef5b66622c2762211c6a9c96c53a106894b8ac9f7ff4dc9fa99453010ab48cafce45f5f799a599ac0b56abffb4232391abd87397c1a2c16514321fe8f + languageName: node + linkType: hard + +"@vue/compiler-ssr@npm:3.5.39": + version: 3.5.39 + resolution: "@vue/compiler-ssr@npm:3.5.39" + dependencies: + "@vue/compiler-dom": "npm:3.5.39" + "@vue/shared": "npm:3.5.39" + checksum: 10c0/df61df18154d9208795c762044e819b9711726b11fff36b9580fa136f51eae8b80e88c9b34924a23fc3b127f11ccd231124a5f2e7b41696ad9778bfffb167d5a + languageName: node + linkType: hard + +"@vue/component-compiler-utils@npm:^3.1.0, @vue/component-compiler-utils@npm:^3.1.2": + version: 3.3.0 + resolution: "@vue/component-compiler-utils@npm:3.3.0" + dependencies: + consolidate: "npm:^0.15.1" + hash-sum: "npm:^1.0.2" + lru-cache: "npm:^4.1.2" + merge-source-map: "npm:^1.1.0" + postcss: "npm:^7.0.36" + postcss-selector-parser: "npm:^6.0.2" + prettier: "npm:^1.18.2 || ^2.0.0" + source-map: "npm:~0.6.1" + vue-template-es2015-compiler: "npm:^1.9.0" + dependenciesMeta: + prettier: + optional: true + checksum: 10c0/ab471a561c29a307b92d019be9f0404157d7bec4ac5040bffea918db4fadc784765a52d9621bef9330a108eb123d1bcb4c276bf1c53fd6f4ac022739b3b80cbe + languageName: node + linkType: hard + +"@vue/eslint-config-prettier@npm:^6.0.0": + version: 6.0.0 + resolution: "@vue/eslint-config-prettier@npm:6.0.0" + dependencies: + eslint-config-prettier: "npm:^6.0.0" + peerDependencies: + eslint: ">= 5.0.0" + eslint-plugin-prettier: ^3.1.0 + prettier: ">= 1.13.0" + checksum: 10c0/f2bf084dbc9e54ab2655a88654df7bd448ba84e8e04ff3edfe2020ef655782dca6ad6f4bcf3602f6d0d711f4b4667d84433bb23c11a69a2f9c72a424294709b7 + languageName: node + linkType: hard + +"@vue/preload-webpack-plugin@npm:^1.1.0": + version: 1.1.2 + resolution: "@vue/preload-webpack-plugin@npm:1.1.2" + peerDependencies: + html-webpack-plugin: ">=2.26.0" + webpack: ">=4.0.0" + checksum: 10c0/371ab944960413361d7c9610356ba4ae33e0f2706496b23a8d77dc412c2a69bf6490a446c8241d9c1782d2695cc94c0738b29eb62159d1d029ab939ec01be121 + languageName: node + linkType: hard + +"@vue/shared@npm:3.5.39, @vue/shared@npm:^3.5.18": + version: 3.5.39 + resolution: "@vue/shared@npm:3.5.39" + checksum: 10c0/2b8b008ab8c22c84a37d231f47133721ae3469e6054d1aa77eea972440657b344ace1e508ea0e025aa132cb5236dee8a5db8284d0c811fd413b25d43c78dad2f + languageName: node + linkType: hard + +"@vue/web-component-wrapper@npm:^1.2.0": + version: 1.3.0 + resolution: "@vue/web-component-wrapper@npm:1.3.0" + checksum: 10c0/258259f60f4709f1c0372daef8c5a88d9d5e6869304e1390e142c95353c4eadfc1f0422991400cfa1fbcfc5affd4cf69cce7359f98a47d559561dda284421d23 + languageName: node + linkType: hard + +"@webassemblyjs/ast@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/ast@npm:1.9.0" + dependencies: + "@webassemblyjs/helper-module-context": "npm:1.9.0" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0" + "@webassemblyjs/wast-parser": "npm:1.9.0" + checksum: 10c0/8246c714346cdcd3ab204a2b09904d9d36c4f7da8f30cc217b0b7272a3ef57a3c21e95d51b26601641133fb66fea5cc46c357cf897808512f13b3d1c2efe88e4 + languageName: node + linkType: hard + +"@webassemblyjs/floating-point-hex-parser@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0" + checksum: 10c0/17acfdfe6650691ae8d0279e6ff4fb8b5efce64e12f3fa18c6a7d279968cc72eb21c0db7ebb5be9d627d05fa7014cef087843d999de96c917079f57d7dac8f77 + languageName: node + linkType: hard + +"@webassemblyjs/helper-api-error@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-api-error@npm:1.9.0" + checksum: 10c0/892851b25cf4b4b307490328f45858414326dac667ca15244b5e959fa6e22478b29dabeb581d49ef8a2874e291d0417a3a959be70428c39cd40870e73b394dbc + languageName: node + linkType: hard + +"@webassemblyjs/helper-buffer@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-buffer@npm:1.9.0" + checksum: 10c0/b09a3e27d9127ccaab095bd171336e7675bb5b832e05b701ff174a853b763154a49f5382c4c3f2f1cc746b1cff3f2025452145cf807ddf788133bcccf5920ca8 + languageName: node + linkType: hard + +"@webassemblyjs/helper-code-frame@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0" + dependencies: + "@webassemblyjs/wast-printer": "npm:1.9.0" + checksum: 10c0/010969a6c8b016680a9b1383ff4b8147c363608dd1e29602154e5460954af4fd48daed518a76b232ca43935d4b6bebf54fba38da56f809e2bd12f063d84013ec + languageName: node + linkType: hard + +"@webassemblyjs/helper-fsm@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-fsm@npm:1.9.0" + checksum: 10c0/ef0c99b58716d757a1a41f99fb46578d3f07d97b60cd51deaeffdf0aad09ec47f5093ee8d098d12324d57f8812609704c377fccfe9a32d02c0a658a4a33dce94 + languageName: node + linkType: hard + +"@webassemblyjs/helper-module-context@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-module-context@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + checksum: 10c0/130a9ac1141770b9f70ad568ec2dc769e92c756f91b06ece9cda2c2a5e80e21ec9c8c2a945a5839bf379e52fa921ae134245a7492e1b9ae0e8c557bb9b4953c3 + languageName: node + linkType: hard + +"@webassemblyjs/helper-wasm-bytecode@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0" + checksum: 10c0/1741993e1c723f56b619a4981ec975f903886aa3f1f50c7bdb2eaa45ca4ad8d023d6ae7413ef643f060567b1f12a9dcfad6c43688879c46ee4f0b53aa71cd5c9 + languageName: node + linkType: hard + +"@webassemblyjs/helper-wasm-section@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/helper-buffer": "npm:1.9.0" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0" + "@webassemblyjs/wasm-gen": "npm:1.9.0" + checksum: 10c0/2a5baa7749c50a4a428f372ab88b7e52956b48798d44e7291b4aa8558b247337dba791112ce8a4f5b2281e1b9014e6d44d0141476a5fcde6016fac2e009671e8 + languageName: node + linkType: hard + +"@webassemblyjs/ieee754@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/ieee754@npm:1.9.0" + dependencies: + "@xtuc/ieee754": "npm:^1.2.0" + checksum: 10c0/0eff34ec7048400b30282ab9af6ad19d2852dab2f5ffaec8bdc697b8380bc2c9dbe6cadf65f49e68242c82ee3caa8aa6e46c89dbfdab37615189b4da2eab3819 + languageName: node + linkType: hard + +"@webassemblyjs/leb128@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/leb128@npm:1.9.0" + dependencies: + "@xtuc/long": "npm:4.2.2" + checksum: 10c0/441be8634733b33b710f44d4394552d6290bb1a0a8311b384b1865b58c3549d0ddeaf1c3985bbee024a8df12c597be3580fc1cde2ae003dcbf26762b493a7a2f + languageName: node + linkType: hard + +"@webassemblyjs/utf8@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/utf8@npm:1.9.0" + checksum: 10c0/9566689a1bcf555d6b79d0da79e24ff2be23c0395e5a19ed3c2ceca7831e50b867e0b1c66b3ff1b1d7f297b2d2414314967a884a77634ad0acff8a78489e2b19 + languageName: node + linkType: hard + +"@webassemblyjs/wasm-edit@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-edit@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/helper-buffer": "npm:1.9.0" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0" + "@webassemblyjs/helper-wasm-section": "npm:1.9.0" + "@webassemblyjs/wasm-gen": "npm:1.9.0" + "@webassemblyjs/wasm-opt": "npm:1.9.0" + "@webassemblyjs/wasm-parser": "npm:1.9.0" + "@webassemblyjs/wast-printer": "npm:1.9.0" + checksum: 10c0/07f4cb4a73989622c524f9264b6afe664d33354f081499f04db675aed2b79498bd43600c3d7bebcb9f93ccce6a094b3c28f3f7b11ea62e9e82074c2ae68dc058 + languageName: node + linkType: hard + +"@webassemblyjs/wasm-gen@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-gen@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0" + "@webassemblyjs/ieee754": "npm:1.9.0" + "@webassemblyjs/leb128": "npm:1.9.0" + "@webassemblyjs/utf8": "npm:1.9.0" + checksum: 10c0/876826bef91f3af9e48118fb269c348871d5b6f019e071065556da56a3a5818630b00133e07c9dd2cc767e7f2c70934f3ed0060330ce3e37910e9c9df25f1600 + languageName: node + linkType: hard + +"@webassemblyjs/wasm-opt@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-opt@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/helper-buffer": "npm:1.9.0" + "@webassemblyjs/wasm-gen": "npm:1.9.0" + "@webassemblyjs/wasm-parser": "npm:1.9.0" + checksum: 10c0/3d5558e078b660cd9777950f2df60f005f3cbdbcfa6c8c19dc0cf012f44f5bfa97c991d7ac26b3e78596bad0538e92dd00b5db4b51ebc373da8e329a03639190 + languageName: node + linkType: hard + +"@webassemblyjs/wasm-parser@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-parser@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/helper-api-error": "npm:1.9.0" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0" + "@webassemblyjs/ieee754": "npm:1.9.0" + "@webassemblyjs/leb128": "npm:1.9.0" + "@webassemblyjs/utf8": "npm:1.9.0" + checksum: 10c0/1e8615b9f9c3c431c9635c9a9884bca89eff1ab2383ad849341c23e09899454482a8f8813d33bf86ee1b0acc97c7c83926961a9b34d4804fa5d559610ab0a4a2 + languageName: node + linkType: hard + +"@webassemblyjs/wast-parser@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wast-parser@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/floating-point-hex-parser": "npm:1.9.0" + "@webassemblyjs/helper-api-error": "npm:1.9.0" + "@webassemblyjs/helper-code-frame": "npm:1.9.0" + "@webassemblyjs/helper-fsm": "npm:1.9.0" + "@xtuc/long": "npm:4.2.2" + checksum: 10c0/c79952466fdf7816be527b1db102952b777b12318eabb5c40df074cd8361e3a7b0179a985534fa8b5a7b93668b07ba46875ffeb5da03ca5177c80ba960ebdffc + languageName: node + linkType: hard + +"@webassemblyjs/wast-printer@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wast-printer@npm:1.9.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/wast-parser": "npm:1.9.0" + "@xtuc/long": "npm:4.2.2" + checksum: 10c0/f3d106aa884cbb7687307db7adeb3b98abff9de81b9ba8c1065267340b5e9de64ffc533044ab916b1f4ce8a67fb03efa54b29b61c8e908abe4c07edf82f614cd + languageName: node + linkType: hard + +"@xtuc/ieee754@npm:^1.2.0": + version: 1.2.0 + resolution: "@xtuc/ieee754@npm:1.2.0" + checksum: 10c0/a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f + languageName: node + linkType: hard + +"@xtuc/long@npm:4.2.2": + version: 4.2.2 + resolution: "@xtuc/long@npm:4.2.2" + checksum: 10c0/8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1 + languageName: node + linkType: hard + +"abbrev@npm:^5.0.0": + version: 5.0.0 + resolution: "abbrev@npm:5.0.0" + checksum: 10c0/8e88f5c798ea4562d28c5a3e9ad69e3879890bc5d695d8f2dffb8609be4c890aacc8f80ef4553fdd2c6a62d70c2ce8bc57b38074e383beb7487bdafa9ed42ea5 + languageName: node + linkType: hard + +"accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.7": + version: 1.3.7 + resolution: "accepts@npm:1.3.7" + dependencies: + mime-types: "npm:~2.1.24" + negotiator: "npm:0.6.2" + checksum: 10c0/74c5fc6ad208529258916abc240640caa09d577c991f36bc15916a537b6a2e72ef051c204499297bf7e78357d19e86eb989fb81f558d004be44a33fdc17a9057 + languageName: node + linkType: hard + +"acorn-jsx@npm:^5.2.0": + version: 5.3.2 + resolution: "acorn-jsx@npm:5.3.2" + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1 + languageName: node + linkType: hard + +"acorn-walk@npm:^7.1.1": + version: 7.2.0 + resolution: "acorn-walk@npm:7.2.0" + checksum: 10c0/ff99f3406ed8826f7d6ef6ac76b7608f099d45a1ff53229fa267125da1924188dbacf02e7903dfcfd2ae4af46f7be8847dc7d564c73c4e230dfb69c8ea8e6b4c + languageName: node + linkType: hard + +"acorn@npm:^6.4.1": + version: 6.4.2 + resolution: "acorn@npm:6.4.2" + bin: + acorn: bin/acorn + checksum: 10c0/52a72d5d785fa64a95880f2951021a38954f8f69a4944dfeab6fb1449b0f02293eae109a56d55b58ff31a90a00d16a804658a12db8ef834c20b3d1201fe5ba5b + languageName: node + linkType: hard + +"acorn@npm:^7.1.1, acorn@npm:^7.4.0": + version: 7.4.1 + resolution: "acorn@npm:7.4.1" + bin: + acorn: bin/acorn + checksum: 10c0/bd0b2c2b0f334bbee48828ff897c12bd2eb5898d03bf556dcc8942022cec795ac5bb5b6b585e2de687db6231faf07e096b59a361231dd8c9344d5df5f7f0e526 + languageName: node + linkType: hard + +"acorn@npm:^8.5.0": + version: 8.17.0 + resolution: "acorn@npm:8.17.0" + bin: + acorn: bin/acorn + checksum: 10c0/5dcefea5f8f023b6cc24cbe71fb5a8112b601d36c4fa07d14e4e6ffc2ee47383332c46b36c766d9437725aa6660156eae50efa0c838719823b50d7c327c4ed42 + languageName: node + linkType: hard + +"address@npm:^1.1.2": + version: 1.1.2 + resolution: "address@npm:1.1.2" + checksum: 10c0/3ac908133d1d8cc52110473833718e82775428e73b4eb51b42cd7c7f571c7459c28c3c54592231efdcb96f6ed376eb490194e97c533df9e8efb910fa29a34e55 + languageName: node + linkType: hard + +"agent-base@npm:6": + version: 6.0.2 + resolution: "agent-base@npm:6.0.2" + dependencies: + debug: "npm:4" + checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261 + languageName: node + linkType: hard + +"ajv-errors@npm:^1.0.0": + version: 1.0.1 + resolution: "ajv-errors@npm:1.0.1" + peerDependencies: + ajv: ">=5.0.0" + checksum: 10c0/de2d6e8100c8707ea063ee4785d53adf599b457c0d4f72c3592244d67ad16448a6d35f7ce45f12bdd2819939447c876e8ef2f1c0800896d7f2aa25c3838acdf1 + languageName: node + linkType: hard + +"ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2": + version: 3.5.2 + resolution: "ajv-keywords@npm:3.5.2" + peerDependencies: + ajv: ^6.9.1 + checksum: 10c0/0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360 + languageName: node + linkType: hard + +"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.3, ajv@npm:^6.12.4": + version: 6.12.6 + resolution: "ajv@npm:6.12.6" + dependencies: + fast-deep-equal: "npm:^3.1.1" + fast-json-stable-stringify: "npm:^2.0.0" + json-schema-traverse: "npm:^0.4.1" + uri-js: "npm:^4.2.2" + checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71 + languageName: node + linkType: hard + +"ajv@npm:^6.12.5": + version: 6.14.0 + resolution: "ajv@npm:6.14.0" + dependencies: + fast-deep-equal: "npm:^3.1.1" + fast-json-stable-stringify: "npm:^2.0.0" + json-schema-traverse: "npm:^0.4.1" + uri-js: "npm:^4.2.2" + checksum: 10c0/a2bc39b0555dc9802c899f86990eb8eed6e366cddbf65be43d5aa7e4f3c4e1a199d5460fd7ca4fb3d864000dbbc049253b72faa83b3b30e641ca52cb29a68c22 + languageName: node + linkType: hard + +"alphanum-sort@npm:^1.0.0": + version: 1.0.2 + resolution: "alphanum-sort@npm:1.0.2" + checksum: 10c0/2944e7ae4d36328a2df071017c01cd1d06ef6a5d87c8fbbeffd9075d42f4da48051bde79a5e3d863b98f37778c76e8eebd4353c1e7bbba2480382096953ec2b8 + languageName: node + linkType: hard + +"ansi-colors@npm:^3.0.0": + version: 3.2.4 + resolution: "ansi-colors@npm:3.2.4" + checksum: 10c0/1785466547bac3b1cb8055325a415c8c946a818669da4fd3d1247cab7617b845b221c2ae04756277074d278b52d90efd67f73d2dd927c7a0d1a10395c1b7665b + languageName: node + linkType: hard + +"ansi-escapes@npm:^4.2.1": + version: 4.3.2 + resolution: "ansi-escapes@npm:4.3.2" + dependencies: + type-fest: "npm:^0.21.3" + checksum: 10c0/da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50 + languageName: node + linkType: hard + +"ansi-html@npm:0.0.7": + version: 0.0.7 + resolution: "ansi-html@npm:0.0.7" + bin: + ansi-html: ./bin/ansi-html + checksum: 10c0/f6d3072422dc8d4c795142fd4ee8ee596538ddd02ac23676ec6c61dc61c1149f61acfc651b28ff49e7828a6372d4adab2d94d14e95feff73f656388803e13929 + languageName: node + linkType: hard + +"ansi-regex@npm:^2.0.0": + version: 2.1.1 + resolution: "ansi-regex@npm:2.1.1" + checksum: 10c0/78cebaf50bce2cb96341a7230adf28d804611da3ce6bf338efa7b72f06cc6ff648e29f80cd95e582617ba58d5fdbec38abfeed3500a98bce8381a9daec7c548b + languageName: node + linkType: hard + +"ansi-regex@npm:^4.1.0": + version: 4.1.0 + resolution: "ansi-regex@npm:4.1.0" + checksum: 10c0/a10376bc12035b0b40f036d3e544d92f9e6a525bc7cd65f71e108c0965d74f777e0eef47a6d0bfbdec1d835df1edf0410516a39525d2d89ce9547eb47644d681 + languageName: node + linkType: hard + +"ansi-regex@npm:^5.0.0": + version: 5.0.0 + resolution: "ansi-regex@npm:5.0.0" + checksum: 10c0/4c711eeec7ab00c1869e926ae78758abd10137047cbb08b6fda499be2dc39c2d5f21e15c7279dbb222de523b53834b54043d4997191f62372d5e2250edcbc83a + languageName: node + linkType: hard + +"ansi-regex@npm:^5.0.1": + version: 5.0.1 + resolution: "ansi-regex@npm:5.0.1" + checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737 + languageName: node + linkType: hard + +"ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1": + version: 3.2.1 + resolution: "ansi-styles@npm:3.2.1" + dependencies: + color-convert: "npm:^1.9.0" + checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b + languageName: node + linkType: hard + +"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0": + version: 4.3.0 + resolution: "ansi-styles@npm:4.3.0" + dependencies: + color-convert: "npm:^2.0.1" + checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041 + languageName: node + linkType: hard + +"any-promise@npm:^1.0.0": + version: 1.3.0 + resolution: "any-promise@npm:1.3.0" + checksum: 10c0/60f0298ed34c74fef50daab88e8dab786036ed5a7fad02e012ab57e376e0a0b4b29e83b95ea9b5e7d89df762f5f25119b83e00706ecaccb22cfbacee98d74889 + languageName: node + linkType: hard + +"anymatch@npm:^2.0.0": + version: 2.0.0 + resolution: "anymatch@npm:2.0.0" + dependencies: + micromatch: "npm:^3.1.4" + normalize-path: "npm:^2.1.1" + checksum: 10c0/a0d745e52f0233048724b9c9d7b1d8a650f7a50151a0f1d2cce1857b09fd096052d334f8c570cc88596edef8249ae778f767db94025cd00f81e154a37bb7e34e + languageName: node + linkType: hard + +"anymatch@npm:^3.0.0, anymatch@npm:~3.1.2": + version: 3.1.2 + resolution: "anymatch@npm:3.1.2" + dependencies: + normalize-path: "npm:^3.0.0" + picomatch: "npm:^2.0.4" + checksum: 10c0/900645535aee46ed7958f4f5b5e38abcbf474b5230406e913de15fc9a1310f0d5322775deb609688efe31010fa57831e55d36040b19826c22ce61d537e9b9759 + languageName: node + linkType: hard + +"aproba@npm:^1.1.1": + version: 1.2.0 + resolution: "aproba@npm:1.2.0" + checksum: 10c0/2d34f008c9edfa991f42fe4b667d541d38a474a39ae0e24805350486d76744cd91ee45313283c1d39a055b14026dd0fc4d0cbfc13f210855d59d7e8b5a61dc51 + languageName: node + linkType: hard + +"arch@npm:^2.1.1": + version: 2.2.0 + resolution: "arch@npm:2.2.0" + checksum: 10c0/4ceaf8d8207817c216ebc4469742052cb0a097bc45d9b7fcd60b7507220da545a28562ab5bdd4dfe87921bb56371a0805da4e10d704e01f93a15f83240f1284c + languageName: node + linkType: hard + +"argparse@npm:^1.0.7": + version: 1.0.10 + resolution: "argparse@npm:1.0.10" + dependencies: + sprintf-js: "npm:~1.0.2" + checksum: 10c0/b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de + languageName: node + linkType: hard + +"arr-diff@npm:^4.0.0": + version: 4.0.0 + resolution: "arr-diff@npm:4.0.0" + checksum: 10c0/67b80067137f70c89953b95f5c6279ad379c3ee39f7143578e13bd51580a40066ee2a55da066e22d498dce10f68c2d70056d7823f972fab99dfbf4c78d0bc0f7 + languageName: node + linkType: hard + +"arr-flatten@npm:^1.1.0": + version: 1.1.0 + resolution: "arr-flatten@npm:1.1.0" + checksum: 10c0/bef53be02ed3bc58f202b3861a5b1eb6e1ae4fecf39c3ad4d15b1e0433f941077d16e019a33312d820844b0661777322acbb7d0c447b04d9bdf7d6f9c532548a + languageName: node + linkType: hard + +"arr-union@npm:^3.1.0": + version: 3.1.0 + resolution: "arr-union@npm:3.1.0" + checksum: 10c0/7d5aa05894e54aa93c77c5726c1dd5d8e8d3afe4f77983c0aa8a14a8a5cbe8b18f0cf4ecaa4ac8c908ef5f744d2cbbdaa83fd6e96724d15fea56cfa7f5efdd51 + languageName: node + linkType: hard + +"array-flatten@npm:1.1.1": + version: 1.1.1 + resolution: "array-flatten@npm:1.1.1" + checksum: 10c0/806966c8abb2f858b08f5324d9d18d7737480610f3bd5d3498aaae6eb5efdc501a884ba019c9b4a8f02ff67002058749d05548fd42fa8643f02c9c7f22198b91 + languageName: node + linkType: hard + +"array-flatten@npm:^2.1.0": + version: 2.1.2 + resolution: "array-flatten@npm:2.1.2" + checksum: 10c0/bdc1cee68e41bec9cfc1161408734e2269428ef371445606bce4e6241001e138a94b9a617cc9a5b4b7fe6a3a51e3d5a942646975ce82a2e202ccf3e9b478c82f + languageName: node + linkType: hard + +"array-union@npm:^1.0.1, array-union@npm:^1.0.2": + version: 1.0.2 + resolution: "array-union@npm:1.0.2" + dependencies: + array-uniq: "npm:^1.0.1" + checksum: 10c0/18686767c0cfdae8dc4acf5ac119b0f0eacad82b7fcc0aa62cc41f93c5ad406d494b6a6e53d85e52e8f0349b67a4fec815feeb537e95c02510d747bc9a4157c7 + languageName: node + linkType: hard + +"array-uniq@npm:^1.0.1": + version: 1.0.3 + resolution: "array-uniq@npm:1.0.3" + checksum: 10c0/3acbaf9e6d5faeb1010e2db04ab171b8d265889e46c61762e502979bdc5e55656013726e9a61507de3c82d329a0dc1e8072630a3454b4f2b881cb19ba7fd8aa6 + languageName: node + linkType: hard + +"array-unique@npm:^0.3.2": + version: 0.3.2 + resolution: "array-unique@npm:0.3.2" + checksum: 10c0/dbf4462cdba8a4b85577be07705210b3d35be4b765822a3f52962d907186617638ce15e0603a4fefdcf82f4cbbc9d433f8cbbd6855148a68872fa041b6474121 + languageName: node + linkType: hard + +"asn1.js@npm:^5.2.0": + version: 5.4.1 + resolution: "asn1.js@npm:5.4.1" + dependencies: + bn.js: "npm:^4.0.0" + inherits: "npm:^2.0.1" + minimalistic-assert: "npm:^1.0.0" + safer-buffer: "npm:^2.1.0" + checksum: 10c0/b577232fa6069cc52bb128e564002c62b2b1fe47f7137bdcd709c0b8495aa79cee0f8cc458a831b2d8675900eea0d05781b006be5e1aa4f0ae3577a73ec20324 + languageName: node + linkType: hard + +"asn1@npm:~0.2.3": + version: 0.2.4 + resolution: "asn1@npm:0.2.4" + dependencies: + safer-buffer: "npm:~2.1.0" + checksum: 10c0/cdd85010a393ec7b88b127c879a0a580f65ea5f919605e5264bc70cefaa295e9ecb1cfe045fbd76f3dbbea9ee6ab4acd750ae81b39994c61a7e80645b0cbdc42 + languageName: node + linkType: hard + +"assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0": + version: 1.0.0 + resolution: "assert-plus@npm:1.0.0" + checksum: 10c0/b194b9d50c3a8f872ee85ab110784911e696a4d49f7ee6fc5fb63216dedbefd2c55999c70cb2eaeb4cf4a0e0338b44e9ace3627117b5bf0d42460e9132f21b91 + languageName: node + linkType: hard + +"assert@npm:^1.1.1": + version: 1.5.0 + resolution: "assert@npm:1.5.0" + dependencies: + object-assign: "npm:^4.1.1" + util: "npm:0.10.3" + checksum: 10c0/188da37d63be479a3b14657c01080db90cdf7fa004e346af916cf8beebcaffb11359c596d0c9c3cd8174c9125a6225796ef1ce533487edc97f8ce3b18c1ab590 + languageName: node + linkType: hard + +"assign-symbols@npm:^1.0.0": + version: 1.0.0 + resolution: "assign-symbols@npm:1.0.0" + checksum: 10c0/29a654b8a6da6889a190d0d0efef4b1bfb5948fa06cbc245054aef05139f889f2f7c75b989917e3fde853fc4093b88048e4de8578a73a76f113d41bfd66e5775 + languageName: node + linkType: hard + +"astral-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "astral-regex@npm:1.0.0" + checksum: 10c0/ca460207a19d84c65671e1a85940101522d42f31a450cdb8f93b3464e6daeaf4b58a362826a6c11c57e6cd1976403d197abb0447cfc2087993a29b35c6d63b63 + languageName: node + linkType: hard + +"async-each@npm:^1.0.1": + version: 1.0.3 + resolution: "async-each@npm:1.0.3" + checksum: 10c0/d5f0ed24792d04b747f667fdcc92c7e6972da1252525a942119f468e629adba1e235df8b8a8e75776e6c7b18ef04d68db7295350bfa1a958457b34faa9a3bd65 + languageName: node + linkType: hard + +"async-limiter@npm:~1.0.0": + version: 1.0.1 + resolution: "async-limiter@npm:1.0.1" + checksum: 10c0/0693d378cfe86842a70d4c849595a0bb50dc44c11649640ca982fa90cbfc74e3cc4753b5a0847e51933f2e9c65ce8e05576e75e5e1fd963a086e673735b35969 + languageName: node + linkType: hard + +"async@npm:^2.6.2": + version: 2.6.3 + resolution: "async@npm:2.6.3" + dependencies: + lodash: "npm:^4.17.14" + checksum: 10c0/06c917c74a55f9036ff79dedfc51dfc9c52c2dee2f80866b600495d2fd3037251dbcfde6592f23fc47398c44d844174004e0ee532f94c32a888bb89fd1cf0f25 + languageName: node + linkType: hard + +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d + languageName: node + linkType: hard + +"atob@npm:^2.1.2": + version: 2.1.2 + resolution: "atob@npm:2.1.2" + bin: + atob: bin/atob.js + checksum: 10c0/ada635b519dc0c576bb0b3ca63a73b50eefacf390abb3f062558342a8d68f2db91d0c8db54ce81b0d89de3b0f000de71f3ae7d761fd7d8cc624278fe443d6c7e + languageName: node + linkType: hard + +"autoprefixer@npm:^9.8.6": + version: 9.8.6 + resolution: "autoprefixer@npm:9.8.6" + dependencies: + browserslist: "npm:^4.12.0" + caniuse-lite: "npm:^1.0.30001109" + colorette: "npm:^1.2.1" + normalize-range: "npm:^0.1.2" + num2fraction: "npm:^1.2.2" + postcss: "npm:^7.0.32" + postcss-value-parser: "npm:^4.1.0" + bin: + autoprefixer: bin/autoprefixer + checksum: 10c0/cf4451009a00d5b0d3f85e9716ff01bf822e230913403cafa20a66a9c02fe39fe758d2d5e62dab2611e7253858437a43405bba63defa6b895f1377fa60a3d307 + languageName: node + linkType: hard + +"await-to-js@npm:^3.0.0": + version: 3.0.0 + resolution: "await-to-js@npm:3.0.0" + checksum: 10c0/1e6184cf4090acf24f6573a475901623ec25df494a3e4b9c27eab9cd4a9f1c0bdb8150c41dbb98e719fd2513dbf32ab8cb88d2ac2c2c4c2fa57024e82128a3db + languageName: node + linkType: hard + +"aws-sign2@npm:~0.7.0": + version: 0.7.0 + resolution: "aws-sign2@npm:0.7.0" + checksum: 10c0/021d2cc5547d4d9ef1633e0332e746a6f447997758b8b68d6fb33f290986872d2bff5f0c37d5832f41a7229361f093cd81c40898d96ed153493c0fb5cd8575d2 + languageName: node + linkType: hard + +"aws4@npm:^1.8.0": + version: 1.11.0 + resolution: "aws4@npm:1.11.0" + checksum: 10c0/00c32a5dc0f864a731e26406fa7d51595e09359dd8f9c813fa3122e3833f564bf95b78cdf6acf8b5d0462403d7c73ce5f22ad19050d75b17019c7978f970c4fa + languageName: node + linkType: hard + +"axios@npm:^1.18.1": + version: 1.20.0 + resolution: "axios@npm:1.20.0" + dependencies: + follow-redirects: "npm:^1.16.0" + form-data: "npm:^4.0.6" + https-proxy-agent: "npm:^5.0.1" + proxy-from-env: "npm:^2.1.0" + checksum: 10c0/976088acf532286356f4c2e65df1ef47ba7da3936d83e928d0d64357bbf5370456abd3eb5826c15df322335fcb1fe200d4a84b4fcf20ffccdd63b40d80fa495c + languageName: node + linkType: hard + +"babel-loader@npm:^8.1.0": + version: 8.2.2 + resolution: "babel-loader@npm:8.2.2" + dependencies: + find-cache-dir: "npm:^3.3.1" + loader-utils: "npm:^1.4.0" + make-dir: "npm:^3.1.0" + schema-utils: "npm:^2.6.5" + peerDependencies: + "@babel/core": ^7.0.0 + webpack: ">=2" + checksum: 10c0/c4e1e042af99a0c1ed83d4a9e3436c333b66a10459561eff921ebe274d75425b649cc317e1389a149931f29c5b03a5a46acc1daeb849d10582ce2bb65f697a5f + languageName: node + linkType: hard + +"babel-plugin-dynamic-import-node@npm:^2.3.3": + version: 2.3.3 + resolution: "babel-plugin-dynamic-import-node@npm:2.3.3" + dependencies: + object.assign: "npm:^4.1.0" + checksum: 10c0/1bd80df981e1fc1aff0cd4e390cf27aaa34f95f7620cd14dff07ba3bad56d168c098233a7d2deb2c9b1dc13643e596a6b94fc608a3412ee3c56e74a25cd2167e + languageName: node + linkType: hard + +"babel-plugin-polyfill-corejs2@npm:^0.4.14, babel-plugin-polyfill-corejs2@npm:^0.4.15": + version: 0.4.17 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.17" + dependencies: + "@babel/compat-data": "npm:^7.28.6" + "@babel/helper-define-polyfill-provider": "npm:^0.6.8" + semver: "npm:^6.3.1" + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 10c0/1284960ea403c63b0dd598f338666c4b17d489aefee30b4da6a7313eff1d91edffb0ccf26341a6e5d94231684b74e016eade66b3921ea112f8b0e4980fa08a5c + languageName: node + linkType: hard + +"babel-plugin-polyfill-corejs3@npm:^0.13.0": + version: 0.13.0 + resolution: "babel-plugin-polyfill-corejs3@npm:0.13.0" + dependencies: + "@babel/helper-define-polyfill-provider": "npm:^0.6.5" + core-js-compat: "npm:^3.43.0" + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 10c0/5d8e228da425edc040d8c868486fd01ba10b0440f841156a30d9f8986f330f723e2ee61553c180929519563ef5b64acce2caac36a5a847f095d708dda5d8206d + languageName: node + linkType: hard + +"babel-plugin-polyfill-corejs3@npm:^0.14.0": + version: 0.14.2 + resolution: "babel-plugin-polyfill-corejs3@npm:0.14.2" + dependencies: + "@babel/helper-define-polyfill-provider": "npm:^0.6.8" + core-js-compat: "npm:^3.48.0" + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 10c0/32f70442f142d0f5607f4b57c121c573b106e09da8659c0f03108a85bf1d09ba5bdc89595a82b34ff76c19f1faf3d1c831b56166f03babf69c024f36da77c3bf + languageName: node + linkType: hard + +"babel-plugin-polyfill-regenerator@npm:^0.6.5, babel-plugin-polyfill-regenerator@npm:^0.6.6": + version: 0.6.8 + resolution: "babel-plugin-polyfill-regenerator@npm:0.6.8" + dependencies: + "@babel/helper-define-polyfill-provider": "npm:^0.6.8" + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 10c0/7c8b2497c29fa880e0acdc8e7b93e29b81b154179b83beb0476eb2c4e7a78b6b42fc35c2554ca250c9bd6d39941eaf75416254b8592ce50979f9a12e1d51c049 + languageName: node + linkType: hard + +"balanced-match@npm:^1.0.0": + version: 1.0.2 + resolution: "balanced-match@npm:1.0.2" + checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee + languageName: node + linkType: hard + +"base64-js@npm:^1.0.2": + version: 1.5.1 + resolution: "base64-js@npm:1.5.1" + checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf + languageName: node + linkType: hard + +"base@npm:^0.11.1": + version: 0.11.2 + resolution: "base@npm:0.11.2" + dependencies: + cache-base: "npm:^1.0.1" + class-utils: "npm:^0.3.5" + component-emitter: "npm:^1.2.1" + define-property: "npm:^1.0.0" + isobject: "npm:^3.0.1" + mixin-deep: "npm:^1.2.0" + pascalcase: "npm:^0.1.1" + checksum: 10c0/30a2c0675eb52136b05ef496feb41574d9f0bb2d6d677761da579c00a841523fccf07f1dbabec2337b5f5750f428683b8ca60d89e56a1052c4ae1c0cd05de64d + languageName: node + linkType: hard + +"baseline-browser-mapping@npm:^2.10.38": + version: 2.10.40 + resolution: "baseline-browser-mapping@npm:2.10.40" + bin: + baseline-browser-mapping: dist/cli.cjs + checksum: 10c0/5d3547aa9333b71f6239db89ef9d4aaf32ec0ee6cfa307025842722b5d225026995185ae4fc1e12e84a22199c905411bf3cce8076ae0a445b342982eb025171e + languageName: node + linkType: hard + +"batch@npm:0.6.1": + version: 0.6.1 + resolution: "batch@npm:0.6.1" + checksum: 10c0/925a13897b4db80d4211082fe287bcf96d297af38e26448c857cee3e095c9792e3b8f26b37d268812e7f38a589f694609de8534a018b1937d7dc9f84e6b387c5 + languageName: node + linkType: hard + +"bcrypt-pbkdf@npm:^1.0.0": + version: 1.0.2 + resolution: "bcrypt-pbkdf@npm:1.0.2" + dependencies: + tweetnacl: "npm:^0.14.3" + checksum: 10c0/ddfe85230b32df25aeebfdccfbc61d3bc493ace49c884c9c68575de1f5dcf733a5d7de9def3b0f318b786616b8d85bad50a28b1da1750c43e0012c93badcc148 + languageName: node + linkType: hard + +"bfj@npm:^6.1.1": + version: 6.1.2 + resolution: "bfj@npm:6.1.2" + dependencies: + bluebird: "npm:^3.5.5" + check-types: "npm:^8.0.3" + hoopy: "npm:^0.1.4" + tryer: "npm:^1.0.1" + checksum: 10c0/b3aa02a4ec4d2dea3f64e6c4d7af67bda580574fafef8f819acc3e54a2f5e8b553ad8250f83d5e02d837d96be19cce855560b742635f2875f1a0ceceb304dfad + languageName: node + linkType: hard + +"big.js@npm:^3.1.3": + version: 3.2.0 + resolution: "big.js@npm:3.2.0" + checksum: 10c0/de0b8e275171060a37846b521e8ebfe077c650532306c2470474da6720feb04351cc8588ef26088756b224923782946ae67e817b90122cc85692bbda7ccd2d0d + languageName: node + linkType: hard + +"big.js@npm:^5.2.2": + version: 5.2.2 + resolution: "big.js@npm:5.2.2" + checksum: 10c0/230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f + languageName: node + linkType: hard + +"binary-extensions@npm:^1.0.0": + version: 1.13.1 + resolution: "binary-extensions@npm:1.13.1" + checksum: 10c0/2d616938ac23d828ec3fbe0dea429b566fd2c137ddc38f166f16561ccd58029deac3fa9fddb489ab13d679c8fb5f1bd0e82824041299e5e39d8dd3cc68fbb9f9 + languageName: node + linkType: hard + +"binary-extensions@npm:^2.0.0": + version: 2.2.0 + resolution: "binary-extensions@npm:2.2.0" + checksum: 10c0/d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d + languageName: node + linkType: hard + +"bindings@npm:^1.5.0": + version: 1.5.0 + resolution: "bindings@npm:1.5.0" + dependencies: + file-uri-to-path: "npm:1.0.0" + checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba + languageName: node + linkType: hard + +"bluebird@npm:^3.1.1, bluebird@npm:^3.5.5": + version: 3.7.2 + resolution: "bluebird@npm:3.7.2" + checksum: 10c0/680de03adc54ff925eaa6c7bb9a47a0690e8b5de60f4792604aae8ed618c65e6b63a7893b57ca924beaf53eee69c5af4f8314148c08124c550fe1df1add897d2 + languageName: node + linkType: hard + +"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9": + version: 4.12.0 + resolution: "bn.js@npm:4.12.0" + checksum: 10c0/9736aaa317421b6b3ed038ff3d4491935a01419ac2d83ddcfebc5717385295fcfcf0c57311d90fe49926d0abbd7a9dbefdd8861e6129939177f7e67ebc645b21 + languageName: node + linkType: hard + +"bn.js@npm:^5.0.0, bn.js@npm:^5.1.1": + version: 5.2.0 + resolution: "bn.js@npm:5.2.0" + checksum: 10c0/67e17b1934d9c7a73aed9b89222dc8c1c8e3aff46cca6609b8c2ab04fa22c6b8db42c7774b039d09fa63136d8866b777ab88af0d64d8ea3839a94e69193a6b13 + languageName: node + linkType: hard + +"body-parser@npm:1.19.0": + version: 1.19.0 + resolution: "body-parser@npm:1.19.0" + dependencies: + bytes: "npm:3.1.0" + content-type: "npm:~1.0.4" + debug: "npm:2.6.9" + depd: "npm:~1.1.2" + http-errors: "npm:1.7.2" + iconv-lite: "npm:0.4.24" + on-finished: "npm:~2.3.0" + qs: "npm:6.7.0" + raw-body: "npm:2.4.0" + type-is: "npm:~1.6.17" + checksum: 10c0/df97c94a16495db166dba4c7812a43ba800ea252a76a1de80be944e2b884b808897febb920880c30089ac01f74f9118ca589402294c0ea5e2075488e4f91dc09 + languageName: node + linkType: hard + +"bonjour@npm:^3.5.0": + version: 3.5.0 + resolution: "bonjour@npm:3.5.0" + dependencies: + array-flatten: "npm:^2.1.0" + deep-equal: "npm:^1.0.1" + dns-equal: "npm:^1.0.0" + dns-txt: "npm:^2.0.2" + multicast-dns: "npm:^6.0.1" + multicast-dns-service-types: "npm:^1.1.0" + checksum: 10c0/0be7c4cd96df563571973706226e750f6feeacd81d01c1ade11247eb3a7e14846af49cffe397ab970059b828dd89f694f456e22bca4ca315a7f0326e9303e241 + languageName: node + linkType: hard + +"boolbase@npm:^1.0.0, boolbase@npm:~1.0.0": + version: 1.0.0 + resolution: "boolbase@npm:1.0.0" + checksum: 10c0/e4b53deb4f2b85c52be0e21a273f2045c7b6a6ea002b0e139c744cb6f95e9ec044439a52883b0d74dedd1ff3da55ed140cfdddfed7fb0cccbed373de5dce1bcf + languageName: node + linkType: hard + +"brace-expansion@npm:^1.1.7": + version: 1.1.11 + resolution: "brace-expansion@npm:1.1.11" + dependencies: + balanced-match: "npm:^1.0.0" + concat-map: "npm:0.0.1" + checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668 + languageName: node + linkType: hard + +"braces@npm:^2.3.1, braces@npm:^2.3.2": + version: 2.3.2 + resolution: "braces@npm:2.3.2" + dependencies: + arr-flatten: "npm:^1.1.0" + array-unique: "npm:^0.3.2" + extend-shallow: "npm:^2.0.1" + fill-range: "npm:^4.0.0" + isobject: "npm:^3.0.1" + repeat-element: "npm:^1.1.2" + snapdragon: "npm:^0.8.1" + snapdragon-node: "npm:^2.0.1" + split-string: "npm:^3.0.2" + to-regex: "npm:^3.0.1" + checksum: 10c0/72b27ea3ea2718f061c29e70fd6e17606e37c65f5801abddcf0b0052db1de7d60f3bf92cfc220ab57b44bd0083a5f69f9d03b3461d2816cfe9f9398207acc728 + languageName: node + linkType: hard + +"braces@npm:^3.0.1, braces@npm:~3.0.2": + version: 3.0.2 + resolution: "braces@npm:3.0.2" + dependencies: + fill-range: "npm:^7.0.1" + checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381 + languageName: node + linkType: hard + +"brorand@npm:^1.0.1, brorand@npm:^1.1.0": + version: 1.1.0 + resolution: "brorand@npm:1.1.0" + checksum: 10c0/6f366d7c4990f82c366e3878492ba9a372a73163c09871e80d82fb4ae0d23f9f8924cb8a662330308206e6b3b76ba1d528b4601c9ef73c2166b440b2ea3b7571 + languageName: node + linkType: hard + +"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4": + version: 1.2.0 + resolution: "browserify-aes@npm:1.2.0" + dependencies: + buffer-xor: "npm:^1.0.3" + cipher-base: "npm:^1.0.0" + create-hash: "npm:^1.1.0" + evp_bytestokey: "npm:^1.0.3" + inherits: "npm:^2.0.1" + safe-buffer: "npm:^5.0.1" + checksum: 10c0/967f2ae60d610b7b252a4cbb55a7a3331c78293c94b4dd9c264d384ca93354c089b3af9c0dd023534efdc74ffbc82510f7ad4399cf82bc37bc07052eea485f18 + languageName: node + linkType: hard + +"browserify-cipher@npm:^1.0.0": + version: 1.0.1 + resolution: "browserify-cipher@npm:1.0.1" + dependencies: + browserify-aes: "npm:^1.0.4" + browserify-des: "npm:^1.0.0" + evp_bytestokey: "npm:^1.0.0" + checksum: 10c0/aa256dcb42bc53a67168bbc94ab85d243b0a3b56109dee3b51230b7d010d9b78985ffc1fb36e145c6e4db151f888076c1cfc207baf1525d3e375cbe8187fe27d + languageName: node + linkType: hard + +"browserify-des@npm:^1.0.0": + version: 1.0.2 + resolution: "browserify-des@npm:1.0.2" + dependencies: + cipher-base: "npm:^1.0.1" + des.js: "npm:^1.0.0" + inherits: "npm:^2.0.1" + safe-buffer: "npm:^5.1.2" + checksum: 10c0/943eb5d4045eff80a6cde5be4e5fbb1f2d5002126b5a4789c3c1aae3cdddb1eb92b00fb92277f512288e5c6af330730b1dbabcf7ce0923e749e151fcee5a074d + languageName: node + linkType: hard + +"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1": + version: 4.1.0 + resolution: "browserify-rsa@npm:4.1.0" + dependencies: + bn.js: "npm:^5.0.0" + randombytes: "npm:^2.0.1" + checksum: 10c0/fb2b5a8279d8a567a28d8ee03fb62e448428a906bab5c3dc9e9c3253ace551b5ea271db15e566ac78f1b1d71b243559031446604168b9235c351a32cae99d02a + languageName: node + linkType: hard + +"browserify-sign@npm:^4.0.0": + version: 4.2.1 + resolution: "browserify-sign@npm:4.2.1" + dependencies: + bn.js: "npm:^5.1.1" + browserify-rsa: "npm:^4.0.1" + create-hash: "npm:^1.2.0" + create-hmac: "npm:^1.1.7" + elliptic: "npm:^6.5.3" + inherits: "npm:^2.0.4" + parse-asn1: "npm:^5.1.5" + readable-stream: "npm:^3.6.0" + safe-buffer: "npm:^5.2.0" + checksum: 10c0/8f00a370e3e97060977dc58e51251d3ca398ee73523994a44430321e8de2c7d85395362d59014b2b07efe4190f369baee2ff28eb8f405ff4660b776651cf052d + languageName: node + linkType: hard + +"browserify-zlib@npm:^0.2.0": + version: 0.2.0 + resolution: "browserify-zlib@npm:0.2.0" + dependencies: + pako: "npm:~1.0.5" + checksum: 10c0/9ab10b6dc732c6c5ec8ebcbe5cb7fe1467f97402c9b2140113f47b5f187b9438f93a8e065d8baf8b929323c18324fbf1105af479ee86d9d36cab7d7ef3424ad9 + languageName: node + linkType: hard + +"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.16.6": + version: 4.16.6 + resolution: "browserslist@npm:4.16.6" + dependencies: + caniuse-lite: "npm:^1.0.30001219" + colorette: "npm:^1.2.2" + electron-to-chromium: "npm:^1.3.723" + escalade: "npm:^3.1.1" + node-releases: "npm:^1.1.71" + bin: + browserslist: cli.js + checksum: 10c0/785883ec44b157f45903b52da2355f87e40dec3d888e5f3ebb559934728ca3744d6d501c5b0e696433844cdc623929f812837fdfa08455955fe01453a873543e + languageName: node + linkType: hard + +"browserslist@npm:^4.24.0, browserslist@npm:^4.28.1": + version: 4.28.4 + resolution: "browserslist@npm:4.28.4" + dependencies: + baseline-browser-mapping: "npm:^2.10.38" + caniuse-lite: "npm:^1.0.30001799" + electron-to-chromium: "npm:^1.5.376" + node-releases: "npm:^2.0.48" + update-browserslist-db: "npm:^1.2.3" + bin: + browserslist: cli.js + checksum: 10c0/d86f7319c0e3243ca5122335a98b9de8e007fb10fb5643e5f3ed69428fe81ee8646cf1a7663bcfb65bdfddbe505d39406da7ce30052e65c99df9d02336635a7c + languageName: node + linkType: hard + +"buffer-from@npm:^1.0.0": + version: 1.1.1 + resolution: "buffer-from@npm:1.1.1" + checksum: 10c0/a8c5057c985d8071e7a64988ad72f313e08eb3001eda76bead78b1f9afc7a07d20be9677eed0b5791727baeecd56360fe541bc5dd74feb40efe202a74584d533 + languageName: node + linkType: hard + +"buffer-indexof@npm:^1.0.0": + version: 1.1.1 + resolution: "buffer-indexof@npm:1.1.1" + checksum: 10c0/67906b0a9892854e24ac717ef823c3b19790c653a8b1902835bbf3c3c46ea8d99f0680a92f7394fc5acbbecb3385775ccd504ea00587d2d67d8dfaadd460eeae + languageName: node + linkType: hard + +"buffer-json@npm:^2.0.0": + version: 2.0.0 + resolution: "buffer-json@npm:2.0.0" + checksum: 10c0/89c9fe7465426309aa54fbad1f8d76b78bfe94a404744877d77422cc910c88d8203184d7fda0b69b64fd157af88db82ff8128dbd9634bf88f3a0f2d17d1e95ec + languageName: node + linkType: hard + +"buffer-xor@npm:^1.0.3": + version: 1.0.3 + resolution: "buffer-xor@npm:1.0.3" + checksum: 10c0/fd269d0e0bf71ecac3146187cfc79edc9dbb054e2ee69b4d97dfb857c6d997c33de391696d04bdd669272751fa48e7872a22f3a6c7b07d6c0bc31dbe02a4075c + languageName: node + linkType: hard + +"buffer@npm:^4.3.0": + version: 4.9.2 + resolution: "buffer@npm:4.9.2" + dependencies: + base64-js: "npm:^1.0.2" + ieee754: "npm:^1.1.4" + isarray: "npm:^1.0.0" + checksum: 10c0/dc443d7e7caab23816b58aacdde710b72f525ad6eecd7d738fcaa29f6d6c12e8d9c13fed7219fd502be51ecf0615f5c077d4bdc6f9308dde2e53f8e5393c5b21 + languageName: node + linkType: hard + +"builtin-status-codes@npm:^3.0.0": + version: 3.0.0 + resolution: "builtin-status-codes@npm:3.0.0" + checksum: 10c0/c37bbba11a34c4431e56bd681b175512e99147defbe2358318d8152b3a01df7bf25e0305873947e5b350073d5ef41a364a22b37e48f1fb6d2fe6d5286a0f348c + languageName: node + linkType: hard + +"bytes@npm:3.0.0": + version: 3.0.0 + resolution: "bytes@npm:3.0.0" + checksum: 10c0/91d42c38601c76460519ffef88371caacaea483a354c8e4b8808e7b027574436a5713337c003ea3de63ee4991c2a9a637884fdfe7f761760d746929d9e8fec60 + languageName: node + linkType: hard + +"bytes@npm:3.1.0": + version: 3.1.0 + resolution: "bytes@npm:3.1.0" + checksum: 10c0/7034f475b006b9a8a37c7ecaa0947d0be181feb6d3d5231984e4c14e01c587a47e0fe85f66c630689fa6a046cfa498b6891f5af8022357e52db09365f1dfb625 + languageName: node + linkType: hard + +"cacache@npm:^12.0.2, cacache@npm:^12.0.3": + version: 12.0.4 + resolution: "cacache@npm:12.0.4" + dependencies: + bluebird: "npm:^3.5.5" + chownr: "npm:^1.1.1" + figgy-pudding: "npm:^3.5.1" + glob: "npm:^7.1.4" + graceful-fs: "npm:^4.1.15" + infer-owner: "npm:^1.0.3" + lru-cache: "npm:^5.1.1" + mississippi: "npm:^3.0.0" + mkdirp: "npm:^0.5.1" + move-concurrently: "npm:^1.0.1" + promise-inflight: "npm:^1.0.1" + rimraf: "npm:^2.6.3" + ssri: "npm:^6.0.1" + unique-filename: "npm:^1.1.1" + y18n: "npm:^4.0.0" + checksum: 10c0/b4b0aa49e3fbd3ca92f71bc62923e4afce31fd687b31d5ba524b2a54b36e96a8b027165599307dda5e4a6f7268cc951b77ca170efa00c1b72761f9daae51fdfb + languageName: node + linkType: hard + +"cache-base@npm:^1.0.1": + version: 1.0.1 + resolution: "cache-base@npm:1.0.1" + dependencies: + collection-visit: "npm:^1.0.0" + component-emitter: "npm:^1.2.1" + get-value: "npm:^2.0.6" + has-value: "npm:^1.0.0" + isobject: "npm:^3.0.1" + set-value: "npm:^2.0.0" + to-object-path: "npm:^0.3.0" + union-value: "npm:^1.0.0" + unset-value: "npm:^1.0.0" + checksum: 10c0/a7142e25c73f767fa520957dcd179b900b86eac63b8cfeaa3b2a35e18c9ca5968aa4e2d2bed7a3e7efd10f13be404344cfab3a4156217e71f9bdb95940bb9c8c + languageName: node + linkType: hard + +"cache-loader@npm:^4.1.0": + version: 4.1.0 + resolution: "cache-loader@npm:4.1.0" + dependencies: + buffer-json: "npm:^2.0.0" + find-cache-dir: "npm:^3.0.0" + loader-utils: "npm:^1.2.3" + mkdirp: "npm:^0.5.1" + neo-async: "npm:^2.6.1" + schema-utils: "npm:^2.0.0" + peerDependencies: + webpack: ^4.0.0 + checksum: 10c0/7971982e5f5d3545db4e1da5614c26f2a3930f52d371159cd983254e72517be906e2d57d70abdf7299ebad73c8d5e248efc6211789475d907b2fe23c84188d50 + languageName: node + linkType: hard + +"call-bind-apply-helpers@npm:^1.0.1, call-bind-apply-helpers@npm:^1.0.2": + version: 1.0.2 + resolution: "call-bind-apply-helpers@npm:1.0.2" + dependencies: + es-errors: "npm:^1.3.0" + function-bind: "npm:^1.1.2" + checksum: 10c0/47bd9901d57b857590431243fea704ff18078b16890a6b3e021e12d279bbf211d039155e27d7566b374d49ee1f8189344bac9833dec7a20cdec370506361c938 + languageName: node + linkType: hard + +"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2": + version: 1.0.2 + resolution: "call-bind@npm:1.0.2" + dependencies: + function-bind: "npm:^1.1.1" + get-intrinsic: "npm:^1.0.2" + checksum: 10c0/74ba3f31e715456e22e451d8d098779b861eba3c7cac0d9b510049aced70d75c231ba05071f97e1812c98e34e2bee734c0c6126653e0088c2d9819ca047f4073 + languageName: node + linkType: hard + +"call-me-maybe@npm:^1.0.1": + version: 1.0.1 + resolution: "call-me-maybe@npm:1.0.1" + checksum: 10c0/551991433adc2d257d24a5dea5049addc75b182cc7f64860d41bb5ec2c2f1f72efcd6f34be475e70bbb62fde9f9ba380c1a52c922daf2b4111f25fee2509550f + languageName: node + linkType: hard + +"caller-callsite@npm:^2.0.0": + version: 2.0.0 + resolution: "caller-callsite@npm:2.0.0" + dependencies: + callsites: "npm:^2.0.0" + checksum: 10c0/a00ca91280e10ee2321de21dda6c168e427df7a63aeaca027ea45e3e466ac5e1a5054199f6547ba1d5a513d3b6b5933457266daaa47f8857fb532a343ee6b5e1 + languageName: node + linkType: hard + +"caller-path@npm:^2.0.0": + version: 2.0.0 + resolution: "caller-path@npm:2.0.0" + dependencies: + caller-callsite: "npm:^2.0.0" + checksum: 10c0/029b5b2c557d831216305c3218e9ff30fa668be31d58dd08088f74c8eabc8362c303e0908b3a93abb25ba10e3a5bfc9cff5eb7fab6ab9cf820e3b160ccb67581 + languageName: node + linkType: hard + +"callsites@npm:^2.0.0": + version: 2.0.0 + resolution: "callsites@npm:2.0.0" + checksum: 10c0/13bff4fee946e6020b37e76284e95e24aa239c9e34ac4f3451e4c5330fca6f2f962e1d1ab69e4da7940e1fce135107a2b2b98c01d62ea33144350fc89dc5494e + languageName: node + linkType: hard + +"callsites@npm:^3.0.0": + version: 3.1.0 + resolution: "callsites@npm:3.1.0" + checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301 + languageName: node + linkType: hard + +"camel-case@npm:3.0.x": + version: 3.0.0 + resolution: "camel-case@npm:3.0.0" + dependencies: + no-case: "npm:^2.2.0" + upper-case: "npm:^1.1.1" + checksum: 10c0/491c6bbf986b9d8355e12cca6beb719b44c2fe96e8526c09958a1b4e0dbb081a82ea59c13b5a6ccf9158ce5979cbe56a8a10d7322bfeed2d84725c6b89d8f934 + languageName: node + linkType: hard + +"camelcase@npm:^5.0.0, camelcase@npm:^5.3.1": + version: 5.3.1 + resolution: "camelcase@npm:5.3.1" + checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23 + languageName: node + linkType: hard + +"caniuse-api@npm:^3.0.0": + version: 3.0.0 + resolution: "caniuse-api@npm:3.0.0" + dependencies: + browserslist: "npm:^4.0.0" + caniuse-lite: "npm:^1.0.0" + lodash.memoize: "npm:^4.1.2" + lodash.uniq: "npm:^4.5.0" + checksum: 10c0/60f9e85a3331e6d761b1b03eec71ca38ef7d74146bece34694853033292156b815696573ed734b65583acf493e88163618eda915c6c826d46a024c71a9572b4c + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001219": + version: 1.0.30001792 + resolution: "caniuse-lite@npm:1.0.30001792" + checksum: 10c0/03bab64b123453e18e7c6747c32bb820be6d82ac78536c5c3704988aaeec411715a2045069fb569f872d73acf1ea64bf83508c9fdfa87b6d012236cde738e1be + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.30001799": + version: 1.0.30001800 + resolution: "caniuse-lite@npm:1.0.30001800" + checksum: 10c0/107ad692b89ce3b6c060f39159a19577b6b171c678a9174fbe827a6f3b2c3c9cd67f1e46076aa4731cefbd21ba2da754ca2300c6a448c7a05bdda078f73fa3b0 + languageName: node + linkType: hard + +"carbon-components@npm:10.58.5": + version: 10.58.5 + resolution: "carbon-components@npm:10.58.5" + dependencies: + "@carbon/telemetry": "npm:0.1.0" + flatpickr: "npm:4.6.1" + lodash.debounce: "npm:^4.0.8" + warning: "npm:^3.0.0" + checksum: 10c0/8b95779e8f3d38da13b5e72d1ae2fb325705e236993447f16c65b4955138079ff29572eb5eb886c59c8f7bee9085f22c5a8a06453043dbc741724c6f59412100 + languageName: node + linkType: hard + +"carbon-components@npm:^10.41.0": + version: 10.58.15 + resolution: "carbon-components@npm:10.58.15" + dependencies: + "@carbon/telemetry": "npm:0.1.0" + flatpickr: "npm:4.6.1" + lodash.debounce: "npm:^4.0.8" + warning: "npm:^3.0.0" + checksum: 10c0/af8e94fe4350f407df8220cfbb5a2745297df12eae695de76a808ea6cc694756e2697b41212690afcc4e7eae543def69096871cf0ebe571cb90e5ef81e7fa93c + languageName: node + linkType: hard + +"case-sensitive-paths-webpack-plugin@npm:^2.3.0": + version: 2.4.0 + resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0" + checksum: 10c0/310dab619b661a7fa44ed773870be6d6d7373faff6953ad92720f9553e2579e46dda5b9a79eae6d25ff3733cc15aa466b96e5811af16213f23c115aa220b4ab4 + languageName: node + linkType: hard + +"caseless@npm:~0.12.0": + version: 0.12.0 + resolution: "caseless@npm:0.12.0" + checksum: 10c0/ccf64bcb6c0232cdc5b7bd91ddd06e23a4b541f138336d4725233ac538041fb2f29c2e86c3c4a7a61ef990b665348db23a047060b9414c3a6603e9fa61ad4626 + languageName: node + linkType: hard + +"chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": + version: 2.4.2 + resolution: "chalk@npm:2.4.2" + dependencies: + ansi-styles: "npm:^3.2.1" + escape-string-regexp: "npm:^1.0.5" + supports-color: "npm:^5.3.0" + checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073 + languageName: node + linkType: hard + +"chalk@npm:^3.0.0": + version: 3.0.0 + resolution: "chalk@npm:3.0.0" + dependencies: + ansi-styles: "npm:^4.1.0" + supports-color: "npm:^7.1.0" + checksum: 10c0/ee650b0a065b3d7a6fda258e75d3a86fc8e4effa55871da730a9e42ccb035bf5fd203525e5a1ef45ec2582ecc4f65b47eb11357c526b84dd29a14fb162c414d2 + languageName: node + linkType: hard + +"chalk@npm:^4.0.0, chalk@npm:^4.1.0": + version: 4.1.1 + resolution: "chalk@npm:4.1.1" + dependencies: + ansi-styles: "npm:^4.1.0" + supports-color: "npm:^7.1.0" + checksum: 10c0/3866c8b96eca56b5ff4e1e9a243b65e4f77694a486a2cc49316d54af9dae463d2c52bd99b9f0b7a924b87faf3a16dd6ed12d3a7442ac385b608f285e54696c18 + languageName: node + linkType: hard + +"chardet@npm:^0.7.0": + version: 0.7.0 + resolution: "chardet@npm:0.7.0" + checksum: 10c0/96e4731b9ec8050cbb56ab684e8c48d6c33f7826b755802d14e3ebfdc51c57afeece3ea39bc6b09acc359e4363525388b915e16640c1378053820f5e70d0f27d + languageName: node + linkType: hard + +"check-types@npm:^8.0.3": + version: 8.0.3 + resolution: "check-types@npm:8.0.3" + checksum: 10c0/f55dd9a1cdff7f1a663feb034f62209b7697e94c6192c7cfa15d5e84e8dd860b863ab9ac435acc161e29d5f1b7136f6f94d99e02d87f60457199d478822b3903 + languageName: node + linkType: hard + +"chokidar@npm:^2.1.8": + version: 2.1.8 + resolution: "chokidar@npm:2.1.8" + dependencies: + anymatch: "npm:^2.0.0" + async-each: "npm:^1.0.1" + braces: "npm:^2.3.2" + fsevents: "npm:^1.2.7" + glob-parent: "npm:^3.1.0" + inherits: "npm:^2.0.3" + is-binary-path: "npm:^1.0.0" + is-glob: "npm:^4.0.0" + normalize-path: "npm:^3.0.0" + path-is-absolute: "npm:^1.0.0" + readdirp: "npm:^2.2.1" + upath: "npm:^1.1.1" + dependenciesMeta: + fsevents: + optional: true + checksum: 10c0/5631cc00080224f9482cf5418dcbea111aec02fa8d81a8cfe37e47b9cf36089e071de52d503647e3a821a01426a40adc926ba899f657af86a51b8f8d4eef12a7 + languageName: node + linkType: hard + +"chokidar@npm:^3.4.1": + version: 3.5.2 + resolution: "chokidar@npm:3.5.2" + dependencies: + anymatch: "npm:~3.1.2" + braces: "npm:~3.0.2" + fsevents: "npm:~2.3.2" + glob-parent: "npm:~5.1.2" + is-binary-path: "npm:~2.1.0" + is-glob: "npm:~4.0.1" + normalize-path: "npm:~3.0.0" + readdirp: "npm:~3.6.0" + dependenciesMeta: + fsevents: + optional: true + checksum: 10c0/e7179a9dc4ce54c1ba660652319039b7ca0817a442dd05a45afcbdefcd4848b4276debfa9cf321798c2c567c6289da14dd48d9a1ee92056a7b526c554cffe129 + languageName: node + linkType: hard + +"chokidar@npm:^5.0.0": + version: 5.0.0 + resolution: "chokidar@npm:5.0.0" + dependencies: + readdirp: "npm:^5.0.0" + checksum: 10c0/42fc907cb2a7ff5c9e220f84dae75380a77997f851c2a5e7865a2cf9ae45dd407a23557208cdcdbf3ac8c93341135a1748e4c48c31855f3bfa095e5159b6bdec + languageName: node + linkType: hard + +"chownr@npm:^1.1.1": + version: 1.1.4 + resolution: "chownr@npm:1.1.4" + checksum: 10c0/ed57952a84cc0c802af900cf7136de643d3aba2eecb59d29344bc2f3f9bf703a301b9d84cdc71f82c3ffc9ccde831b0d92f5b45f91727d6c9da62f23aef9d9db + languageName: node + linkType: hard + +"chownr@npm:^3.0.0": + version: 3.0.0 + resolution: "chownr@npm:3.0.0" + checksum: 10c0/43925b87700f7e3893296c8e9c56cc58f926411cce3a6e5898136daaf08f08b9a8eb76d37d3267e707d0dcc17aed2e2ebdf5848c0c3ce95cf910a919935c1b10 + languageName: node + linkType: hard + +"chrome-trace-event@npm:^1.0.2": + version: 1.0.3 + resolution: "chrome-trace-event@npm:1.0.3" + checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c + languageName: node + linkType: hard + +"ci-info@npm:^1.5.0": + version: 1.6.0 + resolution: "ci-info@npm:1.6.0" + checksum: 10c0/5a74921e50e0be504ef811f00cb8dd6a547e1f4f2e709b7364b2de72a6fbc0215d86c88cd62c485a129090365d2a6367ca00344ced04e714860b22fbe10180c8 + languageName: node + linkType: hard + +"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3": + version: 1.0.4 + resolution: "cipher-base@npm:1.0.4" + dependencies: + inherits: "npm:^2.0.1" + safe-buffer: "npm:^5.0.1" + checksum: 10c0/d8d005f8b64d8a77b3d3ce531301ae7b45902c9cab4ec8b66bdbd2bf2a1d9fceb9a2133c293eb3c060b2d964da0f14c47fb740366081338aa3795dd1faa8984b + languageName: node + linkType: hard + +"class-utils@npm:^0.3.5": + version: 0.3.6 + resolution: "class-utils@npm:0.3.6" + dependencies: + arr-union: "npm:^3.1.0" + define-property: "npm:^0.2.5" + isobject: "npm:^3.0.0" + static-extend: "npm:^0.1.1" + checksum: 10c0/d44f4afc7a3e48dba4c2d3fada5f781a1adeeff371b875c3b578bc33815c6c29d5d06483c2abfd43a32d35b104b27b67bfa39c2e8a422fa858068bd756cfbd42 + languageName: node + linkType: hard + +"clean-css@npm:4.2.x": + version: 4.2.3 + resolution: "clean-css@npm:4.2.3" + dependencies: + source-map: "npm:~0.6.0" + checksum: 10c0/738eb574a1780663bad95d1772a6b97a0140b49e8c77850082f324112eb2d528737393075eede14be6c9797d15f09dd64657772f0d4e6990c9c887150648539f + languageName: node + linkType: hard + +"cli-cursor@npm:^2.1.0": + version: 2.1.0 + resolution: "cli-cursor@npm:2.1.0" + dependencies: + restore-cursor: "npm:^2.0.0" + checksum: 10c0/09ee6d8b5b818d840bf80ec9561eaf696672197d3a02a7daee2def96d5f52ce6e0bbe7afca754ccf14f04830b5a1b4556273e983507d5029f95bba3016618eda + languageName: node + linkType: hard + +"cli-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-cursor@npm:3.1.0" + dependencies: + restore-cursor: "npm:^3.1.0" + checksum: 10c0/92a2f98ff9037d09be3dfe1f0d749664797fb674bf388375a2207a1203b69d41847abf16434203e0089212479e47a358b13a0222ab9fccfe8e2644a7ccebd111 + languageName: node + linkType: hard + +"cli-highlight@npm:^2.1.4": + version: 2.1.11 + resolution: "cli-highlight@npm:2.1.11" + dependencies: + chalk: "npm:^4.0.0" + highlight.js: "npm:^10.7.1" + mz: "npm:^2.4.0" + parse5: "npm:^5.1.1" + parse5-htmlparser2-tree-adapter: "npm:^6.0.0" + yargs: "npm:^16.0.0" + bin: + highlight: bin/highlight + checksum: 10c0/b5b4af3b968aa9df77eee449a400fbb659cf47c4b03a395370bd98d5554a00afaa5819b41a9a8a1ca0d37b0b896a94e57c65289b37359a25b700b1f56eb04852 + languageName: node + linkType: hard + +"cli-spinners@npm:^2.0.0": + version: 2.6.0 + resolution: "cli-spinners@npm:2.6.0" + checksum: 10c0/3cdb26c885d25fa38cd435f9e30ec7961893d6ff3af0e113dfebe8eb7b2d8d80532bd4c228449e2e51594dab53f3a93ce0309887543986597dfb7d8eb97ce5b2 + languageName: node + linkType: hard + +"cli-width@npm:^3.0.0": + version: 3.0.0 + resolution: "cli-width@npm:3.0.0" + checksum: 10c0/125a62810e59a2564268c80fdff56c23159a7690c003e34aeb2e68497dccff26911998ff49c33916fcfdf71e824322cc3953e3f7b48b27267c7a062c81348a9a + languageName: node + linkType: hard + +"clipboardy@npm:^2.3.0": + version: 2.3.0 + resolution: "clipboardy@npm:2.3.0" + dependencies: + arch: "npm:^2.1.1" + execa: "npm:^1.0.0" + is-wsl: "npm:^2.1.1" + checksum: 10c0/171c7d216dbec50213e35796740eaf79e39fb3442b7a8caf7414c2aed1da14e4d040696126c467325641612267a3dd43740d2ec29719fdcfb62065c6a2f91860 + languageName: node + linkType: hard + +"cliui@npm:^5.0.0": + version: 5.0.0 + resolution: "cliui@npm:5.0.0" + dependencies: + string-width: "npm:^3.1.0" + strip-ansi: "npm:^5.2.0" + wrap-ansi: "npm:^5.1.0" + checksum: 10c0/76142bf306965850a71efd10c9755bd7f447c7c20dd652e1c1ce27d987f862a3facb3cceb2909cef6f0cb363646ee7a1735e3dfdd49f29ed16d733d33e15e2f8 + languageName: node + linkType: hard + +"cliui@npm:^6.0.0": + version: 6.0.0 + resolution: "cliui@npm:6.0.0" + dependencies: + string-width: "npm:^4.2.0" + strip-ansi: "npm:^6.0.0" + wrap-ansi: "npm:^6.2.0" + checksum: 10c0/35229b1bb48647e882104cac374c9a18e34bbf0bace0e2cf03000326b6ca3050d6b59545d91e17bfe3705f4a0e2988787aa5cde6331bf5cbbf0164732cef6492 + languageName: node + linkType: hard + +"cliui@npm:^7.0.2": + version: 7.0.4 + resolution: "cliui@npm:7.0.4" + dependencies: + string-width: "npm:^4.2.0" + strip-ansi: "npm:^6.0.0" + wrap-ansi: "npm:^7.0.0" + checksum: 10c0/6035f5daf7383470cef82b3d3db00bec70afb3423538c50394386ffbbab135e26c3689c41791f911fa71b62d13d3863c712fdd70f0fbdffd938a1e6fd09aac00 + languageName: node + linkType: hard + +"clone@npm:^1.0.2": + version: 1.0.4 + resolution: "clone@npm:1.0.4" + checksum: 10c0/2176952b3649293473999a95d7bebfc9dc96410f6cbd3d2595cf12fd401f63a4bf41a7adbfd3ab2ff09ed60cb9870c58c6acdd18b87767366fabfc163700f13b + languageName: node + linkType: hard + +"coa@npm:^2.0.2": + version: 2.0.2 + resolution: "coa@npm:2.0.2" + dependencies: + "@types/q": "npm:^1.5.1" + chalk: "npm:^2.4.1" + q: "npm:^1.1.2" + checksum: 10c0/0264392e3b691a8551e619889f3e67558b4f755eeb09d67625032a25c37634731e778fabbd9d14df6477d6ae770e30ea9405d18e515b2ec492b0eb90bb8d7f43 + languageName: node + linkType: hard + +"collection-visit@npm:^1.0.0": + version: 1.0.0 + resolution: "collection-visit@npm:1.0.0" + dependencies: + map-visit: "npm:^1.0.0" + object-visit: "npm:^1.0.0" + checksum: 10c0/add72a8d1c37cb90e53b1aaa2c31bf1989bfb733f0b02ce82c9fa6828c7a14358dba2e4f8e698c02f69e424aeccae1ffb39acdeaf872ade2f41369e84a2fcf8a + languageName: node + linkType: hard + +"color-convert@npm:^1.9.0, color-convert@npm:^1.9.1": + version: 1.9.3 + resolution: "color-convert@npm:1.9.3" + dependencies: + color-name: "npm:1.1.3" + checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c + languageName: node + linkType: hard + +"color-convert@npm:^2.0.1": + version: 2.0.1 + resolution: "color-convert@npm:2.0.1" + dependencies: + color-name: "npm:~1.1.4" + checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7 + languageName: node + linkType: hard + +"color-name@npm:1.1.3": + version: 1.1.3 + resolution: "color-name@npm:1.1.3" + checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6 + languageName: node + linkType: hard + +"color-name@npm:^1.0.0, color-name@npm:~1.1.4": + version: 1.1.4 + resolution: "color-name@npm:1.1.4" + checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95 + languageName: node + linkType: hard + +"color-string@npm:^1.5.4": + version: 1.5.5 + resolution: "color-string@npm:1.5.5" + dependencies: + color-name: "npm:^1.0.0" + simple-swizzle: "npm:^0.2.2" + checksum: 10c0/bd8c86fd859850f44f3f85881195c26e4adb86cc56670a312e3a606210a76bae3e968ed1c232fa124b480dfe51e546d8b17490ea34f13fdfe91816a79159d908 + languageName: node + linkType: hard + +"color@npm:^3.0.0": + version: 3.1.3 + resolution: "color@npm:3.1.3" + dependencies: + color-convert: "npm:^1.9.1" + color-string: "npm:^1.5.4" + checksum: 10c0/dddbe51774b5c5675e2efcc3216419475364530ddcea09ee92fdebaaab3855e833d6644f98ea79a9d808b5aca31f5776d7a70c99eb8690cfba13287a7a1567c2 + languageName: node + linkType: hard + +"colorette@npm:^1.2.1, colorette@npm:^1.2.2": + version: 1.2.2 + resolution: "colorette@npm:1.2.2" + checksum: 10c0/971b7dc0cfdb82df2266e54ce6c173bef0457be9ca8d6fc06a099efbe67dcddff17ccaae75020e4b8601cf48aea1f23afbf8a4be9fd501034da47bcdcbf42041 + languageName: node + linkType: hard + +"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6": + version: 1.0.8 + resolution: "combined-stream@npm:1.0.8" + dependencies: + delayed-stream: "npm:~1.0.0" + checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5 + languageName: node + linkType: hard + +"commander@npm:2.17.x": + version: 2.17.1 + resolution: "commander@npm:2.17.1" + checksum: 10c0/b10453ca205d5a794c5e639dbc54bf4eaec61a204d56693b8082e9000744df13a47840f7d10ae2fc6fc046e2d71bb7c67987dff5b77f862064e187cf88beac3f + languageName: node + linkType: hard + +"commander@npm:^2.18.0, commander@npm:^2.20.0": + version: 2.20.3 + resolution: "commander@npm:2.20.3" + checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288 + languageName: node + linkType: hard + +"commander@npm:~2.19.0": + version: 2.19.0 + resolution: "commander@npm:2.19.0" + checksum: 10c0/4cec19989ea492a8b7ebd26e854111b5921641ad737abab64b740d094d7f332f5e210423ca8a31ec6ef988f1e8e6ae1379640160f2a68e9b4ee89c912ac8bd3f + languageName: node + linkType: hard + +"commondir@npm:^1.0.1": + version: 1.0.1 + resolution: "commondir@npm:1.0.1" + checksum: 10c0/33a124960e471c25ee19280c9ce31ccc19574b566dc514fe4f4ca4c34fa8b0b57cf437671f5de380e11353ea9426213fca17687dd2ef03134fea2dbc53809fd6 + languageName: node + linkType: hard + +"component-emitter@npm:^1.2.1": + version: 1.3.0 + resolution: "component-emitter@npm:1.3.0" + checksum: 10c0/68774a0a3754fb6c0ba53c2e88886dfbd0c773931066abb1d7fd1b0c893b2a838d8f088ab4dca1f18cc1a4fc2e6932019eba3ded2d931b5ba2241ce40e93a24f + languageName: node + linkType: hard + +"compressible@npm:~2.0.16": + version: 2.0.18 + resolution: "compressible@npm:2.0.18" + dependencies: + mime-db: "npm:>= 1.43.0 < 2" + checksum: 10c0/8a03712bc9f5b9fe530cc5a79e164e665550d5171a64575d7dcf3e0395d7b4afa2d79ab176c61b5b596e28228b350dd07c1a2a6ead12fd81d1b6cd632af2fef7 + languageName: node + linkType: hard + +"compression@npm:^1.7.4": + version: 1.7.4 + resolution: "compression@npm:1.7.4" + dependencies: + accepts: "npm:~1.3.5" + bytes: "npm:3.0.0" + compressible: "npm:~2.0.16" + debug: "npm:2.6.9" + on-headers: "npm:~1.0.2" + safe-buffer: "npm:5.1.2" + vary: "npm:~1.1.2" + checksum: 10c0/138db836202a406d8a14156a5564fb1700632a76b6e7d1546939472895a5304f2b23c80d7a22bf44c767e87a26e070dbc342ea63bb45ee9c863354fa5556bbbc + languageName: node + linkType: hard + +"concat-map@npm:0.0.1": + version: 0.0.1 + resolution: "concat-map@npm:0.0.1" + checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f + languageName: node + linkType: hard + +"concat-stream@npm:^1.5.0": + version: 1.6.2 + resolution: "concat-stream@npm:1.6.2" + dependencies: + buffer-from: "npm:^1.0.0" + inherits: "npm:^2.0.3" + readable-stream: "npm:^2.2.2" + typedarray: "npm:^0.0.6" + checksum: 10c0/2e9864e18282946dabbccb212c5c7cec0702745e3671679eb8291812ca7fd12023f7d8cb36493942a62f770ac96a7f90009dc5c82ad69893438371720fa92617 + languageName: node + linkType: hard + +"connect-history-api-fallback@npm:^1.6.0": + version: 1.6.0 + resolution: "connect-history-api-fallback@npm:1.6.0" + checksum: 10c0/6d59c68070fcb2f6d981992f88d050d7544e8e1af6600c23ad680d955e316216794a742a1669d1f14ed5171fc628b916f8a4e15c5a1e55bffc8ccc60bfeb0b2c + languageName: node + linkType: hard + +"console-browserify@npm:^1.1.0": + version: 1.2.0 + resolution: "console-browserify@npm:1.2.0" + checksum: 10c0/89b99a53b7d6cee54e1e64fa6b1f7ac24b844b4019c5d39db298637e55c1f4ffa5c165457ad984864de1379df2c8e1886cbbdac85d9dbb6876a9f26c3106f226 + languageName: node + linkType: hard + +"consolidate@npm:^0.15.1": + version: 0.15.1 + resolution: "consolidate@npm:0.15.1" + dependencies: + bluebird: "npm:^3.1.1" + checksum: 10c0/02dfbab0a8d5452b74c42dee81526b26a42350ed333575c4f8f099957d02a2dbc92a1f89103b85e83b61371e08a16113ebcddbb38eded53402302e0748f608e1 + languageName: node + linkType: hard + +"constants-browserify@npm:^1.0.0": + version: 1.0.0 + resolution: "constants-browserify@npm:1.0.0" + checksum: 10c0/ab49b1d59a433ed77c964d90d19e08b2f77213fb823da4729c0baead55e3c597f8f97ebccfdfc47bd896d43854a117d114c849a6f659d9986420e97da0f83ac5 + languageName: node + linkType: hard + +"content-disposition@npm:0.5.3": + version: 0.5.3 + resolution: "content-disposition@npm:0.5.3" + dependencies: + safe-buffer: "npm:5.1.2" + checksum: 10c0/988f131fedb2b79002337b5480951cc73f86e876b3e7feb6617b92e40a01f633db6f4c7765d486c02b468890465b2df96b7652b7e39caf22cc63517cf2e99839 + languageName: node + linkType: hard + +"content-type@npm:~1.0.4": + version: 1.0.4 + resolution: "content-type@npm:1.0.4" + checksum: 10c0/19e08f406f9ae3f80fb4607c75fbde1f22546647877e8047c9fa0b1c61e38f3ede853f51e915c95fd499c2e1c7478cb23c35cfb804d0e8e0495e8db88cfaed75 + languageName: node + linkType: hard + +"convert-source-map@npm:^2.0.0": + version: 2.0.0 + resolution: "convert-source-map@npm:2.0.0" + checksum: 10c0/8f2f7a27a1a011cc6cc88cc4da2d7d0cfa5ee0369508baae3d98c260bb3ac520691464e5bbe4ae7cdf09860c1d69ecc6f70c63c6e7c7f7e3f18ec08484dc7d9b + languageName: node + linkType: hard + +"cookie-signature@npm:1.0.6": + version: 1.0.6 + resolution: "cookie-signature@npm:1.0.6" + checksum: 10c0/b36fd0d4e3fef8456915fcf7742e58fbfcc12a17a018e0eb9501c9d5ef6893b596466f03b0564b81af29ff2538fd0aa4b9d54fe5ccbfb4c90ea50ad29fe2d221 + languageName: node + linkType: hard + +"cookie@npm:0.4.0": + version: 0.4.0 + resolution: "cookie@npm:0.4.0" + checksum: 10c0/71508a1c8a4e97bb88f42635542ef24ebe7e713f82573ac61e9b289616334d14bfb28210d7979d9ada24b0254f5fb563af938cac13bc8c0c3f60f47a2257f791 + languageName: node + linkType: hard + +"copy-concurrently@npm:^1.0.0": + version: 1.0.5 + resolution: "copy-concurrently@npm:1.0.5" + dependencies: + aproba: "npm:^1.1.1" + fs-write-stream-atomic: "npm:^1.0.8" + iferr: "npm:^0.1.5" + mkdirp: "npm:^0.5.1" + rimraf: "npm:^2.5.4" + run-queue: "npm:^1.0.0" + checksum: 10c0/c2ce213cb27ee3df584d16eb6c9bfe99cfb531585007533c3e4c752521b4fbf0b2f7f90807d79c496683330808ecd9fdbd9ab9ddfa0913150b7f5097423348ce + languageName: node + linkType: hard + +"copy-descriptor@npm:^0.1.0": + version: 0.1.1 + resolution: "copy-descriptor@npm:0.1.1" + checksum: 10c0/161f6760b7348c941007a83df180588fe2f1283e0867cc027182734e0f26134e6cc02de09aa24a95dc267b2e2025b55659eef76c8019df27bc2d883033690181 + languageName: node + linkType: hard + +"copy-webpack-plugin@npm:^5.1.1": + version: 5.1.2 + resolution: "copy-webpack-plugin@npm:5.1.2" + dependencies: + cacache: "npm:^12.0.3" + find-cache-dir: "npm:^2.1.0" + glob-parent: "npm:^3.1.0" + globby: "npm:^7.1.1" + is-glob: "npm:^4.0.1" + loader-utils: "npm:^1.2.3" + minimatch: "npm:^3.0.4" + normalize-path: "npm:^3.0.0" + p-limit: "npm:^2.2.1" + schema-utils: "npm:^1.0.0" + serialize-javascript: "npm:^4.0.0" + webpack-log: "npm:^2.0.0" + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: 10c0/8c417b596c6063427491bebf72328f4baa0d232dcdbad1fe0cf9e0bdd21bbc04351217ae60f8078acc73e0200d6a0700e0547cfaf3a4f8d22394a301b2b98409 + languageName: node + linkType: hard + +"core-js-compat@npm:^3.43.0, core-js-compat@npm:^3.48.0": + version: 3.49.0 + resolution: "core-js-compat@npm:3.49.0" + dependencies: + browserslist: "npm:^4.28.1" + checksum: 10c0/546e64b7ce45f724825bc13c1347f35c0459a6e71c0dcccff3ec21fbff463f5b0b97fc1220e6d90302153863489301793276fe2bf96f46001ff555ead4140308 + languageName: node + linkType: hard + +"core-js-compat@npm:^3.6.5": + version: 3.15.2 + resolution: "core-js-compat@npm:3.15.2" + dependencies: + browserslist: "npm:^4.16.6" + semver: "npm:7.0.0" + checksum: 10c0/acf03c98ba4c3f50f344d3c842285a260fc7006d93c4a0373e24a64a17e0030311e4a2a29ed575c0cb1aa98be479bd3fec7cfda1522a0ae95853069470fb7899 + languageName: node + linkType: hard + +"core-js@npm:^3.15.2, core-js@npm:^3.6.5": + version: 3.50.0 + resolution: "core-js@npm:3.50.0" + checksum: 10c0/1bfcfb1dbdf45b0b1428a9fdcb03697d1fc52c7e9bc336f804a86ff2c2705a301dca7d9d6636d09d49d60298183273b9321681baeaf330c78db5393bc73f3f6a + languageName: node + linkType: hard + +"core-util-is@npm:1.0.2, core-util-is@npm:~1.0.0": + version: 1.0.2 + resolution: "core-util-is@npm:1.0.2" + checksum: 10c0/980a37a93956d0de8a828ce508f9b9e3317039d68922ca79995421944146700e4aaf490a6dbfebcb1c5292a7184600c7710b957d724be1e37b8254c6bc0fe246 + languageName: node + linkType: hard + +"cosmiconfig@npm:^5.0.0": + version: 5.2.1 + resolution: "cosmiconfig@npm:5.2.1" + dependencies: + import-fresh: "npm:^2.0.0" + is-directory: "npm:^0.3.1" + js-yaml: "npm:^3.13.1" + parse-json: "npm:^4.0.0" + checksum: 10c0/ae9ba309cdbb42d0c9d63dad5c1dfa1c56bb8f818cb8633eea14fd2dbdc9f33393b77658ba96fdabda497bc943afed8c3371d1222afe613c518ba676fa624645 + languageName: node + linkType: hard + +"create-ecdh@npm:^4.0.0": + version: 4.0.4 + resolution: "create-ecdh@npm:4.0.4" + dependencies: + bn.js: "npm:^4.1.0" + elliptic: "npm:^6.5.3" + checksum: 10c0/77b11a51360fec9c3bce7a76288fc0deba4b9c838d5fb354b3e40c59194d23d66efe6355fd4b81df7580da0661e1334a235a2a5c040b7569ba97db428d466e7f + languageName: node + linkType: hard + +"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0": + version: 1.2.0 + resolution: "create-hash@npm:1.2.0" + dependencies: + cipher-base: "npm:^1.0.1" + inherits: "npm:^2.0.1" + md5.js: "npm:^1.3.4" + ripemd160: "npm:^2.0.1" + sha.js: "npm:^2.4.0" + checksum: 10c0/d402e60e65e70e5083cb57af96d89567954d0669e90550d7cec58b56d49c4b193d35c43cec8338bc72358198b8cbf2f0cac14775b651e99238e1cf411490f915 + languageName: node + linkType: hard + +"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7": + version: 1.1.7 + resolution: "create-hmac@npm:1.1.7" + dependencies: + cipher-base: "npm:^1.0.3" + create-hash: "npm:^1.1.0" + inherits: "npm:^2.0.1" + ripemd160: "npm:^2.0.0" + safe-buffer: "npm:^5.0.1" + sha.js: "npm:^2.4.8" + checksum: 10c0/24332bab51011652a9a0a6d160eed1e8caa091b802335324ae056b0dcb5acbc9fcf173cf10d128eba8548c3ce98dfa4eadaa01bd02f44a34414baee26b651835 + languageName: node + linkType: hard + +"cross-spawn@npm:^5.0.1": + version: 5.1.0 + resolution: "cross-spawn@npm:5.1.0" + dependencies: + lru-cache: "npm:^4.0.1" + shebang-command: "npm:^1.2.0" + which: "npm:^1.2.9" + checksum: 10c0/1918621fddb9f8c61e02118b2dbf81f611ccd1544ceaca0d026525341832b8511ce2504c60f935dbc06b35e5ef156fe8c1e72708c27dd486f034e9c0e1e07201 + languageName: node + linkType: hard + +"cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5": + version: 6.0.5 + resolution: "cross-spawn@npm:6.0.5" + dependencies: + nice-try: "npm:^1.0.4" + path-key: "npm:^2.0.1" + semver: "npm:^5.5.0" + shebang-command: "npm:^1.2.0" + which: "npm:^1.2.9" + checksum: 10c0/e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012 + languageName: node + linkType: hard + +"cross-spawn@npm:^7.0.0": + version: 7.0.3 + resolution: "cross-spawn@npm:7.0.3" + dependencies: + path-key: "npm:^3.1.0" + shebang-command: "npm:^2.0.0" + which: "npm:^2.0.1" + checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750 + languageName: node + linkType: hard + +"crypto-browserify@npm:^3.11.0": + version: 3.12.0 + resolution: "crypto-browserify@npm:3.12.0" + dependencies: + browserify-cipher: "npm:^1.0.0" + browserify-sign: "npm:^4.0.0" + create-ecdh: "npm:^4.0.0" + create-hash: "npm:^1.1.0" + create-hmac: "npm:^1.1.0" + diffie-hellman: "npm:^5.0.0" + inherits: "npm:^2.0.1" + pbkdf2: "npm:^3.0.3" + public-encrypt: "npm:^4.0.0" + randombytes: "npm:^2.0.0" + randomfill: "npm:^1.0.3" + checksum: 10c0/0c20198886576050a6aa5ba6ae42f2b82778bfba1753d80c5e7a090836890dc372bdc780986b2568b4fb8ed2a91c958e61db1f0b6b1cc96af4bd03ffc298ba92 + languageName: node + linkType: hard + +"css-color-names@npm:0.0.4, css-color-names@npm:^0.0.4": + version: 0.0.4 + resolution: "css-color-names@npm:0.0.4" + checksum: 10c0/88ef97c25bcfb217469cdff428049022438cc546eb208210f0edec03b75050723db3ba02cd0f4959c84cd0659be0b43af3323eff80d1ba5fb15c2accf09ccbe2 + languageName: node + linkType: hard + +"css-declaration-sorter@npm:^4.0.1": + version: 4.0.1 + resolution: "css-declaration-sorter@npm:4.0.1" + dependencies: + postcss: "npm:^7.0.1" + timsort: "npm:^0.3.0" + checksum: 10c0/5d99058fb4bfec937731724f917d982790f6f08afdf147835053de1f84ecd42f06b139fe68e005adda83c190fac1a84e663eb8003b6bb733a9c72a4420fe22d2 + languageName: node + linkType: hard + +"css-loader@npm:^3.5.3": + version: 3.6.0 + resolution: "css-loader@npm:3.6.0" + dependencies: + camelcase: "npm:^5.3.1" + cssesc: "npm:^3.0.0" + icss-utils: "npm:^4.1.1" + loader-utils: "npm:^1.2.3" + normalize-path: "npm:^3.0.0" + postcss: "npm:^7.0.32" + postcss-modules-extract-imports: "npm:^2.0.0" + postcss-modules-local-by-default: "npm:^3.0.2" + postcss-modules-scope: "npm:^2.2.0" + postcss-modules-values: "npm:^3.0.0" + postcss-value-parser: "npm:^4.1.0" + schema-utils: "npm:^2.7.0" + semver: "npm:^6.3.0" + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: 10c0/ba9065a63f7531d50197207f2c9abb4d75f7e46db27bcfeb6b615a9fb1b1bf48ef4ccdf0f161ff6d35b6fe8752ee3259ee8eeca492666fd2703277d4d3c83534 + languageName: node + linkType: hard + +"css-select-base-adapter@npm:^0.1.1": + version: 0.1.1 + resolution: "css-select-base-adapter@npm:0.1.1" + checksum: 10c0/17f28a0d9e8596c541de250e48958e72a65399c9e15ba5689915d6631a451068187c19d674f08187843a61cb949951cb33c7db82bd7341536769523baed867dc + languageName: node + linkType: hard + +"css-select@npm:^2.0.0": + version: 2.1.0 + resolution: "css-select@npm:2.1.0" + dependencies: + boolbase: "npm:^1.0.0" + css-what: "npm:^3.2.1" + domutils: "npm:^1.7.0" + nth-check: "npm:^1.0.2" + checksum: 10c0/47832492c8218ffd92ed18eaa325397bd0bd8e4bcf3bc71767c5e1ed8b4f39b672ba157b0b5e693ef50006017d78c19e46791a75b43bb192c4db3680a331afc7 + languageName: node + linkType: hard + +"css-select@npm:^4.1.3": + version: 4.1.3 + resolution: "css-select@npm:4.1.3" + dependencies: + boolbase: "npm:^1.0.0" + css-what: "npm:^5.0.0" + domhandler: "npm:^4.2.0" + domutils: "npm:^2.6.0" + nth-check: "npm:^2.0.0" + checksum: 10c0/f6751ce514ecf89315af5157dbd4463ed0461d7194d02fc8b5dcd5b36e8d3ab79f49199fb712437cef3530b769717000babf7de3d8969d7ea08d8d940482501c + languageName: node + linkType: hard + +"css-tree@npm:1.0.0-alpha.37": + version: 1.0.0-alpha.37 + resolution: "css-tree@npm:1.0.0-alpha.37" + dependencies: + mdn-data: "npm:2.0.4" + source-map: "npm:^0.6.1" + checksum: 10c0/8f3c197baea919f4f55d0e84b1665d5e7d5fd74cb192fd0bf951828929b9cd5fd71de074afb685705bf5b40d7b04d4c5a206bfab26954378f04f2f5ce426d2f8 + languageName: node + linkType: hard + +"css-tree@npm:^1.1.2": + version: 1.1.3 + resolution: "css-tree@npm:1.1.3" + dependencies: + mdn-data: "npm:2.0.14" + source-map: "npm:^0.6.1" + checksum: 10c0/499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c + languageName: node + linkType: hard + +"css-what@npm:^3.2.1": + version: 3.4.2 + resolution: "css-what@npm:3.4.2" + checksum: 10c0/454dca1b9dff8cf740d666d24a6c517562f374fe3a160891ebf8c82a9dd76864757913573c4db30537a959f5f595750420be00552ea6d5a9456ee68acc2349bf + languageName: node + linkType: hard + +"css-what@npm:^5.0.0": + version: 5.0.1 + resolution: "css-what@npm:5.0.1" + checksum: 10c0/a1bec4996f51e416a28efe3b003a7fd33ff0d6a91cb97be483c647df1c499e0ae6a84849c01ae87a323fc45fdb77509da773dc9a8ebab652f0a81ac47ebbf80c + languageName: node + linkType: hard + +"cssesc@npm:^3.0.0": + version: 3.0.0 + resolution: "cssesc@npm:3.0.0" + bin: + cssesc: bin/cssesc + checksum: 10c0/6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7 + languageName: node + linkType: hard + +"cssnano-preset-default@npm:^4.0.0, cssnano-preset-default@npm:^4.0.8": + version: 4.0.8 + resolution: "cssnano-preset-default@npm:4.0.8" + dependencies: + css-declaration-sorter: "npm:^4.0.1" + cssnano-util-raw-cache: "npm:^4.0.1" + postcss: "npm:^7.0.0" + postcss-calc: "npm:^7.0.1" + postcss-colormin: "npm:^4.0.3" + postcss-convert-values: "npm:^4.0.1" + postcss-discard-comments: "npm:^4.0.2" + postcss-discard-duplicates: "npm:^4.0.2" + postcss-discard-empty: "npm:^4.0.1" + postcss-discard-overridden: "npm:^4.0.1" + postcss-merge-longhand: "npm:^4.0.11" + postcss-merge-rules: "npm:^4.0.3" + postcss-minify-font-values: "npm:^4.0.2" + postcss-minify-gradients: "npm:^4.0.2" + postcss-minify-params: "npm:^4.0.2" + postcss-minify-selectors: "npm:^4.0.2" + postcss-normalize-charset: "npm:^4.0.1" + postcss-normalize-display-values: "npm:^4.0.2" + postcss-normalize-positions: "npm:^4.0.2" + postcss-normalize-repeat-style: "npm:^4.0.2" + postcss-normalize-string: "npm:^4.0.2" + postcss-normalize-timing-functions: "npm:^4.0.2" + postcss-normalize-unicode: "npm:^4.0.1" + postcss-normalize-url: "npm:^4.0.1" + postcss-normalize-whitespace: "npm:^4.0.2" + postcss-ordered-values: "npm:^4.1.2" + postcss-reduce-initial: "npm:^4.0.3" + postcss-reduce-transforms: "npm:^4.0.2" + postcss-svgo: "npm:^4.0.3" + postcss-unique-selectors: "npm:^4.0.1" + checksum: 10c0/6017657e0733da6ca73098452a7aed1a9b408b8b745e58ac86a4e3a5aa44f8d4476c2d6f16284a00aa649396624a03fb9bacce4746cfbb0edb593871ff20c7a1 + languageName: node + linkType: hard + +"cssnano-util-get-arguments@npm:^4.0.0": + version: 4.0.0 + resolution: "cssnano-util-get-arguments@npm:4.0.0" + checksum: 10c0/d14ff2f16852ee0883844f960f035d15ecc04c516f3dd98979e5515b02e9b7f883a5b5a54fd209cc1d117bb906a28382a5b2dd15a165e8e8f3e66ae14fddbe03 + languageName: node + linkType: hard + +"cssnano-util-get-match@npm:^4.0.0": + version: 4.0.0 + resolution: "cssnano-util-get-match@npm:4.0.0" + checksum: 10c0/62462d6fe07334f7bbe2530fa427c3fdd240af0cc949bb9feb2bf178432743ec1e6e5914f50c44cc3eb65488b1d6e6f9dcd5fbf948bc31e6672dea623e1923bb + languageName: node + linkType: hard + +"cssnano-util-raw-cache@npm:^4.0.1": + version: 4.0.1 + resolution: "cssnano-util-raw-cache@npm:4.0.1" + dependencies: + postcss: "npm:^7.0.0" + checksum: 10c0/d0bc709570d540b5b122baa47f61072f268488ef78eefac3388bdcfc880f533c4cf8361afafcad78222453d405509fd211a832382d61c5ad6f3fef142ce5afb5 + languageName: node + linkType: hard + +"cssnano-util-same-parent@npm:^4.0.0": + version: 4.0.1 + resolution: "cssnano-util-same-parent@npm:4.0.1" + checksum: 10c0/bec24c8609def0a73734a2d5e0df130655c9c7ec9098da0b66166e81f6614eb90fa43cb0afe81dabea51e253c11a240546c5e1a67b30d22aa297349394522642 + languageName: node + linkType: hard + +"cssnano@npm:^4.0.0, cssnano@npm:^4.1.10": + version: 4.1.11 + resolution: "cssnano@npm:4.1.11" + dependencies: + cosmiconfig: "npm:^5.0.0" + cssnano-preset-default: "npm:^4.0.8" + is-resolvable: "npm:^1.0.0" + postcss: "npm:^7.0.0" + checksum: 10c0/ca0898a512b203437fd8320b3618aa9806db8fed3406389c83f071b9e52e49b3b9e11c628a56690e61451bdc33dc63cd01567d94d599afd4087f548769ffa19e + languageName: node + linkType: hard + +"csso@npm:^4.0.2": + version: 4.2.0 + resolution: "csso@npm:4.2.0" + dependencies: + css-tree: "npm:^1.1.2" + checksum: 10c0/f8c6b1300efaa0f8855a7905ae3794a29c6496e7f16a71dec31eb6ca7cfb1f058a4b03fd39b66c4deac6cb06bf6b4ba86da7b67d7320389cb9994d52b924b903 + languageName: node + linkType: hard + +"csstype@npm:^3.1.0": + version: 3.2.3 + resolution: "csstype@npm:3.2.3" + checksum: 10c0/cd29c51e70fa822f1cecd8641a1445bed7063697469d35633b516e60fe8c1bde04b08f6c5b6022136bb669b64c63d4173af54864510fbb4ee23281801841a3ce + languageName: node + linkType: hard + +"cyclist@npm:^1.0.1": + version: 1.0.1 + resolution: "cyclist@npm:1.0.1" + checksum: 10c0/3381d3b66a3b268e6e0abcc1fa8fbeeb9a98391d8455677509f9833813d7680cc737a10141f54c229e42f5b3133250f36f1aa04f56ef4ba9b29fa728c3c48c01 + languageName: node + linkType: hard + +"dashdash@npm:^1.12.0": + version: 1.14.1 + resolution: "dashdash@npm:1.14.1" + dependencies: + assert-plus: "npm:^1.0.0" + checksum: 10c0/64589a15c5bd01fa41ff7007e0f2c6552c5ef2028075daa16b188a3721f4ba001841bf306dfc2eee6e2e6e7f76b38f5f17fb21fa847504192290ffa9e150118a + languageName: node + linkType: hard + +"date-fns-tz@npm:^1.1.6": + version: 1.3.8 + resolution: "date-fns-tz@npm:1.3.8" + peerDependencies: + date-fns: ">=2.0.0" + checksum: 10c0/4cb16aeae3ea4a72ac4ae9f7db2011e38797aff122a78be16217a0492dde3938e1e62d21dbf1469a36fb4426824196233cedc70807f0a3033bca132bf76d563e + languageName: node + linkType: hard + +"date-fns@npm:^2.0.0, date-fns@npm:^2.23.0": + version: 2.30.0 + resolution: "date-fns@npm:2.30.0" + dependencies: + "@babel/runtime": "npm:^7.21.0" + checksum: 10c0/e4b521fbf22bc8c3db332bbfb7b094fd3e7627de0259a9d17c7551e2d2702608a7307a449206065916538e384f37b181565447ce2637ae09828427aed9cb5581 + languageName: node + linkType: hard + +"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3": + version: 2.6.9 + resolution: "debug@npm:2.6.9" + dependencies: + ms: "npm:2.0.0" + checksum: 10c0/121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589 + languageName: node + linkType: hard + +"debug@npm:4, debug@npm:^4.3.1, debug@npm:^4.4.3": + version: 4.4.3 + resolution: "debug@npm:4.4.3" + dependencies: + ms: "npm:^2.1.3" + peerDependenciesMeta: + supports-color: + optional: true + checksum: 10c0/d79136ec6c83ecbefd0f6a5593da6a9c91ec4d7ddc4b54c883d6e71ec9accb5f67a1a5e96d00a328196b5b5c86d365e98d8a3a70856aaf16b4e7b1985e67f5a6 + languageName: node + linkType: hard + +"debug@npm:^3.1.1, debug@npm:^3.2.6": + version: 3.2.7 + resolution: "debug@npm:3.2.7" + dependencies: + ms: "npm:^2.1.1" + checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a + languageName: node + linkType: hard + +"debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1": + version: 4.3.2 + resolution: "debug@npm:4.3.2" + dependencies: + ms: "npm:2.1.2" + peerDependenciesMeta: + supports-color: + optional: true + checksum: 10c0/3cc408070bcee066ee9b2a4f3a9c40f53728919ec7c7ff568f7c3a75b0723cb5a8407191a63495be4e10669e99b0ff7f26ec70e10b025da1898cdce4876d96ca + languageName: node + linkType: hard + +"decamelize@npm:^1.2.0": + version: 1.2.0 + resolution: "decamelize@npm:1.2.0" + checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2 + languageName: node + linkType: hard + +"decode-uri-component@npm:^0.2.0": + version: 0.2.0 + resolution: "decode-uri-component@npm:0.2.0" + checksum: 10c0/dbc3c72e4a740703f76fb3f51e35bb81546aa3e8c7897e015b8bc289813d3044ad6eaa6048fbb43f6b7b34ef005527b7511da50399caa78b91ee39266a341822 + languageName: node + linkType: hard + +"deep-equal@npm:^1.0.1": + version: 1.1.1 + resolution: "deep-equal@npm:1.1.1" + dependencies: + is-arguments: "npm:^1.0.4" + is-date-object: "npm:^1.0.1" + is-regex: "npm:^1.0.4" + object-is: "npm:^1.0.1" + object-keys: "npm:^1.1.1" + regexp.prototype.flags: "npm:^1.2.0" + checksum: 10c0/473d5dd1d707afd5ad3068864765590591b049d0e0d9a01931599dbbd820e35f09d0a42faa6e4644deb7cf6b7dc90f7bfdf5559f42279d67f714209b62036212 + languageName: node + linkType: hard + +"deep-is@npm:~0.1.3": + version: 0.1.3 + resolution: "deep-is@npm:0.1.3" + checksum: 10c0/f4e21bf6fbb51bca0214e04f079deadfc5a0df3d7822f4b5e45e78960ae1e9a379b93d650377b80ccd0fc6bd7cd995a0aeabbcc7496b8c2dd16ec57aece82d74 + languageName: node + linkType: hard + +"deepmerge@npm:^1.5.2": + version: 1.5.2 + resolution: "deepmerge@npm:1.5.2" + checksum: 10c0/5e676957f523c73a69633d236227513310fea934af02839bd6908cf569503f8988e76512fab6d9dde700e72642f22f331455d6b12e2826e4854a8e8233d0789d + languageName: node + linkType: hard + +"default-gateway@npm:^4.2.0": + version: 4.2.0 + resolution: "default-gateway@npm:4.2.0" + dependencies: + execa: "npm:^1.0.0" + ip-regex: "npm:^2.1.0" + checksum: 10c0/2f499b3a9a6c995fd2b4c0d2411256b1899c94e7eacdb895be64e25c301fa8bce8fd3f8152e540669bb178c6a355154c2f86ec23d4ff40ff3b8413d2a59cd86d + languageName: node + linkType: hard + +"default-gateway@npm:^5.0.5": + version: 5.0.5 + resolution: "default-gateway@npm:5.0.5" + dependencies: + execa: "npm:^3.3.0" + checksum: 10c0/178751715344f22ec6999878f9e49d4d7414405e52ae1250a30aea46135bbac489c25cd35ce4794991afd08a6f27b749920156c5c2d6333ef48cecb6eca7469a + languageName: node + linkType: hard + +"defaults@npm:^1.0.3": + version: 1.0.3 + resolution: "defaults@npm:1.0.3" + dependencies: + clone: "npm:^1.0.2" + checksum: 10c0/c9ba6718eb293fa701652e28967b87102fc13d8e33997748191ad8ed3b2235714bd3661e8505bed06994e6b4604a1281c35462ec328c2bbedd79ebbf7e82adb2 + languageName: node + linkType: hard + +"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3": + version: 1.1.3 + resolution: "define-properties@npm:1.1.3" + dependencies: + object-keys: "npm:^1.0.12" + checksum: 10c0/a2fa03d97ee44bb7c679bac7c3b3e63431a2efd83c12c0d61c7f5adf4fa1cf0a669c77afd274babbc5400926bdc2befb25679e4bf687140b078c0fe14f782e4f + languageName: node + linkType: hard + +"define-property@npm:^0.2.5": + version: 0.2.5 + resolution: "define-property@npm:0.2.5" + dependencies: + is-descriptor: "npm:^0.1.0" + checksum: 10c0/9986915c0893818dedc9ca23eaf41370667762fd83ad8aa4bf026a28563120dbaacebdfbfbf2b18d3b929026b9c6ee972df1dbf22de8fafb5fe6ef18361e4750 + languageName: node + linkType: hard + +"define-property@npm:^1.0.0": + version: 1.0.0 + resolution: "define-property@npm:1.0.0" + dependencies: + is-descriptor: "npm:^1.0.0" + checksum: 10c0/d7cf09db10d55df305f541694ed51dafc776ad9bb8a24428899c9f2d36b11ab38dce5527a81458d1b5e7c389f8cbe803b4abad6e91a0037a329d153b84fc975e + languageName: node + linkType: hard + +"define-property@npm:^2.0.2": + version: 2.0.2 + resolution: "define-property@npm:2.0.2" + dependencies: + is-descriptor: "npm:^1.0.2" + isobject: "npm:^3.0.1" + checksum: 10c0/f91a08ad008fa764172a2c072adc7312f10217ade89ddaea23018321c6d71b2b68b8c229141ed2064179404e345c537f1a2457c379824813695b51a6ad3e4969 + languageName: node + linkType: hard + +"del@npm:^4.1.1": + version: 4.1.1 + resolution: "del@npm:4.1.1" + dependencies: + "@types/glob": "npm:^7.1.1" + globby: "npm:^6.1.0" + is-path-cwd: "npm:^2.0.0" + is-path-in-cwd: "npm:^2.0.0" + p-map: "npm:^2.0.0" + pify: "npm:^4.0.1" + rimraf: "npm:^2.6.3" + checksum: 10c0/ed3233e86e39c0a6a7ea85d8ad0ebc00603078ad408b9c34b4742f707c20028c5731dce2e8aa9a6eb5ae6bee30ccc5405cf7b5d457306520e37c92d0410b6061 + languageName: node + linkType: hard + +"delayed-stream@npm:~1.0.0": + version: 1.0.0 + resolution: "delayed-stream@npm:1.0.0" + checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19 + languageName: node + linkType: hard + +"depd@npm:~1.1.2": + version: 1.1.2 + resolution: "depd@npm:1.1.2" + checksum: 10c0/acb24aaf936ef9a227b6be6d495f0d2eb20108a9a6ad40585c5bda1a897031512fef6484e4fdbb80bd249fdaa82841fa1039f416ece03188e677ba11bcfda249 + languageName: node + linkType: hard + +"des.js@npm:^1.0.0": + version: 1.0.1 + resolution: "des.js@npm:1.0.1" + dependencies: + inherits: "npm:^2.0.1" + minimalistic-assert: "npm:^1.0.0" + checksum: 10c0/69bf742d1c381e01d75151bdcaac71a18d251d7debfc9b6ae5ee4b4edaf39691ae203c5ec9173ba89aedb3ddc622cdff4fca065448c6c2afb1140d9fb826339d + languageName: node + linkType: hard + +"destroy@npm:~1.0.4": + version: 1.0.4 + resolution: "destroy@npm:1.0.4" + checksum: 10c0/eab493808ba17a1fa22c71ef1a4e68d2c4c5222a38040606c966d2ab09117f3a7f3e05c39bffbe41a697f9de552039e43c30e46f0c3eab3faa9f82e800e172a0 + languageName: node + linkType: hard + +"detect-libc@npm:^2.0.3": + version: 2.1.2 + resolution: "detect-libc@npm:2.1.2" + checksum: 10c0/acc675c29a5649fa1fb6e255f993b8ee829e510b6b56b0910666949c80c364738833417d0edb5f90e4e46be17228b0f2b66a010513984e18b15deeeac49369c4 + languageName: node + linkType: hard + +"detect-node@npm:^2.0.4": + version: 2.1.0 + resolution: "detect-node@npm:2.1.0" + checksum: 10c0/f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09 + languageName: node + linkType: hard + +"diffie-hellman@npm:^5.0.0": + version: 5.0.3 + resolution: "diffie-hellman@npm:5.0.3" + dependencies: + bn.js: "npm:^4.1.0" + miller-rabin: "npm:^4.0.0" + randombytes: "npm:^2.0.0" + checksum: 10c0/ce53ccafa9ca544b7fc29b08a626e23a9b6562efc2a98559a0c97b4718937cebaa9b5d7d0a05032cc9c1435e9b3c1532b9e9bf2e0ede868525922807ad6e1ecf + languageName: node + linkType: hard + +"dir-glob@npm:^2.0.0, dir-glob@npm:^2.2.2": + version: 2.2.2 + resolution: "dir-glob@npm:2.2.2" + dependencies: + path-type: "npm:^3.0.0" + checksum: 10c0/67575fd496df80ec90969f1a9f881f03b4ef614ca2c07139df81a12f9816250780dff906f482def0f897dd748d22fa13c076b52ac635e0024f7d434846077a3a + languageName: node + linkType: hard + +"dns-equal@npm:^1.0.0": + version: 1.0.0 + resolution: "dns-equal@npm:1.0.0" + checksum: 10c0/da966e5275ac50546e108af6bc29aaae2164d2ae96d60601b333c4a3aff91f50b6ca14929cf91f20a9cad1587b356323e300cea3ff6588a6a816988485f445f1 + languageName: node + linkType: hard + +"dns-packet@npm:^1.3.1": + version: 1.3.4 + resolution: "dns-packet@npm:1.3.4" + dependencies: + ip: "npm:^1.1.0" + safe-buffer: "npm:^5.0.1" + checksum: 10c0/ee06478da192f9014ab43c7e9118c77b9e353a8d5c06b0d2cba367b3501dd7453bcfed89354a8890cf740491379dcf4b28153d064d051e55c30cfbdf92b88608 + languageName: node + linkType: hard + +"dns-txt@npm:^2.0.2": + version: 2.0.2 + resolution: "dns-txt@npm:2.0.2" + dependencies: + buffer-indexof: "npm:^1.0.0" + checksum: 10c0/71703e65156a2d626216157e6c4fddd844e7e790b6cd3cec830ef8eed80e7ea2697e5f4f2f3eb3aae809be3c91e370cad7a5d91b05ce6b6fcd5e191e7e3d31ca + languageName: node + linkType: hard + +"doctrine@npm:^3.0.0": + version: 3.0.0 + resolution: "doctrine@npm:3.0.0" + dependencies: + esutils: "npm:^2.0.2" + checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520 + languageName: node + linkType: hard + +"dom-converter@npm:^0.2.0": + version: 0.2.0 + resolution: "dom-converter@npm:0.2.0" + dependencies: + utila: "npm:~0.4" + checksum: 10c0/e96aa63bd8c6ee3cd9ce19c3aecfc2c42e50a460e8087114794d4f5ecf3a4f052b34ea3bf2d73b5d80b4da619073b49905e6d7d788ceb7814ca4c29be5354a11 + languageName: node + linkType: hard + +"dom-serializer@npm:0": + version: 0.2.2 + resolution: "dom-serializer@npm:0.2.2" + dependencies: + domelementtype: "npm:^2.0.1" + entities: "npm:^2.0.0" + checksum: 10c0/5cb595fb77e1a23eca56742f47631e6f4af66ce1982c7ed28b3d0ef21f1f50304c067adc29d3eaf824c572be022cee88627d0ac9b929408f24e923f3c7bed37b + languageName: node + linkType: hard + +"dom-serializer@npm:^1.0.1": + version: 1.3.2 + resolution: "dom-serializer@npm:1.3.2" + dependencies: + domelementtype: "npm:^2.0.1" + domhandler: "npm:^4.2.0" + entities: "npm:^2.0.0" + checksum: 10c0/0a39ff0634da807b0e7b4e28d20305658e366d920050296ea6a306c29eb4094a1bf942a72ec2e51145f01efcff93e98eaa1eef4c299ca398e326a2e1c4641220 + languageName: node + linkType: hard + +"domain-browser@npm:^1.1.1": + version: 1.2.0 + resolution: "domain-browser@npm:1.2.0" + checksum: 10c0/a955f482f4b4710fbd77c12a33e77548d63603c30c80f61a80519f27e3db1ba8530b914584cc9e9365d2038753d6b5bd1f4e6c81e432b007b0ec95b8b5e69b1b + languageName: node + linkType: hard + +"domelementtype@npm:1": + version: 1.3.1 + resolution: "domelementtype@npm:1.3.1" + checksum: 10c0/6d4f5761060a21eaf3c96545501e9d188745c7e1c31b8d141bf15d8748feeadba868f4ea32877751b8678b286fb1afbe6ae905ca3fb8f0214d8322e482cdbec0 + languageName: node + linkType: hard + +"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0": + version: 2.2.0 + resolution: "domelementtype@npm:2.2.0" + checksum: 10c0/0e3824e21fb9ff2cda9579ad04ef0068c58cc1746cf723560e1b4cb73ccae324062d468b25a576948459df7dd99e42d8a100b7fcfc6e05c8eefa2e6fed3f8f7d + languageName: node + linkType: hard + +"domhandler@npm:^4.0.0, domhandler@npm:^4.2.0": + version: 4.2.0 + resolution: "domhandler@npm:4.2.0" + dependencies: + domelementtype: "npm:^2.2.0" + checksum: 10c0/fd4e6f1c986402e7a703b671c4f7bdb1dcf278d613ca02a38374eae9d1bba9b3b4d5983519ad902e43c5bd1281456d11f226694e7bb4cfc00dde6f1d5f3aa13e + languageName: node + linkType: hard + +"domutils@npm:^1.7.0": + version: 1.7.0 + resolution: "domutils@npm:1.7.0" + dependencies: + dom-serializer: "npm:0" + domelementtype: "npm:1" + checksum: 10c0/437fcd2d6d6be03f488152e73c6f953e289c58496baa22be9626b2b46f9cfd40486ae77d144487ff6b102929a3231cdb9a8bf8ef485fb7b7c30c985daedc77eb + languageName: node + linkType: hard + +"domutils@npm:^2.5.2, domutils@npm:^2.6.0": + version: 2.7.0 + resolution: "domutils@npm:2.7.0" + dependencies: + dom-serializer: "npm:^1.0.1" + domelementtype: "npm:^2.2.0" + domhandler: "npm:^4.2.0" + checksum: 10c0/0836bbec011ae7c19eea8653d9f924a0954e3af928b94d10856a4bc6169cf927b50b059255e230aa0444e46ecf05177dcfb75857cfdfd764c7b92c5d35a03a0c + languageName: node + linkType: hard + +"dot-prop@npm:^5.2.0": + version: 5.3.0 + resolution: "dot-prop@npm:5.3.0" + dependencies: + is-obj: "npm:^2.0.0" + checksum: 10c0/93f0d343ef87fe8869320e62f2459f7e70f49c6098d948cc47e060f4a3f827d0ad61e83cb82f2bd90cd5b9571b8d334289978a43c0f98fea4f0e99ee8faa0599 + languageName: node + linkType: hard + +"dotenv-expand@npm:^5.1.0": + version: 5.1.0 + resolution: "dotenv-expand@npm:5.1.0" + checksum: 10c0/24ac633de853ef474d0421cc639328b7134109c8dc2baaa5e3afb7495af5e9237136d7e6971e55668e4dce915487eb140967cdd2b3e99aa439e0f6bf8b56faeb + languageName: node + linkType: hard + +"dotenv@npm:^8.2.0": + version: 8.6.0 + resolution: "dotenv@npm:8.6.0" + checksum: 10c0/6750431dea8efbd54b9f2d9681b04e1ccc7989486461dcf058bb708d9e3d63b04115fcdf8840e38ad1e24a4a2e1e7c1560626c5e3ac7bc09371b127c49e2d45f + languageName: node + linkType: hard + +"dunder-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "dunder-proto@npm:1.0.1" + dependencies: + call-bind-apply-helpers: "npm:^1.0.1" + es-errors: "npm:^1.3.0" + gopd: "npm:^1.2.0" + checksum: 10c0/199f2a0c1c16593ca0a145dbf76a962f8033ce3129f01284d48c45ed4e14fea9bbacd7b3610b6cdc33486cef20385ac054948fefc6272fcce645c09468f93031 + languageName: node + linkType: hard + +"duplexer@npm:^0.1.1": + version: 0.1.2 + resolution: "duplexer@npm:0.1.2" + checksum: 10c0/c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2 + languageName: node + linkType: hard + +"duplexify@npm:^3.4.2, duplexify@npm:^3.6.0": + version: 3.7.1 + resolution: "duplexify@npm:3.7.1" + dependencies: + end-of-stream: "npm:^1.0.0" + inherits: "npm:^2.0.1" + readable-stream: "npm:^2.0.0" + stream-shift: "npm:^1.0.0" + checksum: 10c0/59d1440c1b4e3a4db35ae96933392703ce83518db1828d06b9b6322920d6cbbf0b7159e88be120385fe459e77f1eb0c7622f26e9ec1f47c9ff05c2b35747dbd3 + languageName: node + linkType: hard + +"easy-stack@npm:1.0.1": + version: 1.0.1 + resolution: "easy-stack@npm:1.0.1" + checksum: 10c0/1eaf066169a20f6cc3cafd2bb36b00baacd60b6414c8d8bf51bfd50bc6f1c487140c8af86bbb8e1ff9ded2faea5e138c55a37867fc79cbbc985bf5a5ebe4b109 + languageName: node + linkType: hard + +"ecc-jsbn@npm:~0.1.1": + version: 0.1.2 + resolution: "ecc-jsbn@npm:0.1.2" + dependencies: + jsbn: "npm:~0.1.0" + safer-buffer: "npm:^2.1.0" + checksum: 10c0/6cf168bae1e2dad2e46561d9af9cbabfbf5ff592176ad4e9f0f41eaaf5fe5e10bb58147fe0a804de62b1ee9dad42c28810c88d652b21b6013c47ba8efa274ca1 + languageName: node + linkType: hard + +"ee-first@npm:1.1.1": + version: 1.1.1 + resolution: "ee-first@npm:1.1.1" + checksum: 10c0/b5bb125ee93161bc16bfe6e56c6b04de5ad2aa44234d8f644813cc95d861a6910903132b05093706de2b706599367c4130eb6d170f6b46895686b95f87d017b7 + languageName: node + linkType: hard + +"ejs@npm:^2.6.1": + version: 2.7.4 + resolution: "ejs@npm:2.7.4" + checksum: 10c0/d5700120ce5dd10e0853085003862f5d78c198326ed634838aa7f8b0bf1efd65ad9fa0f2bac0053af05afeb21fb015595166b2c4fc83c7ef8f481e469a01ad52 + languageName: node + linkType: hard + +"electron-to-chromium@npm:^1.3.723": + version: 1.3.775 + resolution: "electron-to-chromium@npm:1.3.775" + checksum: 10c0/3e386c890661b3bdc10d6b4cd323d85efd8814f09c24cc3f4599d4b5c53231169849bf48be15a1181c5b7e8e87e98d430ae90290f2ab3db0027a4fc40616a95e + languageName: node + linkType: hard + +"electron-to-chromium@npm:^1.5.376": + version: 1.5.384 + resolution: "electron-to-chromium@npm:1.5.384" + checksum: 10c0/1aa60e9e9645a7d132194a2a3add5d571438149adcafbbbbe39232bef70bb212a5eefdd5c276e7f9b2a711cd098c733578dc4c94112958f81f5709aeb9ce601a + languageName: node + linkType: hard + +"elliptic@npm:^6.5.3": + version: 6.5.4 + resolution: "elliptic@npm:6.5.4" + dependencies: + bn.js: "npm:^4.11.9" + brorand: "npm:^1.1.0" + hash.js: "npm:^1.0.0" + hmac-drbg: "npm:^1.0.1" + inherits: "npm:^2.0.4" + minimalistic-assert: "npm:^1.0.1" + minimalistic-crypto-utils: "npm:^1.0.1" + checksum: 10c0/5f361270292c3b27cf0843e84526d11dec31652f03c2763c6c2b8178548175ff5eba95341dd62baff92b2265d1af076526915d8af6cc9cb7559c44a62f8ca6e2 + languageName: node + linkType: hard + +"emoji-regex@npm:^7.0.1": + version: 7.0.3 + resolution: "emoji-regex@npm:7.0.3" + checksum: 10c0/a8917d695c3a3384e4b7230a6a06fd2de6b3db3709116792e8b7b36ddbb3db4deb28ad3e983e70d4f2a1f9063b5dab9025e4e26e9ca08278da4fbb73e213743f + languageName: node + linkType: hard + +"emoji-regex@npm:^8.0.0": + version: 8.0.0 + resolution: "emoji-regex@npm:8.0.0" + checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010 + languageName: node + linkType: hard + +"emojis-list@npm:^2.0.0": + version: 2.1.0 + resolution: "emojis-list@npm:2.1.0" + checksum: 10c0/bbb941223bfb3e38054cb52ed1b3098a8dac0a90fdd2699eb8a3af3b2172cdc4af0932e05c3edd52e814997c8f45cf1d7f5e86e9ecdcd4e2390a0f27e6914db5 + languageName: node + linkType: hard + +"emojis-list@npm:^3.0.0": + version: 3.0.0 + resolution: "emojis-list@npm:3.0.0" + checksum: 10c0/7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b + languageName: node + linkType: hard + +"encodeurl@npm:~1.0.2": + version: 1.0.2 + resolution: "encodeurl@npm:1.0.2" + checksum: 10c0/f6c2387379a9e7c1156c1c3d4f9cb7bb11cf16dd4c1682e1f6746512564b053df5781029b6061296832b59fb22f459dbe250386d217c2f6e203601abb2ee0bec + languageName: node + linkType: hard + +"end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0": + version: 1.4.4 + resolution: "end-of-stream@npm:1.4.4" + dependencies: + once: "npm:^1.4.0" + checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975 + languageName: node + linkType: hard + +"enhanced-resolve@npm:^4.5.0": + version: 4.5.0 + resolution: "enhanced-resolve@npm:4.5.0" + dependencies: + graceful-fs: "npm:^4.1.2" + memory-fs: "npm:^0.5.0" + tapable: "npm:^1.0.0" + checksum: 10c0/d95fc630606ea35bed21c4a029bbb1681919571a2d1d2011c7fc42a26a9e48ed3d74a89949ce331e1fd3229850a303e3218b887b92951330f16bdfbb93a10e64 + languageName: node + linkType: hard + +"entities@npm:^2.0.0": + version: 2.2.0 + resolution: "entities@npm:2.2.0" + checksum: 10c0/7fba6af1f116300d2ba1c5673fc218af1961b20908638391b4e1e6d5850314ee2ac3ec22d741b3a8060479911c99305164aed19b6254bde75e7e6b1b2c3f3aa3 + languageName: node + linkType: hard + +"entities@npm:^7.0.1": + version: 7.0.1 + resolution: "entities@npm:7.0.1" + checksum: 10c0/b4fb9937bb47ecb00aaaceb9db9cdd1cc0b0fb649c0e843d05cf5dbbd2e9d2df8f98721d8b1b286445689c72af7b54a7242fc2d63ef7c9739037a8c73363e7ca + languageName: node + linkType: hard + +"env-paths@npm:^2.2.0": + version: 2.2.1 + resolution: "env-paths@npm:2.2.1" + checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4 + languageName: node + linkType: hard + +"errno@npm:^0.1.3, errno@npm:~0.1.7": + version: 0.1.8 + resolution: "errno@npm:0.1.8" + dependencies: + prr: "npm:~1.0.1" + bin: + errno: cli.js + checksum: 10c0/83758951967ec57bf00b5f5b7dc797e6d65a6171e57ea57adcf1bd1a0b477fd9b5b35fae5be1ff18f4090ed156bce1db749fe7e317aac19d485a5d150f6a4936 + languageName: node + linkType: hard + +"error-ex@npm:^1.3.1": + version: 1.3.2 + resolution: "error-ex@npm:1.3.2" + dependencies: + is-arrayish: "npm:^0.2.1" + checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce + languageName: node + linkType: hard + +"error-stack-parser@npm:^2.0.6": + version: 2.1.4 + resolution: "error-stack-parser@npm:2.1.4" + dependencies: + stackframe: "npm:^1.3.4" + checksum: 10c0/7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9 + languageName: node + linkType: hard + +"es-abstract@npm:^1.17.2, es-abstract@npm:^1.18.0-next.2, es-abstract@npm:^1.18.2": + version: 1.18.3 + resolution: "es-abstract@npm:1.18.3" + dependencies: + call-bind: "npm:^1.0.2" + es-to-primitive: "npm:^1.2.1" + function-bind: "npm:^1.1.1" + get-intrinsic: "npm:^1.1.1" + has: "npm:^1.0.3" + has-symbols: "npm:^1.0.2" + is-callable: "npm:^1.2.3" + is-negative-zero: "npm:^2.0.1" + is-regex: "npm:^1.1.3" + is-string: "npm:^1.0.6" + object-inspect: "npm:^1.10.3" + object-keys: "npm:^1.1.1" + object.assign: "npm:^4.1.2" + string.prototype.trimend: "npm:^1.0.4" + string.prototype.trimstart: "npm:^1.0.4" + unbox-primitive: "npm:^1.0.1" + checksum: 10c0/e4faa9b23d775c2cb0e3aaa1e24b41deccbf7d61c6a30d80dc0fa35934997e87bd7592e1173431ece16432c24c2c45b3027787db4885868d34f4c723d3155f0a + languageName: node + linkType: hard + +"es-define-property@npm:^1.0.1": + version: 1.0.1 + resolution: "es-define-property@npm:1.0.1" + checksum: 10c0/3f54eb49c16c18707949ff25a1456728c883e81259f045003499efba399c08bad00deebf65cccde8c0e07908c1a225c9d472b7107e558f2a48e28d530e34527c + languageName: node + linkType: hard + +"es-errors@npm:^1.3.0": + version: 1.3.0 + resolution: "es-errors@npm:1.3.0" + checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85 + languageName: node + linkType: hard + +"es-object-atoms@npm:^1.0.0, es-object-atoms@npm:^1.1.1": + version: 1.1.1 + resolution: "es-object-atoms@npm:1.1.1" + dependencies: + es-errors: "npm:^1.3.0" + checksum: 10c0/65364812ca4daf48eb76e2a3b7a89b3f6a2e62a1c420766ce9f692665a29d94fe41fe88b65f24106f449859549711e4b40d9fb8002d862dfd7eb1c512d10be0c + languageName: node + linkType: hard + +"es-set-tostringtag@npm:^2.1.0": + version: 2.1.0 + resolution: "es-set-tostringtag@npm:2.1.0" + dependencies: + es-errors: "npm:^1.3.0" + get-intrinsic: "npm:^1.2.6" + has-tostringtag: "npm:^1.0.2" + hasown: "npm:^2.0.2" + checksum: 10c0/ef2ca9ce49afe3931cb32e35da4dcb6d86ab02592cfc2ce3e49ced199d9d0bb5085fc7e73e06312213765f5efa47cc1df553a6a5154584b21448e9fb8355b1af + languageName: node + linkType: hard + +"es-to-primitive@npm:^1.2.1": + version: 1.2.1 + resolution: "es-to-primitive@npm:1.2.1" + dependencies: + is-callable: "npm:^1.1.4" + is-date-object: "npm:^1.0.1" + is-symbol: "npm:^1.0.2" + checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1 + languageName: node + linkType: hard + +"escalade@npm:^3.1.1": + version: 3.1.1 + resolution: "escalade@npm:3.1.1" + checksum: 10c0/afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d + languageName: node + linkType: hard + +"escalade@npm:^3.2.0": + version: 3.2.0 + resolution: "escalade@npm:3.2.0" + checksum: 10c0/ced4dd3a78e15897ed3be74e635110bbf3b08877b0a41be50dcb325ee0e0b5f65fc2d50e9845194d7c4633f327e2e1c6cce00a71b617c5673df0374201d67f65 + languageName: node + linkType: hard + +"escape-html@npm:~1.0.3": + version: 1.0.3 + resolution: "escape-html@npm:1.0.3" + checksum: 10c0/524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3 + languageName: node + linkType: hard + +"escape-string-regexp@npm:^1.0.5": + version: 1.0.5 + resolution: "escape-string-regexp@npm:1.0.5" + checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371 + languageName: node + linkType: hard + +"eslint-config-prettier@npm:^6.0.0": + version: 6.15.0 + resolution: "eslint-config-prettier@npm:6.15.0" + dependencies: + get-stdin: "npm:^6.0.0" + peerDependencies: + eslint: ">=3.14.1" + bin: + eslint-config-prettier-check: bin/cli.js + checksum: 10c0/28fff0bd0cda1af62645955f916f4d5bc6922d6ec6a7c8c9dd207d3aab7a241ca1feb1ec787acea09a95956c7e5080a6310ed391b0ff218055378e1af24e2ff9 + languageName: node + linkType: hard + +"eslint-loader@npm:^2.2.1": + version: 2.2.1 + resolution: "eslint-loader@npm:2.2.1" + dependencies: + loader-fs-cache: "npm:^1.0.0" + loader-utils: "npm:^1.0.2" + object-assign: "npm:^4.0.1" + object-hash: "npm:^1.1.4" + rimraf: "npm:^2.6.1" + peerDependencies: + eslint: ">=1.6.0 <7.0.0" + webpack: ">=2.0.0 <5.0.0" + checksum: 10c0/c71137cf11b520ca820ef1d5e65c96766ddaa548e5054b39a1e580ebd996654af2c4c391b8fa199b7d71487fdac800e0d65da3f00d670d5bc607a6710e81b2e7 + languageName: node + linkType: hard + +"eslint-plugin-prettier@npm:^3.3.1": + version: 3.4.1 + resolution: "eslint-plugin-prettier@npm:3.4.1" + dependencies: + prettier-linter-helpers: "npm:^1.0.0" + peerDependencies: + eslint: ">=5.0.0" + prettier: ">=1.13.0" + peerDependenciesMeta: + eslint-config-prettier: + optional: true + checksum: 10c0/b2599dd22b5b0d2e3baffc94ba55a33ed525d642125d657fbc8511a2458146bdcc2bc810418713bb0049e37765def92b51213a4467984f4c758807bea224d0c5 + languageName: node + linkType: hard + +"eslint-plugin-vue@npm:^6.2.2": + version: 6.2.2 + resolution: "eslint-plugin-vue@npm:6.2.2" + dependencies: + natural-compare: "npm:^1.4.0" + semver: "npm:^5.6.0" + vue-eslint-parser: "npm:^7.0.0" + peerDependencies: + eslint: ^5.0.0 || ^6.0.0 + checksum: 10c0/5856b74dff72128f4b656d7bc0aab2351c097a8850cc6b8f775ff8c2fb6c9b00efab83b7d887dfba977b79246ee6bc284c701de7bd42b869d3eb63aeda1f9158 + languageName: node + linkType: hard + +"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.0.0, eslint-scope@npm:^5.1.1": + version: 5.1.1 + resolution: "eslint-scope@npm:5.1.1" + dependencies: + esrecurse: "npm:^4.3.0" + estraverse: "npm:^4.1.1" + checksum: 10c0/d30ef9dc1c1cbdece34db1539a4933fe3f9b14e1ffb27ecc85987902ee663ad7c9473bbd49a9a03195a373741e62e2f807c4938992e019b511993d163450e70a + languageName: node + linkType: hard + +"eslint-scope@npm:^4.0.3": + version: 4.0.3 + resolution: "eslint-scope@npm:4.0.3" + dependencies: + esrecurse: "npm:^4.1.0" + estraverse: "npm:^4.1.1" + checksum: 10c0/a2a3fe5845938ce7cfd2e658c309a9bb27a7f9ce94f0cc447ed5f9fa95b16451556d7e1db4c8e5d2aaa02d02850f5346d23091bbe94f7097412ce846504b4dcc + languageName: node + linkType: hard + +"eslint-utils@npm:^1.4.3": + version: 1.4.3 + resolution: "eslint-utils@npm:1.4.3" + dependencies: + eslint-visitor-keys: "npm:^1.1.0" + checksum: 10c0/ba19a817177d5fc54ae89cd80ecc8bc24eefd640bd8b0db204f29dc79cf9621bb42d68bf31eae6c89ca1f52d748b6583214f57288f9a78d2bd368a2340abe41c + languageName: node + linkType: hard + +"eslint-visitor-keys@npm:^1.1.0": + version: 1.3.0 + resolution: "eslint-visitor-keys@npm:1.3.0" + checksum: 10c0/10c91fdbbe36810dd4308e57f9a8bc7177188b2a70247e54e3af1fa05ebc66414ae6fd4ce3c6c6821591f43a556e9037bc6b071122e099b5f8b7d2f76df553e3 + languageName: node + linkType: hard + +"eslint-visitor-keys@npm:^2.1.0": + version: 2.1.0 + resolution: "eslint-visitor-keys@npm:2.1.0" + checksum: 10c0/9f0e3a2db751d84067d15977ac4b4472efd6b303e369e6ff241a99feac04da758f46d5add022c33d06b53596038dbae4b4aceb27c7e68b8dfc1055b35e495787 + languageName: node + linkType: hard + +"eslint@npm:^6.7.2": + version: 6.8.0 + resolution: "eslint@npm:6.8.0" + dependencies: + "@babel/code-frame": "npm:^7.0.0" + ajv: "npm:^6.10.0" + chalk: "npm:^2.1.0" + cross-spawn: "npm:^6.0.5" + debug: "npm:^4.0.1" + doctrine: "npm:^3.0.0" + eslint-scope: "npm:^5.0.0" + eslint-utils: "npm:^1.4.3" + eslint-visitor-keys: "npm:^1.1.0" + espree: "npm:^6.1.2" + esquery: "npm:^1.0.1" + esutils: "npm:^2.0.2" + file-entry-cache: "npm:^5.0.1" + functional-red-black-tree: "npm:^1.0.1" + glob-parent: "npm:^5.0.0" + globals: "npm:^12.1.0" + ignore: "npm:^4.0.6" + import-fresh: "npm:^3.0.0" + imurmurhash: "npm:^0.1.4" + inquirer: "npm:^7.0.0" + is-glob: "npm:^4.0.0" + js-yaml: "npm:^3.13.1" + json-stable-stringify-without-jsonify: "npm:^1.0.1" + levn: "npm:^0.3.0" + lodash: "npm:^4.17.14" + minimatch: "npm:^3.0.4" + mkdirp: "npm:^0.5.1" + natural-compare: "npm:^1.4.0" + optionator: "npm:^0.8.3" + progress: "npm:^2.0.0" + regexpp: "npm:^2.0.1" + semver: "npm:^6.1.2" + strip-ansi: "npm:^5.2.0" + strip-json-comments: "npm:^3.0.1" + table: "npm:^5.2.3" + text-table: "npm:^0.2.0" + v8-compile-cache: "npm:^2.0.3" + bin: + eslint: ./bin/eslint.js + checksum: 10c0/95cd68b3bee8fcabf4468d3fcdfe74baefa878556312ad9ffd25715fe0dc96d6a7d381133bd9307dc24604a14c74fd86ce4fa3851b10783bb69a456b2d7a4acb + languageName: node + linkType: hard + +"espree@npm:^6.1.2, espree@npm:^6.2.1": + version: 6.2.1 + resolution: "espree@npm:6.2.1" + dependencies: + acorn: "npm:^7.1.1" + acorn-jsx: "npm:^5.2.0" + eslint-visitor-keys: "npm:^1.1.0" + checksum: 10c0/499b47bc599ac3515598072ca787016bdaf0d463467ee1c7113061949359a26d74b8fb344afdad63e38b0e81c7b068013125f7a123d0776e0d75fffe2fc9cfac + languageName: node + linkType: hard + +"esprima@npm:^4.0.0": + version: 4.0.1 + resolution: "esprima@npm:4.0.1" + bin: + esparse: ./bin/esparse.js + esvalidate: ./bin/esvalidate.js + checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3 + languageName: node + linkType: hard + +"esquery@npm:^1.0.1, esquery@npm:^1.4.0": + version: 1.4.0 + resolution: "esquery@npm:1.4.0" + dependencies: + estraverse: "npm:^5.1.0" + checksum: 10c0/b9b18178d33c4335210c76e062de979dc38ee6b49deea12bff1b2315e6cfcca1fd7f8bc49f899720ad8ff25967ac95b5b182e81a8b7b59ff09dbd0d978c32f64 + languageName: node + linkType: hard + +"esrecurse@npm:^4.1.0, esrecurse@npm:^4.3.0": + version: 4.3.0 + resolution: "esrecurse@npm:4.3.0" + dependencies: + estraverse: "npm:^5.2.0" + checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5 + languageName: node + linkType: hard + +"estraverse@npm:^4.1.1": + version: 4.3.0 + resolution: "estraverse@npm:4.3.0" + checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d + languageName: node + linkType: hard + +"estraverse@npm:^5.1.0": + version: 5.2.0 + resolution: "estraverse@npm:5.2.0" + checksum: 10c0/76a07411841ddf30a6a75afc93e8c00bbfe255a62dee7e1dc90b06ce0d7b939a00cf816ae94566ab5bc1cfde773a49387a35650287840b842143fff46f8f9ae3 + languageName: node + linkType: hard + +"estraverse@npm:^5.2.0": + version: 5.3.0 + resolution: "estraverse@npm:5.3.0" + checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107 + languageName: node + linkType: hard + +"estree-walker@npm:^1.0.1": + version: 1.0.1 + resolution: "estree-walker@npm:1.0.1" + checksum: 10c0/fa9e5f8c1bbe8d01e314c0f03067b64a4f22d4c58410fc5237060d0c15b81e58c23921c41acc60abbdab490f1fdfcbd6408ede2d03ca704454272e0244d61a55 + languageName: node + linkType: hard + +"estree-walker@npm:^2.0.2": + version: 2.0.2 + resolution: "estree-walker@npm:2.0.2" + checksum: 10c0/53a6c54e2019b8c914dc395890153ffdc2322781acf4bd7d1a32d7aedc1710807bdcd866ac133903d5629ec601fbb50abe8c2e5553c7f5a0afdd9b6af6c945af + languageName: node + linkType: hard + +"esutils@npm:^2.0.2": + version: 2.0.3 + resolution: "esutils@npm:2.0.3" + checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7 + languageName: node + linkType: hard + +"etag@npm:~1.8.1": + version: 1.8.1 + resolution: "etag@npm:1.8.1" + checksum: 10c0/12be11ef62fb9817314d790089a0a49fae4e1b50594135dcb8076312b7d7e470884b5100d249b28c18581b7fd52f8b485689ffae22a11ed9ec17377a33a08f84 + languageName: node + linkType: hard + +"event-pubsub@npm:4.3.0": + version: 4.3.0 + resolution: "event-pubsub@npm:4.3.0" + checksum: 10c0/47fa4fb5b55b3ed08b912862cc913e03603fa063cd3ec5cf3dfeb39a19314d3ca327e938a2cf70685254ab3a71af8178969963c705a030c6081d625bec835114 + languageName: node + linkType: hard + +"eventemitter3@npm:^4.0.0": + version: 4.0.7 + resolution: "eventemitter3@npm:4.0.7" + checksum: 10c0/5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b + languageName: node + linkType: hard + +"events@npm:^3.0.0": + version: 3.3.0 + resolution: "events@npm:3.3.0" + checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6 + languageName: node + linkType: hard + +"eventsource@npm:^1.0.7": + version: 1.1.0 + resolution: "eventsource@npm:1.1.0" + dependencies: + original: "npm:^1.0.0" + checksum: 10c0/fabb4641ffb459f4d5baaf8b90c2dae2ada01252b3ca7f920797cf00b0f23236a9c4f2163aed9f2ded799c947f892321e9ee2d243c703ebd4a400be57692f474 + languageName: node + linkType: hard + +"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3": + version: 1.0.3 + resolution: "evp_bytestokey@npm:1.0.3" + dependencies: + md5.js: "npm:^1.3.4" + node-gyp: "npm:latest" + safe-buffer: "npm:^5.1.1" + checksum: 10c0/77fbe2d94a902a80e9b8f5a73dcd695d9c14899c5e82967a61b1fc6cbbb28c46552d9b127cff47c45fcf684748bdbcfa0a50410349109de87ceb4b199ef6ee99 + languageName: node + linkType: hard + +"execa@npm:^0.8.0": + version: 0.8.0 + resolution: "execa@npm:0.8.0" + dependencies: + cross-spawn: "npm:^5.0.1" + get-stream: "npm:^3.0.0" + is-stream: "npm:^1.1.0" + npm-run-path: "npm:^2.0.0" + p-finally: "npm:^1.0.0" + signal-exit: "npm:^3.0.0" + strip-eof: "npm:^1.0.0" + checksum: 10c0/e6c085687024cd5d348cad98a12213f6ebad2e962c7f3298ea8608fd5ed2daad8d1e27e79bfe7104bf60d8d80b56dd60267a0667006c29019e4297c96ecfe99d + languageName: node + linkType: hard + +"execa@npm:^1.0.0": + version: 1.0.0 + resolution: "execa@npm:1.0.0" + dependencies: + cross-spawn: "npm:^6.0.0" + get-stream: "npm:^4.0.0" + is-stream: "npm:^1.1.0" + npm-run-path: "npm:^2.0.0" + p-finally: "npm:^1.0.0" + signal-exit: "npm:^3.0.0" + strip-eof: "npm:^1.0.0" + checksum: 10c0/cc71707c9aa4a2552346893ee63198bf70a04b5a1bc4f8a0ef40f1d03c319eae80932c59191f037990d7d102193e83a38ec72115fff814ec2fb3099f3661a590 + languageName: node + linkType: hard + +"execa@npm:^3.3.0": + version: 3.4.0 + resolution: "execa@npm:3.4.0" + dependencies: + cross-spawn: "npm:^7.0.0" + get-stream: "npm:^5.0.0" + human-signals: "npm:^1.1.1" + is-stream: "npm:^2.0.0" + merge-stream: "npm:^2.0.0" + npm-run-path: "npm:^4.0.0" + onetime: "npm:^5.1.0" + p-finally: "npm:^2.0.0" + signal-exit: "npm:^3.0.2" + strip-final-newline: "npm:^2.0.0" + checksum: 10c0/fc823d6a32987c3105b38b1cbe26763cb98c5ad58012eeb781e8c25e2fb6c7baad7dd47488456537b273d3ddbf12bd257d772059befeee0acb06af246d2d5be1 + languageName: node + linkType: hard + +"expand-brackets@npm:^2.1.4": + version: 2.1.4 + resolution: "expand-brackets@npm:2.1.4" + dependencies: + debug: "npm:^2.3.3" + define-property: "npm:^0.2.5" + extend-shallow: "npm:^2.0.1" + posix-character-classes: "npm:^0.1.0" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.1" + checksum: 10c0/3e2fb95d2d7d7231486493fd65db913927b656b6fcdfcce41e139c0991a72204af619ad4acb1be75ed994ca49edb7995ef241dbf8cf44dc3c03d211328428a87 + languageName: node + linkType: hard + +"exponential-backoff@npm:^3.1.1": + version: 3.1.3 + resolution: "exponential-backoff@npm:3.1.3" + checksum: 10c0/77e3ae682b7b1f4972f563c6dbcd2b0d54ac679e62d5d32f3e5085feba20483cf28bd505543f520e287a56d4d55a28d7874299941faf637e779a1aa5994d1267 + languageName: node + linkType: hard + +"express@npm:^4.16.3, express@npm:^4.17.1": + version: 4.17.1 + resolution: "express@npm:4.17.1" + dependencies: + accepts: "npm:~1.3.7" + array-flatten: "npm:1.1.1" + body-parser: "npm:1.19.0" + content-disposition: "npm:0.5.3" + content-type: "npm:~1.0.4" + cookie: "npm:0.4.0" + cookie-signature: "npm:1.0.6" + debug: "npm:2.6.9" + depd: "npm:~1.1.2" + encodeurl: "npm:~1.0.2" + escape-html: "npm:~1.0.3" + etag: "npm:~1.8.1" + finalhandler: "npm:~1.1.2" + fresh: "npm:0.5.2" + merge-descriptors: "npm:1.0.1" + methods: "npm:~1.1.2" + on-finished: "npm:~2.3.0" + parseurl: "npm:~1.3.3" + path-to-regexp: "npm:0.1.7" + proxy-addr: "npm:~2.0.5" + qs: "npm:6.7.0" + range-parser: "npm:~1.2.1" + safe-buffer: "npm:5.1.2" + send: "npm:0.17.1" + serve-static: "npm:1.14.1" + setprototypeof: "npm:1.1.1" + statuses: "npm:~1.5.0" + type-is: "npm:~1.6.18" + utils-merge: "npm:1.0.1" + vary: "npm:~1.1.2" + checksum: 10c0/17bbe941cb98167d54d24f1b1f252e9e1757ad036b0ba7a836c51d3f1a7bf329ccbf72739d214599818ccec91115b7c5b87ad2d2a006e20142310af4d7c6f7bf + languageName: node + linkType: hard + +"extend-shallow@npm:^2.0.1": + version: 2.0.1 + resolution: "extend-shallow@npm:2.0.1" + dependencies: + is-extendable: "npm:^0.1.0" + checksum: 10c0/ee1cb0a18c9faddb42d791b2d64867bd6cfd0f3affb711782eb6e894dd193e2934a7f529426aac7c8ddb31ac5d38000a00aa2caf08aa3dfc3e1c8ff6ba340bd9 + languageName: node + linkType: hard + +"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2": + version: 3.0.2 + resolution: "extend-shallow@npm:3.0.2" + dependencies: + assign-symbols: "npm:^1.0.0" + is-extendable: "npm:^1.0.1" + checksum: 10c0/f39581b8f98e3ad94995e33214fff725b0297cf09f2725b6f624551cfb71e0764accfd0af80becc0182af5014d2a57b31b85ec999f9eb8a6c45af81752feac9a + languageName: node + linkType: hard + +"extend@npm:~3.0.2": + version: 3.0.2 + resolution: "extend@npm:3.0.2" + checksum: 10c0/73bf6e27406e80aa3e85b0d1c4fd987261e628064e170ca781125c0b635a3dabad5e05adbf07595ea0cf1e6c5396cacb214af933da7cbaf24fe75ff14818e8f9 + languageName: node + linkType: hard + +"external-editor@npm:^3.0.3": + version: 3.1.0 + resolution: "external-editor@npm:3.1.0" + dependencies: + chardet: "npm:^0.7.0" + iconv-lite: "npm:^0.4.24" + tmp: "npm:^0.0.33" + checksum: 10c0/c98f1ba3efdfa3c561db4447ff366a6adb5c1e2581462522c56a18bf90dfe4da382f9cd1feee3e330108c3595a854b218272539f311ba1b3298f841eb0fbf339 + languageName: node + linkType: hard + +"extglob@npm:^2.0.4": + version: 2.0.4 + resolution: "extglob@npm:2.0.4" + dependencies: + array-unique: "npm:^0.3.2" + define-property: "npm:^1.0.0" + expand-brackets: "npm:^2.1.4" + extend-shallow: "npm:^2.0.1" + fragment-cache: "npm:^0.2.1" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.1" + checksum: 10c0/e1a891342e2010d046143016c6c03d58455c2c96c30bf5570ea07929984ee7d48fad86b363aee08f7a8a638f5c3a66906429b21ecb19bc8e90df56a001cd282c + languageName: node + linkType: hard + +"extsprintf@npm:1.3.0": + version: 1.3.0 + resolution: "extsprintf@npm:1.3.0" + checksum: 10c0/f75114a8388f0cbce68e277b6495dc3930db4dde1611072e4a140c24e204affd77320d004b947a132e9a3b97b8253017b2b62dce661975fb0adced707abf1ab5 + languageName: node + linkType: hard + +"extsprintf@npm:^1.2.0": + version: 1.4.0 + resolution: "extsprintf@npm:1.4.0" + checksum: 10c0/c2164f9143198650253e3bccc711cc634896e04af85c5bf3e71b2cc23b5ab7e9757a7f0dc7150f50d69871d03aef1eb9c5b8ea9d5dd2a6cf47e88fbe145fefef + languageName: node + linkType: hard + +"fast-deep-equal@npm:^3.1.1": + version: 3.1.3 + resolution: "fast-deep-equal@npm:3.1.3" + checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0 + languageName: node + linkType: hard + +"fast-diff@npm:^1.1.2": + version: 1.3.0 + resolution: "fast-diff@npm:1.3.0" + checksum: 10c0/5c19af237edb5d5effda008c891a18a585f74bf12953be57923f17a3a4d0979565fc64dbc73b9e20926b9d895f5b690c618cbb969af0cf022e3222471220ad29 + languageName: node + linkType: hard + +"fast-glob@npm:^2.2.6": + version: 2.2.7 + resolution: "fast-glob@npm:2.2.7" + dependencies: + "@mrmlnc/readdir-enhanced": "npm:^2.2.1" + "@nodelib/fs.stat": "npm:^1.1.2" + glob-parent: "npm:^3.1.0" + is-glob: "npm:^4.0.0" + merge2: "npm:^1.2.3" + micromatch: "npm:^3.1.10" + checksum: 10c0/85bc858e298423d5a1b6eed6eee8556005a19d245c4ae9aceac04d56699ea9885ca0a2afc4f76b562416e94fe2048df6b2f306f3d4b7e51ed37b7a52fc1e4fc7 + languageName: node + linkType: hard + +"fast-json-stable-stringify@npm:^2.0.0": + version: 2.1.0 + resolution: "fast-json-stable-stringify@npm:2.1.0" + checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b + languageName: node + linkType: hard + +"fast-levenshtein@npm:~2.0.6": + version: 2.0.6 + resolution: "fast-levenshtein@npm:2.0.6" + checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4 + languageName: node + linkType: hard + +"faye-websocket@npm:^0.11.3": + version: 0.11.4 + resolution: "faye-websocket@npm:0.11.4" + dependencies: + websocket-driver: "npm:>=0.5.1" + checksum: 10c0/c6052a0bb322778ce9f89af92890f6f4ce00d5ec92418a35e5f4c6864a4fe736fec0bcebd47eac7c0f0e979b01530746b1c85c83cb04bae789271abf19737420 + languageName: node + linkType: hard + +"fdir@npm:^6.5.0": + version: 6.5.0 + resolution: "fdir@npm:6.5.0" + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + checksum: 10c0/e345083c4306b3aed6cb8ec551e26c36bab5c511e99ea4576a16750ddc8d3240e63826cc624f5ae17ad4dc82e68a253213b60d556c11bfad064b7607847ed07f + languageName: node + linkType: hard + +"figgy-pudding@npm:^3.5.1": + version: 3.5.2 + resolution: "figgy-pudding@npm:3.5.2" + checksum: 10c0/b21c7adaeb8485ef3c50e056b5dc8c3a6461818343aba141e0d7927aad47a0cb9f1d207ffdf494c380cd60d7c848c46a5ce5cb06987d10e9226fcec419c8af90 + languageName: node + linkType: hard + +"figures@npm:^3.0.0": + version: 3.2.0 + resolution: "figures@npm:3.2.0" + dependencies: + escape-string-regexp: "npm:^1.0.5" + checksum: 10c0/9c421646ede432829a50bc4e55c7a4eb4bcb7cc07b5bab2f471ef1ab9a344595bbebb6c5c21470093fbb730cd81bbca119624c40473a125293f656f49cb47629 + languageName: node + linkType: hard + +"file-entry-cache@npm:^5.0.1": + version: 5.0.1 + resolution: "file-entry-cache@npm:5.0.1" + dependencies: + flat-cache: "npm:^2.0.1" + checksum: 10c0/2480fb523a0342b8ede8b17717517f69ce6b775083d06e50e2e10ca45f16c94f1d4d95976ae627735716174033374a2d6717ba4b58569e1fea8564a1b1f2e4c1 + languageName: node + linkType: hard + +"file-loader@npm:^4.2.0": + version: 4.3.0 + resolution: "file-loader@npm:4.3.0" + dependencies: + loader-utils: "npm:^1.2.3" + schema-utils: "npm:^2.5.0" + peerDependencies: + webpack: ^4.0.0 + checksum: 10c0/e05171471b757ae8d35370e87e8ddecba680617c271ad27bbcae5de30a43ce1f745e35f6ed2a49ae1f4bb752249a7d0d7be654ff1cec8bb0f9f611386f1e2597 + languageName: node + linkType: hard + +"file-uri-to-path@npm:1.0.0": + version: 1.0.0 + resolution: "file-uri-to-path@npm:1.0.0" + checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519 + languageName: node + linkType: hard + +"filesize@npm:^3.6.1": + version: 3.6.1 + resolution: "filesize@npm:3.6.1" + checksum: 10c0/7b900b488c914d4b9146ddaf2865c410687977cf62c627760ff3c47dce4a00a53523658f40c9023bba8894d2e4841bc913af280472c2bb5aec29bc342eb33b6f + languageName: node + linkType: hard + +"fill-range@npm:^4.0.0": + version: 4.0.0 + resolution: "fill-range@npm:4.0.0" + dependencies: + extend-shallow: "npm:^2.0.1" + is-number: "npm:^3.0.0" + repeat-string: "npm:^1.6.1" + to-regex-range: "npm:^2.1.0" + checksum: 10c0/ccd57b7c43d7e28a1f8a60adfa3c401629c08e2f121565eece95e2386ebc64dedc7128d8c3448342aabf19db0c55a34f425f148400c7a7be9a606ba48749e089 + languageName: node + linkType: hard + +"fill-range@npm:^7.0.1": + version: 7.0.1 + resolution: "fill-range@npm:7.0.1" + dependencies: + to-regex-range: "npm:^5.0.1" + checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f + languageName: node + linkType: hard + +"finalhandler@npm:~1.1.2": + version: 1.1.2 + resolution: "finalhandler@npm:1.1.2" + dependencies: + debug: "npm:2.6.9" + encodeurl: "npm:~1.0.2" + escape-html: "npm:~1.0.3" + on-finished: "npm:~2.3.0" + parseurl: "npm:~1.3.3" + statuses: "npm:~1.5.0" + unpipe: "npm:~1.0.0" + checksum: 10c0/6a96e1f5caab085628c11d9fdceb82ba608d5e426c6913d4d918409baa271037a47f28fbba73279e8ad614f0b8fa71ea791d265e408d760793829edd8c2f4584 + languageName: node + linkType: hard + +"find-cache-dir@npm:^0.1.1": + version: 0.1.1 + resolution: "find-cache-dir@npm:0.1.1" + dependencies: + commondir: "npm:^1.0.1" + mkdirp: "npm:^0.5.1" + pkg-dir: "npm:^1.0.0" + checksum: 10c0/797d978c94352851f684d0565e3a60eca4aa380be91643c0a9066eec48c75ee0b382f6b04309fa6d183dea0bff1471ad7da116fcc7c8f95d4af8f5aca444ec41 + languageName: node + linkType: hard + +"find-cache-dir@npm:^2.1.0": + version: 2.1.0 + resolution: "find-cache-dir@npm:2.1.0" + dependencies: + commondir: "npm:^1.0.1" + make-dir: "npm:^2.0.0" + pkg-dir: "npm:^3.0.0" + checksum: 10c0/556117fd0af14eb88fb69250f4bba9e905e7c355c6136dff0e161b9cbd1f5285f761b778565a278da73a130f42eccc723d7ad4c002ae547ed1d698d39779dabb + languageName: node + linkType: hard + +"find-cache-dir@npm:^3.0.0, find-cache-dir@npm:^3.3.1": + version: 3.3.1 + resolution: "find-cache-dir@npm:3.3.1" + dependencies: + commondir: "npm:^1.0.1" + make-dir: "npm:^3.0.2" + pkg-dir: "npm:^4.1.0" + checksum: 10c0/589ece7a2721885c354f1f8c5c6d02c3acdfc9d62ae9fad2967e3a613fbfbc7a5ebdb727af3c77864f656224046fbc07e41733f9d9d3eb3896d149e9083ebbb4 + languageName: node + linkType: hard + +"find-up@npm:^1.0.0": + version: 1.1.2 + resolution: "find-up@npm:1.1.2" + dependencies: + path-exists: "npm:^2.0.0" + pinkie-promise: "npm:^2.0.0" + checksum: 10c0/51e35c62d9b7efe82d7d5cce966bfe10c2eaa78c769333f8114627e3a8a4a4f50747f5f50bff50b1094cbc6527776f0d3b9ff74d3561ef714a5290a17c80c2bc + languageName: node + linkType: hard + +"find-up@npm:^3.0.0": + version: 3.0.0 + resolution: "find-up@npm:3.0.0" + dependencies: + locate-path: "npm:^3.0.0" + checksum: 10c0/2c2e7d0a26db858e2f624f39038c74739e38306dee42b45f404f770db357947be9d0d587f1cac72d20c114deb38aa57316e879eb0a78b17b46da7dab0a3bd6e3 + languageName: node + linkType: hard + +"find-up@npm:^4.0.0": + version: 4.1.0 + resolution: "find-up@npm:4.1.0" + dependencies: + locate-path: "npm:^5.0.0" + path-exists: "npm:^4.0.0" + checksum: 10c0/0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1 + languageName: node + linkType: hard + +"flat-cache@npm:^2.0.1": + version: 2.0.1 + resolution: "flat-cache@npm:2.0.1" + dependencies: + flatted: "npm:^2.0.0" + rimraf: "npm:2.6.3" + write: "npm:1.0.3" + checksum: 10c0/09e4d2300d05734eb2ac39ea0bb9cc6d64c0c856f6b77d2bdc7734490b4a8f860d721f59ffd5508f6938c577f8394fe7b5f6acf99a5ec4af6478d7c5c8390bcb + languageName: node + linkType: hard + +"flatpickr@npm:4.6.1": + version: 4.6.1 + resolution: "flatpickr@npm:4.6.1" + checksum: 10c0/b2beaaffdbf81c63db4f22f6ab7a3844d9b98b14929a9b0c1a4d8c10e1e8e0932deeaf89598e58cadda9931815f96acc538aa060b363ce1a205b4c50d0bb34d2 + languageName: node + linkType: hard + +"flatpickr@npm:4.6.13": + version: 4.6.13 + resolution: "flatpickr@npm:4.6.13" + checksum: 10c0/0e027e72a2ce1716840a8c0bf9094f48d2665dc3f3024bf9604810c5bd7dd94aa830b133c5b5cfc0c330fc88939f33b54c8714515957f9d194c3a3bb7f75a1e2 + languageName: node + linkType: hard + +"flatted@npm:^2.0.0": + version: 2.0.2 + resolution: "flatted@npm:2.0.2" + checksum: 10c0/1895ac3971c3a71b0384c6d8b8ef1f217dfe7e72bc7dabc51ef532772b761e626dd7cae53a729b9e65389409d7f03fd84f1900bde4f9e719ed04e57e8510e0d4 + languageName: node + linkType: hard + +"flush-write-stream@npm:^1.0.0": + version: 1.1.1 + resolution: "flush-write-stream@npm:1.1.1" + dependencies: + inherits: "npm:^2.0.3" + readable-stream: "npm:^2.3.6" + checksum: 10c0/2cd4f65b728d5f388197a03dafabc6a5e4f0c2ed1a2d912e288f7aa1c2996dd90875e55b50cf32c78dca55ad2e2dfae5d3db09b223838388033d87cf5920dd87 + languageName: node + linkType: hard + +"follow-redirects@npm:^1.0.0": + version: 1.14.3 + resolution: "follow-redirects@npm:1.14.3" + peerDependenciesMeta: + debug: + optional: true + checksum: 10c0/02c94952aa0ce0b0d4fd45cb7af4cce5df37158a1757f9528f9488c3a2ed89b7d630764ba1e09918b98b5d9affbc3e06abc4fce90fb5608a79b10a9a81926e6c + languageName: node + linkType: hard + +"follow-redirects@npm:^1.16.0": + version: 1.16.0 + resolution: "follow-redirects@npm:1.16.0" + peerDependenciesMeta: + debug: + optional: true + checksum: 10c0/a1e2900163e6f1b4d1ed5c221b607f41decbab65534c63fe7e287e40a5d552a6496e7d9d7d976fa4ba77b4c51c11e5e9f683f10b43011ea11e442ff128d0e181 + languageName: node + linkType: hard + +"for-in@npm:^1.0.2": + version: 1.0.2 + resolution: "for-in@npm:1.0.2" + checksum: 10c0/42bb609d564b1dc340e1996868b67961257fd03a48d7fdafd4f5119530b87f962be6b4d5b7e3a3fc84c9854d149494b1d358e0b0ce9837e64c4c6603a49451d6 + languageName: node + linkType: hard + +"forever-agent@npm:~0.6.1": + version: 0.6.1 + resolution: "forever-agent@npm:0.6.1" + checksum: 10c0/364f7f5f7d93ab661455351ce116a67877b66f59aca199559a999bd39e3cfadbfbfacc10415a915255e2210b30c23febe9aec3ca16bf2d1ff11c935a1000e24c + languageName: node + linkType: hard + +"form-data@npm:^4.0.6": + version: 4.0.6 + resolution: "form-data@npm:4.0.6" + dependencies: + asynckit: "npm:^0.4.0" + combined-stream: "npm:^1.0.8" + es-set-tostringtag: "npm:^2.1.0" + hasown: "npm:^2.0.4" + mime-types: "npm:^2.1.35" + checksum: 10c0/43947a77bf0ff45c6ceed789778982d47a3f3e720a74b71721174ebf3310a5f1a8be1d6b38a3ee3688e8a18a2c4273073ec0844cd37efda3eaf46d41c9c318ff + languageName: node + linkType: hard + +"form-data@npm:~2.3.2": + version: 2.3.3 + resolution: "form-data@npm:2.3.3" + dependencies: + asynckit: "npm:^0.4.0" + combined-stream: "npm:^1.0.6" + mime-types: "npm:^2.1.12" + checksum: 10c0/706ef1e5649286b6a61e5bb87993a9842807fd8f149cd2548ee807ea4fb882247bdf7f6e64ac4720029c0cd5c80343de0e22eee1dc9e9882e12db9cc7bc016a4 + languageName: node + linkType: hard + +"forwarded@npm:0.2.0": + version: 0.2.0 + resolution: "forwarded@npm:0.2.0" + checksum: 10c0/9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33 + languageName: node + linkType: hard + +"fragment-cache@npm:^0.2.1": + version: 0.2.1 + resolution: "fragment-cache@npm:0.2.1" + dependencies: + map-cache: "npm:^0.2.2" + checksum: 10c0/5891d1c1d1d5e1a7fb3ccf28515c06731476fa88f7a50f4ede8a0d8d239a338448e7f7cc8b73db48da19c229fa30066104fe6489862065a4f1ed591c42fbeabf + languageName: node + linkType: hard + +"fresh@npm:0.5.2": + version: 0.5.2 + resolution: "fresh@npm:0.5.2" + checksum: 10c0/c6d27f3ed86cc5b601404822f31c900dd165ba63fff8152a3ef714e2012e7535027063bc67ded4cb5b3a49fa596495d46cacd9f47d6328459cf570f08b7d9e5a + languageName: node + linkType: hard + +"from2@npm:^2.1.0": + version: 2.3.0 + resolution: "from2@npm:2.3.0" + dependencies: + inherits: "npm:^2.0.1" + readable-stream: "npm:^2.0.0" + checksum: 10c0/f87f7a2e4513244d551454a7f8324ef1f7837864a8701c536417286ec19ff4915606b1dfa8909a21b7591ebd8440ffde3642f7c303690b9a4d7c832d62248aa1 + languageName: node + linkType: hard + +"fs-extra@npm:^7.0.1": + version: 7.0.1 + resolution: "fs-extra@npm:7.0.1" + dependencies: + graceful-fs: "npm:^4.1.2" + jsonfile: "npm:^4.0.0" + universalify: "npm:^0.1.0" + checksum: 10c0/1943bb2150007e3739921b8d13d4109abdc3cc481e53b97b7ea7f77eda1c3c642e27ae49eac3af074e3496ea02fde30f411ef410c760c70a38b92e656e5da784 + languageName: node + linkType: hard + +"fs-write-stream-atomic@npm:^1.0.8": + version: 1.0.10 + resolution: "fs-write-stream-atomic@npm:1.0.10" + dependencies: + graceful-fs: "npm:^4.1.2" + iferr: "npm:^0.1.5" + imurmurhash: "npm:^0.1.4" + readable-stream: "npm:1 || 2" + checksum: 10c0/293b2b4ed346d35a28f8637a20cb2aef31be86503da501c42c2eda8fefed328bac16ce0e5daa7019f9329d73930c58031eaea2ce0c70f1680943fbfb7cff808b + languageName: node + linkType: hard + +"fs.realpath@npm:^1.0.0": + version: 1.0.0 + resolution: "fs.realpath@npm:1.0.0" + checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948 + languageName: node + linkType: hard + +"fsevents@npm:^1.2.7": + version: 1.2.13 + resolution: "fsevents@npm:1.2.13" + dependencies: + bindings: "npm:^1.5.0" + nan: "npm:^2.12.1" + checksum: 10c0/4427ff08db9ee7327f2c3ad58ec56f9096a917eed861bfffaa2e2be419479cdf37d00750869ab9ecbf5f59f32ad999bd59577d73fc639193e6c0ce52bb253e02 + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@npm:~2.3.2": + version: 2.3.3 + resolution: "fsevents@npm:2.3.3" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60 + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@patch:fsevents@npm%3A^1.2.7#optional!builtin": + version: 1.2.13 + resolution: "fsevents@patch:fsevents@npm%3A1.2.13#optional!builtin::version=1.2.13&hash=d11327" + dependencies: + bindings: "npm:^1.5.0" + nan: "npm:^2.12.1" + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": + version: 2.3.3 + resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" + dependencies: + node-gyp: "npm:latest" + conditions: os=darwin + languageName: node + linkType: hard + +"function-bind@npm:^1.1.1": + version: 1.1.1 + resolution: "function-bind@npm:1.1.1" + checksum: 10c0/60b74b2407e1942e1ed7f8c284f8ef714d0689dcfce5319985a5b7da3fc727f40b4a59ec72dc55aa83365ad7b8fa4fac3a30d93c850a2b452f29ae03dbc10a1e + languageName: node + linkType: hard + +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5 + languageName: node + linkType: hard + +"functional-red-black-tree@npm:^1.0.1": + version: 1.0.1 + resolution: "functional-red-black-tree@npm:1.0.1" + checksum: 10c0/5959eed0375803d9924f47688479bb017e0c6816a0e5ac151e22ba6bfe1d12c41de2f339188885e0aa8eeea2072dad509d8e4448467e816bde0a2ca86a0670d3 + languageName: node + linkType: hard + +"gensync@npm:^1.0.0-beta.2": + version: 1.0.0-beta.2 + resolution: "gensync@npm:1.0.0-beta.2" + checksum: 10c0/782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8 + languageName: node + linkType: hard + +"get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5": + version: 2.0.5 + resolution: "get-caller-file@npm:2.0.5" + checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde + languageName: node + linkType: hard + +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1": + version: 1.1.1 + resolution: "get-intrinsic@npm:1.1.1" + dependencies: + function-bind: "npm:^1.1.1" + has: "npm:^1.0.3" + has-symbols: "npm:^1.0.1" + checksum: 10c0/c01055578e9b8da37a7779b18b732436c55d93e5ffa56b0fc4d3da8468ad89a25ce2343ba1945f20c0e78119bc7bb296fb59a0da521b6e43fd632de73376e040 + languageName: node + linkType: hard + +"get-intrinsic@npm:^1.2.6": + version: 1.3.0 + resolution: "get-intrinsic@npm:1.3.0" + dependencies: + call-bind-apply-helpers: "npm:^1.0.2" + es-define-property: "npm:^1.0.1" + es-errors: "npm:^1.3.0" + es-object-atoms: "npm:^1.1.1" + function-bind: "npm:^1.1.2" + get-proto: "npm:^1.0.1" + gopd: "npm:^1.2.0" + has-symbols: "npm:^1.1.0" + hasown: "npm:^2.0.2" + math-intrinsics: "npm:^1.1.0" + checksum: 10c0/52c81808af9a8130f581e6a6a83e1ba4a9f703359e7a438d1369a5267a25412322f03dcbd7c549edaef0b6214a0630a28511d7df0130c93cfd380f4fa0b5b66a + languageName: node + linkType: hard + +"get-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "get-proto@npm:1.0.1" + dependencies: + dunder-proto: "npm:^1.0.1" + es-object-atoms: "npm:^1.0.0" + checksum: 10c0/9224acb44603c5526955e83510b9da41baf6ae73f7398875fba50edc5e944223a89c4a72b070fcd78beb5f7bdda58ecb6294adc28f7acfc0da05f76a2399643c + languageName: node + linkType: hard + +"get-stdin@npm:^6.0.0": + version: 6.0.0 + resolution: "get-stdin@npm:6.0.0" + checksum: 10c0/c8971d27ffb72e4aae0f18ba792d2bfec872f662e98e13b182d8611a36f38396b79f43563884f597e667c7bb9ab98f337ee958ae278af5fa7c310ca62845e56b + languageName: node + linkType: hard + +"get-stream@npm:^3.0.0": + version: 3.0.0 + resolution: "get-stream@npm:3.0.0" + checksum: 10c0/003f5f3b8870da59c6aafdf6ed7e7b07b48c2f8629cd461bd3900726548b6b8cfa2e14d6b7814fbb08f07a42f4f738407fa70b989928b2783a76b278505bba22 + languageName: node + linkType: hard + +"get-stream@npm:^4.0.0": + version: 4.1.0 + resolution: "get-stream@npm:4.1.0" + dependencies: + pump: "npm:^3.0.0" + checksum: 10c0/294d876f667694a5ca23f0ca2156de67da950433b6fb53024833733975d32582896dbc7f257842d331809979efccf04d5e0b6b75ad4d45744c45f193fd497539 + languageName: node + linkType: hard + +"get-stream@npm:^5.0.0": + version: 5.2.0 + resolution: "get-stream@npm:5.2.0" + dependencies: + pump: "npm:^3.0.0" + checksum: 10c0/43797ffd815fbb26685bf188c8cfebecb8af87b3925091dd7b9a9c915993293d78e3c9e1bce125928ff92f2d0796f3889b92b5ec6d58d1041b574682132e0a80 + languageName: node + linkType: hard + +"get-value@npm:^2.0.3, get-value@npm:^2.0.6": + version: 2.0.6 + resolution: "get-value@npm:2.0.6" + checksum: 10c0/f069c132791b357c8fc4adfe9e2929b0a2c6e95f98ca7bc6fcbc27f8a302e552f86b4ae61ec56d9e9ac2544b93b6a39743d479866a37b43fcc104088ba74f0d9 + languageName: node + linkType: hard + +"getpass@npm:^0.1.1": + version: 0.1.7 + resolution: "getpass@npm:0.1.7" + dependencies: + assert-plus: "npm:^1.0.0" + checksum: 10c0/c13f8530ecf16fc509f3fa5cd8dd2129ffa5d0c7ccdf5728b6022d52954c2d24be3706b4cdf15333eec52f1fbb43feb70a01dabc639d1d10071e371da8aaa52f + languageName: node + linkType: hard + +"glob-parent@npm:^3.1.0": + version: 3.1.0 + resolution: "glob-parent@npm:3.1.0" + dependencies: + is-glob: "npm:^3.1.0" + path-dirname: "npm:^1.0.0" + checksum: 10c0/bfa89ce5ae1dfea4c2ece7b61d2ea230d87fcbec7472915cfdb3f4caf688a91ecb0dc86ae39b1e17505adce7e64cae3b971d64dc66091f3a0131169fd631b00d + languageName: node + linkType: hard + +"glob-parent@npm:^5.0.0, glob-parent@npm:~5.1.2": + version: 5.1.2 + resolution: "glob-parent@npm:5.1.2" + dependencies: + is-glob: "npm:^4.0.1" + checksum: 10c0/cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee + languageName: node + linkType: hard + +"glob-to-regexp@npm:^0.3.0": + version: 0.3.0 + resolution: "glob-to-regexp@npm:0.3.0" + checksum: 10c0/f7e8091288d88b397b715281560d86ba4998246c300cb0d51db483db0a4c68cb48b489af8da9c03262745e8aa5337ba596d82dee61ff9467c5d7c27d70b676aa + languageName: node + linkType: hard + +"glob@npm:^7.0.3, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4": + version: 7.1.7 + resolution: "glob@npm:7.1.7" + dependencies: + fs.realpath: "npm:^1.0.0" + inflight: "npm:^1.0.4" + inherits: "npm:2" + minimatch: "npm:^3.0.4" + once: "npm:^1.3.0" + path-is-absolute: "npm:^1.0.0" + checksum: 10c0/173245e6f9ccf904309eb7ef4a44a11f3bf68e9e341dff5a28b5db0dd7123b7506daf41497f3437a0710f57198187b758c2351eeaabce4d16935e956920da6a4 + languageName: node + linkType: hard + +"globals@npm:^12.1.0": + version: 12.4.0 + resolution: "globals@npm:12.4.0" + dependencies: + type-fest: "npm:^0.8.1" + checksum: 10c0/f6731c915f5fde6ac3737016be748682fdf52a436e4f2702d14cec4f15f3aefcc306483bdae4c9195b04848416443f57e9de6771c74fd77becfbba2d2068bc73 + languageName: node + linkType: hard + +"globby@npm:^6.1.0": + version: 6.1.0 + resolution: "globby@npm:6.1.0" + dependencies: + array-union: "npm:^1.0.1" + glob: "npm:^7.0.3" + object-assign: "npm:^4.0.1" + pify: "npm:^2.0.0" + pinkie-promise: "npm:^2.0.0" + checksum: 10c0/656ad1f0d02c6ef378c07589519ed3ec27fe988ea177195c05b8aff280320f3d67b91fa0baa6f7e49288f9bf1f92fc84f783a79ac3ed66278f3fa082e627ed84 + languageName: node + linkType: hard + +"globby@npm:^7.1.1": + version: 7.1.1 + resolution: "globby@npm:7.1.1" + dependencies: + array-union: "npm:^1.0.1" + dir-glob: "npm:^2.0.0" + glob: "npm:^7.1.2" + ignore: "npm:^3.3.5" + pify: "npm:^3.0.0" + slash: "npm:^1.0.0" + checksum: 10c0/016d4dfac6069221b2db18ad6afb0011639899920dbec87492ddc048fcd433361e6c094b12451ab14cf062013a776f47ef21bb8289d5e09a2f23e81d5aec0f8e + languageName: node + linkType: hard + +"globby@npm:^9.2.0": + version: 9.2.0 + resolution: "globby@npm:9.2.0" + dependencies: + "@types/glob": "npm:^7.1.1" + array-union: "npm:^1.0.2" + dir-glob: "npm:^2.2.2" + fast-glob: "npm:^2.2.6" + glob: "npm:^7.1.3" + ignore: "npm:^4.0.3" + pify: "npm:^4.0.1" + slash: "npm:^2.0.0" + checksum: 10c0/2bd47ec43797b81000f3619feff96803b22591961788c06d746f6c8ba2deb14676b591ee625eb74b197c0047b2236e4a7a2ad662417661231b317c1de67aee94 + languageName: node + linkType: hard + +"gopd@npm:^1.2.0": + version: 1.2.0 + resolution: "gopd@npm:1.2.0" + checksum: 10c0/50fff1e04ba2b7737c097358534eacadad1e68d24cccee3272e04e007bed008e68d2614f3987788428fd192a5ae3889d08fb2331417e4fc4a9ab366b2043cead + languageName: node + linkType: hard + +"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6": + version: 4.2.6 + resolution: "graceful-fs@npm:4.2.6" + checksum: 10c0/f24a75a9ca057c3d482148242878c7fe9e25ce73a46c7480a58b53f1915c93d9ddf27c2d22d8b99182447e8d7f37ae6b29a74b246bbcc8c0d0b36b0d0648cea5 + languageName: node + linkType: hard + +"graceful-fs@npm:^4.2.6": + version: 4.2.11 + resolution: "graceful-fs@npm:4.2.11" + checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 + languageName: node + linkType: hard + +"gzip-size@npm:^5.0.0": + version: 5.1.1 + resolution: "gzip-size@npm:5.1.1" + dependencies: + duplexer: "npm:^0.1.1" + pify: "npm:^4.0.1" + checksum: 10c0/1c346d3ab83b85687a9aa644928250b31e0fc42cf16ca152225a09465f7465b220849b3854b39a457681fabb37ab318b2c0f73be8991ecedf2073e082d1f6dd9 + languageName: node + linkType: hard + +"handle-thing@npm:^2.0.0": + version: 2.0.1 + resolution: "handle-thing@npm:2.0.1" + checksum: 10c0/7ae34ba286a3434f1993ebd1cc9c9e6b6d8ea672182db28b1afc0a7119229552fa7031e3e5f3cd32a76430ece4e94b7da6f12af2eb39d6239a7693e4bd63a998 + languageName: node + linkType: hard + +"har-schema@npm:^2.0.0": + version: 2.0.0 + resolution: "har-schema@npm:2.0.0" + checksum: 10c0/3856cb76152658e0002b9c2b45b4360bb26b3e832c823caed8fcf39a01096030bf09fa5685c0f7b0f2cb3ecba6e9dce17edaf28b64a423d6201092e6be56e592 + languageName: node + linkType: hard + +"har-validator@npm:~5.1.3": + version: 5.1.5 + resolution: "har-validator@npm:5.1.5" + dependencies: + ajv: "npm:^6.12.3" + har-schema: "npm:^2.0.0" + checksum: 10c0/f1d606eb1021839e3a905be5ef7cca81c2256a6be0748efb8fefc14312214f9e6c15d7f2eaf37514104071207d84f627b68bb9f6178703da4e06fbd1a0649a5e + languageName: node + linkType: hard + +"has-bigints@npm:^1.0.1": + version: 1.0.1 + resolution: "has-bigints@npm:1.0.1" + checksum: 10c0/59dc0ceb28468fcad0d3fd20a5d679dd577bae177f5caaf0b1f742df42a30267271538ab282c1c7dce14fcb9ba53401055363edab51d28fbae85c17b30f98a31 + languageName: node + linkType: hard + +"has-flag@npm:^3.0.0": + version: 3.0.0 + resolution: "has-flag@npm:3.0.0" + checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473 + languageName: node + linkType: hard + +"has-flag@npm:^4.0.0": + version: 4.0.0 + resolution: "has-flag@npm:4.0.0" + checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1 + languageName: node + linkType: hard + +"has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2": + version: 1.0.2 + resolution: "has-symbols@npm:1.0.2" + checksum: 10c0/bfac913244c77e6cb4e3cb6d617a70419f5fa4e1959e828a789b958933ceb997706eafb9615f27089e8fa57449094a3c81695ed3ec0c3b2fa8be8d506640b0f7 + languageName: node + linkType: hard + +"has-symbols@npm:^1.0.3, has-symbols@npm:^1.1.0": + version: 1.1.0 + resolution: "has-symbols@npm:1.1.0" + checksum: 10c0/dde0a734b17ae51e84b10986e651c664379018d10b91b6b0e9b293eddb32f0f069688c841fb40f19e9611546130153e0a2a48fd7f512891fb000ddfa36f5a20e + languageName: node + linkType: hard + +"has-tostringtag@npm:^1.0.2": + version: 1.0.2 + resolution: "has-tostringtag@npm:1.0.2" + dependencies: + has-symbols: "npm:^1.0.3" + checksum: 10c0/a8b166462192bafe3d9b6e420a1d581d93dd867adb61be223a17a8d6dad147aa77a8be32c961bb2f27b3ef893cae8d36f564ab651f5e9b7938ae86f74027c48c + languageName: node + linkType: hard + +"has-value@npm:^0.3.1": + version: 0.3.1 + resolution: "has-value@npm:0.3.1" + dependencies: + get-value: "npm:^2.0.3" + has-values: "npm:^0.1.4" + isobject: "npm:^2.0.0" + checksum: 10c0/7a7c2e9d07bc9742c81806150adb154d149bc6155267248c459cd1ce2a64b0759980d26213260e4b7599c8a3754551179f155ded88d0533a0d2bc7bc29028432 + languageName: node + linkType: hard + +"has-value@npm:^1.0.0": + version: 1.0.0 + resolution: "has-value@npm:1.0.0" + dependencies: + get-value: "npm:^2.0.6" + has-values: "npm:^1.0.0" + isobject: "npm:^3.0.0" + checksum: 10c0/17cdccaf50f8aac80a109dba2e2ee5e800aec9a9d382ef9deab66c56b34269e4c9ac720276d5ffa722764304a1180ae436df077da0dd05548cfae0209708ba4d + languageName: node + linkType: hard + +"has-values@npm:^0.1.4": + version: 0.1.4 + resolution: "has-values@npm:0.1.4" + checksum: 10c0/a8f00ad862c20289798c35243d5bd0b0a97dd44b668c2204afe082e0265f2d0bf3b89fc8cc0ef01a52b49f10aa35cf85c336ee3a5f1cac96ed490f5e901cdbf2 + languageName: node + linkType: hard + +"has-values@npm:^1.0.0": + version: 1.0.0 + resolution: "has-values@npm:1.0.0" + dependencies: + is-number: "npm:^3.0.0" + kind-of: "npm:^4.0.0" + checksum: 10c0/a6f2a1cc6b2e43eacc68e62e71ad6890def7f4b13d2ef06b4ad3ee156c23e470e6df144b9b467701908e17633411f1075fdff0cab45fb66c5e0584d89b25f35e + languageName: node + linkType: hard + +"has@npm:^1.0.0, has@npm:^1.0.3": + version: 1.0.3 + resolution: "has@npm:1.0.3" + dependencies: + function-bind: "npm:^1.1.1" + checksum: 10c0/e1da0d2bd109f116b632f27782cf23182b42f14972ca9540e4c5aa7e52647407a0a4a76937334fddcb56befe94a3494825ec22b19b51f5e5507c3153fd1a5e1b + languageName: node + linkType: hard + +"hash-base@npm:^3.0.0": + version: 3.1.0 + resolution: "hash-base@npm:3.1.0" + dependencies: + inherits: "npm:^2.0.4" + readable-stream: "npm:^3.6.0" + safe-buffer: "npm:^5.2.0" + checksum: 10c0/663eabcf4173326fbb65a1918a509045590a26cc7e0964b754eef248d281305c6ec9f6b31cb508d02ffca383ab50028180ce5aefe013e942b44a903ac8dc80d0 + languageName: node + linkType: hard + +"hash-sum@npm:^1.0.2": + version: 1.0.2 + resolution: "hash-sum@npm:1.0.2" + checksum: 10c0/311b2d7ea317b128860a88c7fd3ae46aef010b7fd7418a44afd2787cd889f24d635fa1e22a51bd5a5d8e338597c1da917d81f572e0de2f375e52e96c9fb63a66 + languageName: node + linkType: hard + +"hash-sum@npm:^2.0.0": + version: 2.0.0 + resolution: "hash-sum@npm:2.0.0" + checksum: 10c0/45dee9cf318d7a9b0ba5f766d35bfa14eb9483f9b878b1f980f097a87c2a490219774d42962c0c5c9bf53b1cca51724307bc35a0781218236da3d33715b4962d + languageName: node + linkType: hard + +"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3": + version: 1.1.7 + resolution: "hash.js@npm:1.1.7" + dependencies: + inherits: "npm:^2.0.3" + minimalistic-assert: "npm:^1.0.1" + checksum: 10c0/41ada59494eac5332cfc1ce6b7ebdd7b88a3864a6d6b08a3ea8ef261332ed60f37f10877e0c825aaa4bddebf164fbffa618286aeeec5296675e2671cbfa746c4 + languageName: node + linkType: hard + +"hasown@npm:^2.0.2": + version: 2.0.3 + resolution: "hasown@npm:2.0.3" + dependencies: + function-bind: "npm:^1.1.2" + checksum: 10c0/f5eb28c3fd0d3e4facd821c1eeee3836c37b70ab0b0fc532e8a39976e18fef43652415dadc52f8c7a5ff6d5ac93b7bef128789aa6f90f4e9b9a9083dce74ab38 + languageName: node + linkType: hard + +"hasown@npm:^2.0.3, hasown@npm:^2.0.4": + version: 2.0.4 + resolution: "hasown@npm:2.0.4" + dependencies: + function-bind: "npm:^1.1.2" + checksum: 10c0/2d8de939e270b70618f8cebb69746620db10617dbb495bc66ddad326955ea24d3ca4af133aff3eb7c1853e0218f867bc2b050ec26fe02e3aea58f880ffc5e506 + languageName: node + linkType: hard + +"he@npm:1.2.x": + version: 1.2.0 + resolution: "he@npm:1.2.0" + bin: + he: bin/he + checksum: 10c0/a27d478befe3c8192f006cdd0639a66798979dfa6e2125c6ac582a19a5ebfec62ad83e8382e6036170d873f46e4536a7e795bf8b95bf7c247f4cc0825ccc8c17 + languageName: node + linkType: hard + +"hex-color-regex@npm:^1.1.0": + version: 1.1.0 + resolution: "hex-color-regex@npm:1.1.0" + checksum: 10c0/43f0b8bbeb3906b6b2ddfb5ce6cbc28fb4f1e7b5129d0485e006ea20f92dc65f97b3b12591dd6a993de2ca10cb64a16a6a380a37481fc09432e7be0037be8f9c + languageName: node + linkType: hard + +"highlight.js@npm:^10.7.1": + version: 10.7.3 + resolution: "highlight.js@npm:10.7.3" + checksum: 10c0/073837eaf816922427a9005c56c42ad8786473dc042332dfe7901aa065e92bc3d94ebf704975257526482066abb2c8677cc0326559bb8621e046c21c5991c434 + languageName: node + linkType: hard + +"hmac-drbg@npm:^1.0.1": + version: 1.0.1 + resolution: "hmac-drbg@npm:1.0.1" + dependencies: + hash.js: "npm:^1.0.3" + minimalistic-assert: "npm:^1.0.0" + minimalistic-crypto-utils: "npm:^1.0.1" + checksum: 10c0/f3d9ba31b40257a573f162176ac5930109816036c59a09f901eb2ffd7e5e705c6832bedfff507957125f2086a0ab8f853c0df225642a88bf1fcaea945f20600d + languageName: node + linkType: hard + +"hoopy@npm:^0.1.4": + version: 0.1.4 + resolution: "hoopy@npm:0.1.4" + checksum: 10c0/4ef749e1a13d46cae52014b9de452635637086c333fc67245369a1262dee806386354a4ed845d507e59e5a0d3aef55246c0ec66f5bf2908d40eb77e7dff2a254 + languageName: node + linkType: hard + +"hosted-git-info@npm:^2.1.4": + version: 2.8.9 + resolution: "hosted-git-info@npm:2.8.9" + checksum: 10c0/317cbc6b1bbbe23c2a40ae23f3dafe9fa349ce42a89a36f930e3f9c0530c179a3882d2ef1e4141a4c3674d6faaea862138ec55b43ad6f75e387fda2483a13c70 + languageName: node + linkType: hard + +"hpack.js@npm:^2.1.6": + version: 2.1.6 + resolution: "hpack.js@npm:2.1.6" + dependencies: + inherits: "npm:^2.0.1" + obuf: "npm:^1.0.0" + readable-stream: "npm:^2.0.1" + wbuf: "npm:^1.1.0" + checksum: 10c0/55b9e824430bab82a19d079cb6e33042d7d0640325678c9917fcc020c61d8a08ca671b6c942c7f0aae9bb6e4b67ffb50734a72f9e21d66407c3138c1983b70f0 + languageName: node + linkType: hard + +"hsl-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "hsl-regex@npm:1.0.0" + checksum: 10c0/ddc29f4943c4a1768e611fadaebf6913d039640267f1fad2ac06f4dbdbe5cbe535d77dd19804898834671dd82751a4401c1b4d2ecade25d158ea23665d263e84 + languageName: node + linkType: hard + +"hsla-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "hsla-regex@npm:1.0.0" + checksum: 10c0/307874844a055af7a8f225e3908e1f7a2d96aa28e86abcb7ce1837cd86acf32d1f3c71ae105416d4c8623c8f9220b1bc799598851b0826274faa047710985f76 + languageName: node + linkType: hard + +"html-entities@npm:^1.3.1": + version: 1.4.0 + resolution: "html-entities@npm:1.4.0" + checksum: 10c0/eb2de616fb5948e681157805687672ea90e67c8a4f21a3215888ab422a984cab61fec96860708dca3bde0ae52577515683c8e28157ac8637220bb6a57a031b85 + languageName: node + linkType: hard + +"html-minifier@npm:^3.2.3": + version: 3.5.21 + resolution: "html-minifier@npm:3.5.21" + dependencies: + camel-case: "npm:3.0.x" + clean-css: "npm:4.2.x" + commander: "npm:2.17.x" + he: "npm:1.2.x" + param-case: "npm:2.1.x" + relateurl: "npm:0.2.x" + uglify-js: "npm:3.4.x" + bin: + html-minifier: ./cli.js + checksum: 10c0/010bd1a1304bca784e36b5a09db442a47c531cef80d9215149f7c08273bd9ba98dc9e3851e76c39d6c94ac4b182d08cfea3c4379604bd52072876a16389b2fbf + languageName: node + linkType: hard + +"html-tags@npm:^2.0.0": + version: 2.0.0 + resolution: "html-tags@npm:2.0.0" + checksum: 10c0/d438cc99feb04e7af2b51d114c40e4b789290edf544532134d5c92e6f64d1e4408bbb96ef31036260824fc0916dc4da454a4973f447dab83ed704ceafbaf8f19 + languageName: node + linkType: hard + +"html-webpack-plugin@npm:^3.2.0": + version: 3.2.0 + resolution: "html-webpack-plugin@npm:3.2.0" + dependencies: + html-minifier: "npm:^3.2.3" + loader-utils: "npm:^0.2.16" + lodash: "npm:^4.17.3" + pretty-error: "npm:^2.0.2" + tapable: "npm:^1.0.0" + toposort: "npm:^1.0.0" + util.promisify: "npm:1.0.0" + peerDependencies: + webpack: ^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 + checksum: 10c0/f57294e713641259f8ef99b8221683f0c44812ef7cc0afa165c5c2621071423bb072a836f2e5604a2b96f0eb03d2f78eaaeadc56eb0d398f7b915fb42f54683c + languageName: node + linkType: hard + +"htmlparser2@npm:^6.1.0": + version: 6.1.0 + resolution: "htmlparser2@npm:6.1.0" + dependencies: + domelementtype: "npm:^2.0.1" + domhandler: "npm:^4.0.0" + domutils: "npm:^2.5.2" + entities: "npm:^2.0.0" + checksum: 10c0/3058499c95634f04dc66be8c2e0927cd86799413b2d6989d8ae542ca4dbf5fa948695d02c27d573acf44843af977aec6d9a7bdd0f6faa6b2d99e2a729b2a31b6 + languageName: node + linkType: hard + +"http-deceiver@npm:^1.2.7": + version: 1.2.7 + resolution: "http-deceiver@npm:1.2.7" + checksum: 10c0/8bb9b716f5fc55f54a451da7f49b9c695c3e45498a789634daec26b61e4add7c85613a4a9e53726c39d09de7a163891ecd6eb5809adb64500a840fd86fe81d03 + languageName: node + linkType: hard + +"http-errors@npm:1.7.2": + version: 1.7.2 + resolution: "http-errors@npm:1.7.2" + dependencies: + depd: "npm:~1.1.2" + inherits: "npm:2.0.3" + setprototypeof: "npm:1.1.1" + statuses: "npm:>= 1.5.0 < 2" + toidentifier: "npm:1.0.0" + checksum: 10c0/49d3b2d52ee4bb24110fb4cff13a52e960501f63803d99bf50b6f93825335eab85bfd4809a90b5a5432ed13efe06c3979553a7a967cd196db1b0e23056068365 + languageName: node + linkType: hard + +"http-errors@npm:~1.6.2": + version: 1.6.3 + resolution: "http-errors@npm:1.6.3" + dependencies: + depd: "npm:~1.1.2" + inherits: "npm:2.0.3" + setprototypeof: "npm:1.1.0" + statuses: "npm:>= 1.4.0 < 2" + checksum: 10c0/17ec4046ee974477778bfdd525936c254b872054703ec2caa4d6f099566b8adade636ae6aeeacb39302c5cd6e28fb407ebd937f500f5010d0b6850750414ff78 + languageName: node + linkType: hard + +"http-errors@npm:~1.7.2": + version: 1.7.3 + resolution: "http-errors@npm:1.7.3" + dependencies: + depd: "npm:~1.1.2" + inherits: "npm:2.0.4" + setprototypeof: "npm:1.1.1" + statuses: "npm:>= 1.5.0 < 2" + toidentifier: "npm:1.0.0" + checksum: 10c0/5c3443c340d35b2f18ce908266c4ae93305b7d900bef765ac8dc56fa90125b9fe18a1ed9ebf6af23dc3ba7763731921a2682bf968e199eccf383eb8f508be6c2 + languageName: node + linkType: hard + +"http-parser-js@npm:>=0.5.1": + version: 0.5.3 + resolution: "http-parser-js@npm:0.5.3" + checksum: 10c0/3a591d68384712b4717ab08b74600cd900913cd1807ec4b99e9bfd2ca48ad2a5b294db6063c12fb9baeb1397fae2fd6041b24bc9e3bd54772154f451cf711081 + languageName: node + linkType: hard + +"http-proxy-middleware@npm:0.19.1": + version: 0.19.1 + resolution: "http-proxy-middleware@npm:0.19.1" + dependencies: + http-proxy: "npm:^1.17.0" + is-glob: "npm:^4.0.0" + lodash: "npm:^4.17.11" + micromatch: "npm:^3.1.10" + checksum: 10c0/b0c466dd54fac365e93f43138cba256063040557ae24fc92944b06fac35e879b882085e36fe276e48f5a27848b1600cd3ae59a845cb18714f5c0f205523783b1 + languageName: node + linkType: hard + +"http-proxy-middleware@npm:^1.0.0": + version: 1.3.1 + resolution: "http-proxy-middleware@npm:1.3.1" + dependencies: + "@types/http-proxy": "npm:^1.17.5" + http-proxy: "npm:^1.18.1" + is-glob: "npm:^4.0.1" + is-plain-obj: "npm:^3.0.0" + micromatch: "npm:^4.0.2" + checksum: 10c0/34e6e211f04672a625dbbb2f63e834951eaedda72a28b7a559a0ce9c40dcd857dba312e482144cdc5255cd7fe63debbe4bbfc6c2f936fb31ccc3ceb814ad30da + languageName: node + linkType: hard + +"http-proxy@npm:^1.17.0, http-proxy@npm:^1.18.1": + version: 1.18.1 + resolution: "http-proxy@npm:1.18.1" + dependencies: + eventemitter3: "npm:^4.0.0" + follow-redirects: "npm:^1.0.0" + requires-port: "npm:^1.0.0" + checksum: 10c0/148dfa700a03fb421e383aaaf88ac1d94521dfc34072f6c59770528c65250983c2e4ec996f2f03aa9f3fe46cd1270a593126068319311e3e8d9e610a37533e94 + languageName: node + linkType: hard + +"http-signature@npm:~1.2.0": + version: 1.2.0 + resolution: "http-signature@npm:1.2.0" + dependencies: + assert-plus: "npm:^1.0.0" + jsprim: "npm:^1.2.2" + sshpk: "npm:^1.7.0" + checksum: 10c0/582f7af7f354429e1fb19b3bbb9d35520843c69bb30a25b88ca3c5c2c10715f20ae7924e20cffbed220b1d3a726ef4fe8ccc48568d5744db87be9a79887d6733 + languageName: node + linkType: hard + +"https-browserify@npm:^1.0.0": + version: 1.0.0 + resolution: "https-browserify@npm:1.0.0" + checksum: 10c0/e17b6943bc24ea9b9a7da5714645d808670af75a425f29baffc3284962626efdc1eb3aa9bbffaa6e64028a6ad98af5b09fabcb454a8f918fb686abfdc9e9b8ae + languageName: node + linkType: hard + +"https-proxy-agent@npm:^5.0.1": + version: 5.0.1 + resolution: "https-proxy-agent@npm:5.0.1" + dependencies: + agent-base: "npm:6" + debug: "npm:4" + checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1 + languageName: node + linkType: hard + +"human-signals@npm:^1.1.1": + version: 1.1.1 + resolution: "human-signals@npm:1.1.1" + checksum: 10c0/18810ed239a7a5e23fb6c32d0fd4be75d7cd337a07ad59b8dbf0794cb0761e6e628349ee04c409e605fe55344716eab5d0a47a62ba2a2d0d367c89a2b4247b1e + languageName: node + linkType: hard + +"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24": + version: 0.4.24 + resolution: "iconv-lite@npm:0.4.24" + dependencies: + safer-buffer: "npm:>= 2.1.2 < 3" + checksum: 10c0/c6886a24cc00f2a059767440ec1bc00d334a89f250db8e0f7feb4961c8727118457e27c495ba94d082e51d3baca378726cd110aaf7ded8b9bbfd6a44760cf1d4 + languageName: node + linkType: hard + +"icss-utils@npm:^4.0.0, icss-utils@npm:^4.1.1": + version: 4.1.1 + resolution: "icss-utils@npm:4.1.1" + dependencies: + postcss: "npm:^7.0.14" + checksum: 10c0/22803c243bb097c2290b4e7c20ed14746f3e00e04856f953b751c7e6bb8c81620764bcf98d200a92d167af0884d19143c089d02e2bc609abcdeb86f465328797 + languageName: node + linkType: hard + +"ieee754@npm:^1.1.4": + version: 1.2.1 + resolution: "ieee754@npm:1.2.1" + checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb + languageName: node + linkType: hard + +"iferr@npm:^0.1.5": + version: 0.1.5 + resolution: "iferr@npm:0.1.5" + checksum: 10c0/e0669b1757d0501b43a158321945d1cc1fe56f28a972df2f88a5818f05c8853c7669ba5d6cfbbf9a1a312850699de6e528626df108d559005df7e15d16ee334c + languageName: node + linkType: hard + +"ignore@npm:^3.3.5": + version: 3.3.10 + resolution: "ignore@npm:3.3.10" + checksum: 10c0/973e0ef3b3eaab8fc19014d80014ed11bcf3585de8088d9c7a5b5c4edefc55f4ecdc498144bdd0440b8e2ff22deb03f89c90300bfef2d1750d5920f997d0a600 + languageName: node + linkType: hard + +"ignore@npm:^4.0.3, ignore@npm:^4.0.6": + version: 4.0.6 + resolution: "ignore@npm:4.0.6" + checksum: 10c0/836ee7dc7fd9436096e2dba429359dbb9fa0e33d309e2b2d81692f375f6ca82024fc00567f798613d50c6b989e9cd2ad2b065acf116325cde177f02c86b7d4e0 + languageName: node + linkType: hard + +"immutable@npm:^5.1.5": + version: 5.1.6 + resolution: "immutable@npm:5.1.6" + checksum: 10c0/79eb033f68ca70fca60fb052c87b5420034e460e306ce9bea2558fd7b5e0b3b59c28c4a4653867305992b4a30e169b353175d78126c1be6ed0113794b27e3317 + languageName: node + linkType: hard + +"import-cwd@npm:^2.0.0": + version: 2.1.0 + resolution: "import-cwd@npm:2.1.0" + dependencies: + import-from: "npm:^2.1.0" + checksum: 10c0/d530fe3e70b42ad1db6d6b01db888dc6f0275a3106122e8bde60240694e0833bf7f070f56130da9bf5026fb65d5fcaca5821ae07956437187ed9aeb74bf6621b + languageName: node + linkType: hard + +"import-fresh@npm:^2.0.0": + version: 2.0.0 + resolution: "import-fresh@npm:2.0.0" + dependencies: + caller-path: "npm:^2.0.0" + resolve-from: "npm:^3.0.0" + checksum: 10c0/116c55ee5215a7839062285b60df85dbedde084c02111dc58c1b9d03ff7876627059f4beb16cdc090a3db21fea9022003402aa782139dc8d6302589038030504 + languageName: node + linkType: hard + +"import-fresh@npm:^3.0.0": + version: 3.3.0 + resolution: "import-fresh@npm:3.3.0" + dependencies: + parent-module: "npm:^1.0.0" + resolve-from: "npm:^4.0.0" + checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3 + languageName: node + linkType: hard + +"import-from@npm:^2.1.0": + version: 2.1.0 + resolution: "import-from@npm:2.1.0" + dependencies: + resolve-from: "npm:^3.0.0" + checksum: 10c0/b7cb61873ba0d7df0cfba4904180e705dec1817766c9b39931b792be8e561188765dc49fba3d883e20873529619e9cff52a514c351a7d36db7c744c4ea2a2000 + languageName: node + linkType: hard + +"import-local@npm:^2.0.0": + version: 2.0.0 + resolution: "import-local@npm:2.0.0" + dependencies: + pkg-dir: "npm:^3.0.0" + resolve-cwd: "npm:^2.0.0" + bin: + import-local-fixture: fixtures/cli.js + checksum: 10c0/68f2d9203d3760a836db97e917ea1793e865e0c5dd3749380ccaf52be907553febb0828f14c3169e66ba1a458d931b3cc5597cc9b623c7f79b395b0c3892601e + languageName: node + linkType: hard + +"imurmurhash@npm:^0.1.4": + version: 0.1.4 + resolution: "imurmurhash@npm:0.1.4" + checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6 + languageName: node + linkType: hard + +"indexes-of@npm:^1.0.1": + version: 1.0.1 + resolution: "indexes-of@npm:1.0.1" + checksum: 10c0/1ea1d2d00173fa38f728acfa00303657e1115361481e52f6cbae47c5d603219006c9357abf6bc323f1fb0fbe937e363bbb19e5c66c12578eea6ec6b7e892bdba + languageName: node + linkType: hard + +"infer-owner@npm:^1.0.3": + version: 1.0.4 + resolution: "infer-owner@npm:1.0.4" + checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9 + languageName: node + linkType: hard + +"inflight@npm:^1.0.4": + version: 1.0.6 + resolution: "inflight@npm:1.0.6" + dependencies: + once: "npm:^1.3.0" + wrappy: "npm:1" + checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2 + languageName: node + linkType: hard + +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3": + version: 2.0.4 + resolution: "inherits@npm:2.0.4" + checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 + languageName: node + linkType: hard + +"inherits@npm:2.0.1": + version: 2.0.1 + resolution: "inherits@npm:2.0.1" + checksum: 10c0/bfc7b37c21a2cddb272adc65b053b1716612d408bb2c9a4e5c32679dc2b08032aadd67880c405be3dff060a62e45b353fc3d9fa79a3067ad7a3deb6a283cc5c6 + languageName: node + linkType: hard + +"inherits@npm:2.0.3": + version: 2.0.3 + resolution: "inherits@npm:2.0.3" + checksum: 10c0/6e56402373149ea076a434072671f9982f5fad030c7662be0332122fe6c0fa490acb3cc1010d90b6eff8d640b1167d77674add52dfd1bb85d545cf29e80e73e7 + languageName: node + linkType: hard + +"inquirer@npm:^7.0.0, inquirer@npm:^7.1.0": + version: 7.3.3 + resolution: "inquirer@npm:7.3.3" + dependencies: + ansi-escapes: "npm:^4.2.1" + chalk: "npm:^4.1.0" + cli-cursor: "npm:^3.1.0" + cli-width: "npm:^3.0.0" + external-editor: "npm:^3.0.3" + figures: "npm:^3.0.0" + lodash: "npm:^4.17.19" + mute-stream: "npm:0.0.8" + run-async: "npm:^2.4.0" + rxjs: "npm:^6.6.0" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + through: "npm:^2.3.6" + checksum: 10c0/96e75974cfd863fe6653c075e41fa5f1a290896df141189816db945debabcd92d3277145f11aef8d2cfca5409ab003ccdd18a099744814057b52a2f27aeb8c94 + languageName: node + linkType: hard + +"internal-ip@npm:^4.3.0": + version: 4.3.0 + resolution: "internal-ip@npm:4.3.0" + dependencies: + default-gateway: "npm:^4.2.0" + ipaddr.js: "npm:^1.9.0" + checksum: 10c0/c0ad0b95981c8f21a2d4f115212af38c894a6a6d0a2a3cac4d73d1b5beb214fdfce7b5e66f087e8d575977d4df630886914412d1bc9c2678e5870210154ad65b + languageName: node + linkType: hard + +"ip-regex@npm:^2.1.0": + version: 2.1.0 + resolution: "ip-regex@npm:2.1.0" + checksum: 10c0/3ce2d8307fa0373ca357eba7504e66e73b8121805fd9eba6a343aeb077c64c30659fa876b11ac7a75635b7529d2ce87723f208a5b9d51571513b5c68c0cc1541 + languageName: node + linkType: hard + +"ip@npm:^1.1.0, ip@npm:^1.1.5": + version: 1.1.5 + resolution: "ip@npm:1.1.5" + checksum: 10c0/877e98d676cd8d0ca01fee8282d11b91fb97be7dd9d0b2d6d98e161db2d4277954f5b55db7cfc8556fe6841cb100d13526a74f50ab0d83d6b130fe8445040175 + languageName: node + linkType: hard + +"ipaddr.js@npm:1.9.1, ipaddr.js@npm:^1.9.0": + version: 1.9.1 + resolution: "ipaddr.js@npm:1.9.1" + checksum: 10c0/0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a + languageName: node + linkType: hard + +"is-absolute-url@npm:^2.0.0": + version: 2.1.0 + resolution: "is-absolute-url@npm:2.1.0" + checksum: 10c0/2c324c3118752d82c18afadffbea14d35224e76f37a2ee80e05b209386c46d19bef77b58ede41f7b3be552cde16c6cdb0d884807175a6eb40e8c61281dc67c2f + languageName: node + linkType: hard + +"is-absolute-url@npm:^3.0.3": + version: 3.0.3 + resolution: "is-absolute-url@npm:3.0.3" + checksum: 10c0/04c415974c32e73a83d3a21a9bea18fc4e2c14fbe6bbd64832cf1e67a75ade2af0e900f552f0b8a447f1305f5ffc9d143ccd8d005dbe715d198c359d342b86f0 + languageName: node + linkType: hard + +"is-accessor-descriptor@npm:^0.1.6": + version: 0.1.6 + resolution: "is-accessor-descriptor@npm:0.1.6" + dependencies: + kind-of: "npm:^3.0.2" + checksum: 10c0/f2c314b314ec6e8a6e559351bff3c7ee9aed7a5e9c6f61dd8cb9e1382c8bfe33dca3f0e0af13daf9ded9e6e66390ff23b4acfb615d7a249009a51506a7b0f151 + languageName: node + linkType: hard + +"is-accessor-descriptor@npm:^1.0.0": + version: 1.0.0 + resolution: "is-accessor-descriptor@npm:1.0.0" + dependencies: + kind-of: "npm:^6.0.0" + checksum: 10c0/d68edafd8ef133e9003837f3c80f4e5b82b12ab5456c772d1796857671ae83e3a426ed225a28a7e35bceabbce68c1f1ffdabf47e6d53f5a4d6c4558776ad3c20 + languageName: node + linkType: hard + +"is-arguments@npm:^1.0.4": + version: 1.1.0 + resolution: "is-arguments@npm:1.1.0" + dependencies: + call-bind: "npm:^1.0.0" + checksum: 10c0/685ca8dc30ec714947d37a5f41f1421dcfda760d8dfa5ef55bc3ffb0433b578959d01d3276f8ea423e0eed7b3d7d39c64fa83b98b62d388cfb9d190ee104d5d8 + languageName: node + linkType: hard + +"is-arrayish@npm:^0.2.1": + version: 0.2.1 + resolution: "is-arrayish@npm:0.2.1" + checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729 + languageName: node + linkType: hard + +"is-arrayish@npm:^0.3.1": + version: 0.3.2 + resolution: "is-arrayish@npm:0.3.2" + checksum: 10c0/f59b43dc1d129edb6f0e282595e56477f98c40278a2acdc8b0a5c57097c9eff8fe55470493df5775478cf32a4dc8eaf6d3a749f07ceee5bc263a78b2434f6a54 + languageName: node + linkType: hard + +"is-bigint@npm:^1.0.1": + version: 1.0.2 + resolution: "is-bigint@npm:1.0.2" + checksum: 10c0/2e334fe08d219c979b3c8ede50021b64c22ff3db24b850f937598295f48bbaabf95f81b4ae5bbb6dafbe0eb3e6ca255adcac0f08d7a5357f2a807ecb549f1ae7 + languageName: node + linkType: hard + +"is-binary-path@npm:^1.0.0": + version: 1.0.1 + resolution: "is-binary-path@npm:1.0.1" + dependencies: + binary-extensions: "npm:^1.0.0" + checksum: 10c0/16e456fa3782eaf3d8e28d382b750507e3d54ff6694df8a1b2c6498da321e2ead311de9c42e653d8fb3213de72bac204b5f97e4a110cda8a72f17b1c1b4eb643 + languageName: node + linkType: hard + +"is-binary-path@npm:~2.1.0": + version: 2.1.0 + resolution: "is-binary-path@npm:2.1.0" + dependencies: + binary-extensions: "npm:^2.0.0" + checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38 + languageName: node + linkType: hard + +"is-boolean-object@npm:^1.1.0": + version: 1.1.1 + resolution: "is-boolean-object@npm:1.1.1" + dependencies: + call-bind: "npm:^1.0.2" + checksum: 10c0/5d3af565c7f9064cb67b2182a70b0d043365f251ec13571efda2c65d057ec312c3faf1d92a77a59a288a409e8c8d4ce9c54e15065be63544a4cc9148ef2aebe9 + languageName: node + linkType: hard + +"is-buffer@npm:^1.1.5": + version: 1.1.6 + resolution: "is-buffer@npm:1.1.6" + checksum: 10c0/ae18aa0b6e113d6c490ad1db5e8df9bdb57758382b313f5a22c9c61084875c6396d50bbf49315f5b1926d142d74dfb8d31b40d993a383e0a158b15fea7a82234 + languageName: node + linkType: hard + +"is-callable@npm:^1.1.4, is-callable@npm:^1.2.3": + version: 1.2.3 + resolution: "is-callable@npm:1.2.3" + checksum: 10c0/359604b60827b38593deabeb78993cc838cfc2b8927760dca91eb31cb481678814fdcbf92ceac12dc2498926b5ffc4d01b3c10a4f21733742880f9b7847ea5f8 + languageName: node + linkType: hard + +"is-ci@npm:^1.0.10": + version: 1.2.1 + resolution: "is-ci@npm:1.2.1" + dependencies: + ci-info: "npm:^1.5.0" + bin: + is-ci: bin.js + checksum: 10c0/56d8e0e404c5ee9eb4cc846b9fbed043bac587633a8b10caad35b1e4b11edccae742037c4bc2196203e5929643bd257a4caac23b65e99b372a54e68d187bacc9 + languageName: node + linkType: hard + +"is-color-stop@npm:^1.0.0": + version: 1.1.0 + resolution: "is-color-stop@npm:1.1.0" + dependencies: + css-color-names: "npm:^0.0.4" + hex-color-regex: "npm:^1.1.0" + hsl-regex: "npm:^1.0.0" + hsla-regex: "npm:^1.0.0" + rgb-regex: "npm:^1.0.1" + rgba-regex: "npm:^1.0.0" + checksum: 10c0/12d9a9d6b3da07bd69f678d6dbe897fccbd573ead12057f60c4773129e34ea2b658f29c1fb8ef84c548e8ac62061c04c16e23ffcb00d01900fa1f72b7ab3b569 + languageName: node + linkType: hard + +"is-core-module@npm:^2.16.1": + version: 2.16.2 + resolution: "is-core-module@npm:2.16.2" + dependencies: + hasown: "npm:^2.0.3" + checksum: 10c0/14b4258390283709c15476d023ec173e27458d5d014ccdb8ed39d576e551c3fa45498b7c9fe178f1529c4cb2648ddd58852a6a62107a019f6e349529f277518a + languageName: node + linkType: hard + +"is-core-module@npm:^2.2.0": + version: 2.5.0 + resolution: "is-core-module@npm:2.5.0" + dependencies: + has: "npm:^1.0.3" + checksum: 10c0/86408d775c61afef5ef8c677eb5613de55b3fc57889cc843ef7f043e15060470c4a74741c0b8b67f43d80e19abf1f41ca037ef9a8f8feb16318dc57f31423d52 + languageName: node + linkType: hard + +"is-data-descriptor@npm:^0.1.4": + version: 0.1.4 + resolution: "is-data-descriptor@npm:0.1.4" + dependencies: + kind-of: "npm:^3.0.2" + checksum: 10c0/32fda7e966b2c1f093230d5ef2aad1bb86e43e7280da50961e38ec31dbd8a50570a2911fd45277d321074a0762adc98e8462bb62820462594128857225e90d21 + languageName: node + linkType: hard + +"is-data-descriptor@npm:^1.0.0": + version: 1.0.0 + resolution: "is-data-descriptor@npm:1.0.0" + dependencies: + kind-of: "npm:^6.0.0" + checksum: 10c0/bed31385d7d1a0dbb2ab3077faf2188acf42609192dca4e320ed7b3dc14a9d70c00658956cdaa2c0402be136c6b56e183973ad81b730fd90ab427fb6fd3608be + languageName: node + linkType: hard + +"is-date-object@npm:^1.0.1": + version: 1.0.4 + resolution: "is-date-object@npm:1.0.4" + checksum: 10c0/e037530de7b02f9d3c0a0bb7dae763f4c4a17c8380aab3576419d1cad3890f7db199c41d7d401a4f49fbfeff5f4b75a4755d73e40e461cc8bc0f2f3466877e00 + languageName: node + linkType: hard + +"is-descriptor@npm:^0.1.0": + version: 0.1.6 + resolution: "is-descriptor@npm:0.1.6" + dependencies: + is-accessor-descriptor: "npm:^0.1.6" + is-data-descriptor: "npm:^0.1.4" + kind-of: "npm:^5.0.0" + checksum: 10c0/6b8f5617b764ef8c6be3d54830184357e6cdedd8e0eddf1b97d0658616ac170bfdbc7c1ad00e0aa9f5b767acdb9d6c63d4df936501784b34936bd0f9acf3b665 + languageName: node + linkType: hard + +"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2": + version: 1.0.2 + resolution: "is-descriptor@npm:1.0.2" + dependencies: + is-accessor-descriptor: "npm:^1.0.0" + is-data-descriptor: "npm:^1.0.0" + kind-of: "npm:^6.0.2" + checksum: 10c0/a05169c7a87feb88fc155e3ada469090cfabb5a548a3f794358b511cc47a0871b8b95e7345be4925a22ef3df585c3923b31943b3ad6255ce563a9d97f2e221e0 + languageName: node + linkType: hard + +"is-directory@npm:^0.3.1": + version: 0.3.1 + resolution: "is-directory@npm:0.3.1" + checksum: 10c0/1c39c7d1753b04e9483b89fb88908b8137ab4743b6f481947e97ccf93ecb384a814c8d3f0b95b082b149c5aa19c3e9e4464e2791d95174bce95998c26bb1974b + languageName: node + linkType: hard + +"is-docker@npm:^2.0.0": + version: 2.2.1 + resolution: "is-docker@npm:2.2.1" + bin: + is-docker: cli.js + checksum: 10c0/e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc + languageName: node + linkType: hard + +"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1": + version: 0.1.1 + resolution: "is-extendable@npm:0.1.1" + checksum: 10c0/dd5ca3994a28e1740d1e25192e66eed128e0b2ff161a7ea348e87ae4f616554b486854de423877a2a2c171d5f7cd6e8093b91f54533bc88a59ee1c9838c43879 + languageName: node + linkType: hard + +"is-extendable@npm:^1.0.1": + version: 1.0.1 + resolution: "is-extendable@npm:1.0.1" + dependencies: + is-plain-object: "npm:^2.0.4" + checksum: 10c0/1d6678a5be1563db6ecb121331c819c38059703f0179f52aa80c242c223ee9c6b66470286636c0e63d7163e4d905c0a7d82a096e0b5eaeabb51b9f8d0af0d73f + languageName: node + linkType: hard + +"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1": + version: 2.1.1 + resolution: "is-extglob@npm:2.1.1" + checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912 + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^2.0.0": + version: 2.0.0 + resolution: "is-fullwidth-code-point@npm:2.0.0" + checksum: 10c0/e58f3e4a601fc0500d8b2677e26e9fe0cd450980e66adb29d85b6addf7969731e38f8e43ed2ec868a09c101a55ac3d8b78902209269f38c5286bc98f5bc1b4d9 + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^3.0.0": + version: 3.0.0 + resolution: "is-fullwidth-code-point@npm:3.0.0" + checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc + languageName: node + linkType: hard + +"is-glob@npm:^3.1.0": + version: 3.1.0 + resolution: "is-glob@npm:3.1.0" + dependencies: + is-extglob: "npm:^2.1.0" + checksum: 10c0/ba816a35dcf5285de924a8a4654df7b183a86381d73ea3bbf3df3cc61b3ba61fdddf90ee205709a2235b210ee600ee86e5e8600093cf291a662607fd032e2ff4 + languageName: node + linkType: hard + +"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:~4.0.1": + version: 4.0.1 + resolution: "is-glob@npm:4.0.1" + dependencies: + is-extglob: "npm:^2.1.1" + checksum: 10c0/a8414252499e4381756c36fe52ed778e090dd21d8cb81053384eafd5bc4fc36a6232ef528156ec98dce561f589d1d16659b7f9679b8c86864ac3c6acd5da6f66 + languageName: node + linkType: hard + +"is-glob@npm:^4.0.3": + version: 4.0.3 + resolution: "is-glob@npm:4.0.3" + dependencies: + is-extglob: "npm:^2.1.1" + checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a + languageName: node + linkType: hard + +"is-negative-zero@npm:^2.0.1": + version: 2.0.1 + resolution: "is-negative-zero@npm:2.0.1" + checksum: 10c0/e1ddf48f9e61a4802ccaa2ea9678fa8861dad25d57dcfd03a481320eaac42a3e2e0e8cabc1c8662d05f0188620a92b05c7e4aed8c1ebf48da96ff7a1af8e0f78 + languageName: node + linkType: hard + +"is-number-object@npm:^1.0.4": + version: 1.0.5 + resolution: "is-number-object@npm:1.0.5" + checksum: 10c0/b19d4768aeb551467850908ff2121aa2ed819ca8366f1d041e8aaf44b401c0ce90c193cad127ae3d34a68ce36977655bb4f5572640a692c1461a5cf2ed1cda11 + languageName: node + linkType: hard + +"is-number@npm:^3.0.0": + version: 3.0.0 + resolution: "is-number@npm:3.0.0" + dependencies: + kind-of: "npm:^3.0.2" + checksum: 10c0/e639c54640b7f029623df24d3d103901e322c0c25ea5bde97cd723c2d0d4c05857a8364ab5c58d963089dbed6bf1d0ffe975cb6aef917e2ad0ccbca653d31b4f + languageName: node + linkType: hard + +"is-number@npm:^7.0.0": + version: 7.0.0 + resolution: "is-number@npm:7.0.0" + checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811 + languageName: node + linkType: hard + +"is-obj@npm:^2.0.0": + version: 2.0.0 + resolution: "is-obj@npm:2.0.0" + checksum: 10c0/85044ed7ba8bd169e2c2af3a178cacb92a97aa75de9569d02efef7f443a824b5e153eba72b9ae3aca6f8ce81955271aa2dc7da67a8b720575d3e38104208cb4e + languageName: node + linkType: hard + +"is-path-cwd@npm:^2.0.0": + version: 2.2.0 + resolution: "is-path-cwd@npm:2.2.0" + checksum: 10c0/afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a + languageName: node + linkType: hard + +"is-path-in-cwd@npm:^2.0.0": + version: 2.1.0 + resolution: "is-path-in-cwd@npm:2.1.0" + dependencies: + is-path-inside: "npm:^2.1.0" + checksum: 10c0/674a4282fb3732cf4b4e9ea31e06380d8b074fb8106c4c1742a9f0f3d5650bf059b2c45e5c4cfa7abe847ca88474de63abec323a7fe1eb14f8ec4de2fa951d3a + languageName: node + linkType: hard + +"is-path-inside@npm:^2.1.0": + version: 2.1.0 + resolution: "is-path-inside@npm:2.1.0" + dependencies: + path-is-inside: "npm:^1.0.2" + checksum: 10c0/50272b9aa301964c0bc4032d5c968e63c516d15bd7800cd06845df97bee637451fcd92a8001b37e309563eff2dffae5fa6d635a0c1d162dc257489c86b1fda51 + languageName: node + linkType: hard + +"is-plain-obj@npm:^1.0.0": + version: 1.1.0 + resolution: "is-plain-obj@npm:1.1.0" + checksum: 10c0/daaee1805add26f781b413fdf192fc91d52409583be30ace35c82607d440da63cc4cac0ac55136716688d6c0a2c6ef3edb2254fecbd1fe06056d6bd15975ee8c + languageName: node + linkType: hard + +"is-plain-obj@npm:^3.0.0": + version: 3.0.0 + resolution: "is-plain-obj@npm:3.0.0" + checksum: 10c0/8e6483bfb051d42ec9c704c0ede051a821c6b6f9a6c7a3e3b55aa855e00981b0580c8f3b1f5e2e62649b39179b1abfee35d6f8086d999bfaa32c1908d29b07bc + languageName: node + linkType: hard + +"is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4": + version: 2.0.4 + resolution: "is-plain-object@npm:2.0.4" + dependencies: + isobject: "npm:^3.0.1" + checksum: 10c0/f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4 + languageName: node + linkType: hard + +"is-regex@npm:^1.0.4, is-regex@npm:^1.1.3": + version: 1.1.3 + resolution: "is-regex@npm:1.1.3" + dependencies: + call-bind: "npm:^1.0.2" + has-symbols: "npm:^1.0.2" + checksum: 10c0/91abb3a54dfec0e12901860df4d7282da97578c85ea4c8e95674d146e7cfddc02084e5fc6eaee6142d161bf0d0fed22034e4176ef1378058e20f22271a2cb73e + languageName: node + linkType: hard + +"is-resolvable@npm:^1.0.0": + version: 1.1.0 + resolution: "is-resolvable@npm:1.1.0" + checksum: 10c0/17d5bf39d9268173adf834c23effb6b4e926d809b528a851d87e6fb944e9606ed2c94dfaf1b1b675f922c2990fbc402d754136d8557c90a931ac7fd2f1e4cf07 + languageName: node + linkType: hard + +"is-stream@npm:^1.1.0": + version: 1.1.0 + resolution: "is-stream@npm:1.1.0" + checksum: 10c0/b8ae7971e78d2e8488d15f804229c6eed7ed36a28f8807a1815938771f4adff0e705218b7dab968270433f67103e4fef98062a0beea55d64835f705ee72c7002 + languageName: node + linkType: hard + +"is-stream@npm:^2.0.0": + version: 2.0.0 + resolution: "is-stream@npm:2.0.0" + checksum: 10c0/687f6bbd2b995573d33e6b40b2cbc8b9186a751aa3151c23e6fd2c4ca352e323a6dc010b09103f89c9ca0bf5c8c38f3fa8b74d5d9acd1c44f1499874d7e844f9 + languageName: node + linkType: hard + +"is-string@npm:^1.0.5, is-string@npm:^1.0.6": + version: 1.0.6 + resolution: "is-string@npm:1.0.6" + checksum: 10c0/1e40b3940be07bc844b91f832ab1d02b76b93a53489ca9658d8b319a2c5a9713cb1eb999060c942453560fa62fa9e74ebc74b2c43affcb7da78568cacff62a60 + languageName: node + linkType: hard + +"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3": + version: 1.0.4 + resolution: "is-symbol@npm:1.0.4" + dependencies: + has-symbols: "npm:^1.0.2" + checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7 + languageName: node + linkType: hard + +"is-typedarray@npm:~1.0.0": + version: 1.0.0 + resolution: "is-typedarray@npm:1.0.0" + checksum: 10c0/4c096275ba041a17a13cca33ac21c16bc4fd2d7d7eb94525e7cd2c2f2c1a3ab956e37622290642501ff4310601e413b675cf399ad6db49855527d2163b3eeeec + languageName: node + linkType: hard + +"is-windows@npm:^1.0.2": + version: 1.0.2 + resolution: "is-windows@npm:1.0.2" + checksum: 10c0/b32f418ab3385604a66f1b7a3ce39d25e8881dee0bd30816dc8344ef6ff9df473a732bcc1ec4e84fe99b2f229ae474f7133e8e93f9241686cfcf7eebe53ba7a5 + languageName: node + linkType: hard + +"is-wsl@npm:^1.1.0": + version: 1.1.0 + resolution: "is-wsl@npm:1.1.0" + checksum: 10c0/7ad0012f21092d6f586c7faad84755a8ef0da9b9ec295e4dc82313cce4e1a93a3da3c217265016461f9b141503fe55fa6eb1fd5457d3f05e8d1bdbb48e50c13a + languageName: node + linkType: hard + +"is-wsl@npm:^2.1.1": + version: 2.2.0 + resolution: "is-wsl@npm:2.2.0" + dependencies: + is-docker: "npm:^2.0.0" + checksum: 10c0/a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e + languageName: node + linkType: hard + +"isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0": + version: 1.0.0 + resolution: "isarray@npm:1.0.0" + checksum: 10c0/18b5be6669be53425f0b84098732670ed4e727e3af33bc7f948aac01782110eb9a18b3b329c5323bcdd3acdaae547ee077d3951317e7f133bff7105264b3003d + languageName: node + linkType: hard + +"isexe@npm:^2.0.0": + version: 2.0.0 + resolution: "isexe@npm:2.0.0" + checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d + languageName: node + linkType: hard + +"isexe@npm:^4.0.0": + version: 4.0.0 + resolution: "isexe@npm:4.0.0" + checksum: 10c0/5884815115bceac452877659a9c7726382531592f43dc29e5d48b7c4100661aed54018cb90bd36cb2eaeba521092570769167acbb95c18d39afdccbcca06c5ce + languageName: node + linkType: hard + +"isobject@npm:^2.0.0": + version: 2.1.0 + resolution: "isobject@npm:2.1.0" + dependencies: + isarray: "npm:1.0.0" + checksum: 10c0/c4cafec73b3b2ee11be75dff8dafd283b5728235ac099b07d7873d5182553a707768e208327bbc12931b9422d8822280bf88d894a0024ff5857b3efefb480e7b + languageName: node + linkType: hard + +"isobject@npm:^3.0.0, isobject@npm:^3.0.1": + version: 3.0.1 + resolution: "isobject@npm:3.0.1" + checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db + languageName: node + linkType: hard + +"isstream@npm:~0.1.2": + version: 0.1.2 + resolution: "isstream@npm:0.1.2" + checksum: 10c0/a6686a878735ca0a48e0d674dd6d8ad31aedfaf70f07920da16ceadc7577b46d67179a60b313f2e6860cb097a2c2eb3cbd0b89e921ae89199a59a17c3273d66f + languageName: node + linkType: hard + +"javascript-stringify@npm:^2.0.1": + version: 2.1.0 + resolution: "javascript-stringify@npm:2.1.0" + checksum: 10c0/374e74ebff29b94de78da39daa6e530999c58a145aeb293dc21180c4584459b14d9e5721d9bc6ed4eba319c437ef0145c157c946b70ecddcff6668682a002bcc + languageName: node + linkType: hard + +"js-message@npm:1.0.7": + version: 1.0.7 + resolution: "js-message@npm:1.0.7" + checksum: 10c0/2dc2ff5a594613a9690c157a921999237164a3c213523f406dee23985ed81c92be9afdc7b34e67a2838d447d7d79cbf1662048effe8367bedcd71a950e4e292e + languageName: node + linkType: hard + +"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": + version: 4.0.0 + resolution: "js-tokens@npm:4.0.0" + checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed + languageName: node + linkType: hard + +"js-yaml@npm:^3.13.1": + version: 3.14.1 + resolution: "js-yaml@npm:3.14.1" + dependencies: + argparse: "npm:^1.0.7" + esprima: "npm:^4.0.0" + bin: + js-yaml: bin/js-yaml.js + checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b + languageName: node + linkType: hard + +"jsbn@npm:~0.1.0": + version: 0.1.1 + resolution: "jsbn@npm:0.1.1" + checksum: 10c0/e046e05c59ff880ee4ef68902dbdcb6d2f3c5d60c357d4d68647dc23add556c31c0e5f41bdb7e69e793dd63468bd9e085da3636341048ef577b18f5b713877c0 + languageName: node + linkType: hard + +"jsesc@npm:^3.0.2, jsesc@npm:~3.1.0": + version: 3.1.0 + resolution: "jsesc@npm:3.1.0" + bin: + jsesc: bin/jsesc + checksum: 10c0/531779df5ec94f47e462da26b4cbf05eb88a83d9f08aac2ba04206508fc598527a153d08bd462bae82fc78b3eaa1a908e1a4a79f886e9238641c4cdefaf118b1 + languageName: node + linkType: hard + +"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2": + version: 1.0.2 + resolution: "json-parse-better-errors@npm:1.0.2" + checksum: 10c0/2f1287a7c833e397c9ddd361a78638e828fc523038bb3441fd4fc144cfd2c6cd4963ffb9e207e648cf7b692600f1e1e524e965c32df5152120910e4903a47dcb + languageName: node + linkType: hard + +"json-parse-even-better-errors@npm:^2.3.0": + version: 2.3.1 + resolution: "json-parse-even-better-errors@npm:2.3.1" + checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3 + languageName: node + linkType: hard + +"json-schema-traverse@npm:^0.4.1": + version: 0.4.1 + resolution: "json-schema-traverse@npm:0.4.1" + checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce + languageName: node + linkType: hard + +"json-schema@npm:0.2.3": + version: 0.2.3 + resolution: "json-schema@npm:0.2.3" + checksum: 10c0/141b3fdfe69a9fa662b9bca10933204b200bd30a6431e6bb90b9fbd9d056c352ede171386c77459440208800e2339936e08dfa8af44a0979c909b6b5769bcda3 + languageName: node + linkType: hard + +"json-stable-stringify-without-jsonify@npm:^1.0.1": + version: 1.0.1 + resolution: "json-stable-stringify-without-jsonify@npm:1.0.1" + checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5 + languageName: node + linkType: hard + +"json-stringify-safe@npm:~5.0.1": + version: 5.0.1 + resolution: "json-stringify-safe@npm:5.0.1" + checksum: 10c0/7dbf35cd0411d1d648dceb6d59ce5857ec939e52e4afc37601aa3da611f0987d5cee5b38d58329ceddf3ed48bd7215229c8d52059ab01f2444a338bf24ed0f37 + languageName: node + linkType: hard + +"json3@npm:^3.3.3": + version: 3.3.3 + resolution: "json3@npm:3.3.3" + checksum: 10c0/ca6942dbcef852c8fda5a87261b82dfa9135b43777cd05bdfc08d071592bd328e289c78eb15d0c45884d9cfe71a2a20601aaa9be16e98d488b5a2f51ee91f259 + languageName: node + linkType: hard + +"json5@npm:^0.5.0": + version: 0.5.1 + resolution: "json5@npm:0.5.1" + bin: + json5: lib/cli.js + checksum: 10c0/aca0ab7ccf1883d3fc2ecc16219bc389716a773f774552817deaadb549acc0bb502e317a81946fc0a48f9eb6e0822cf1dc5a097009203f2c94de84c8db02a1f3 + languageName: node + linkType: hard + +"json5@npm:^1.0.1": + version: 1.0.1 + resolution: "json5@npm:1.0.1" + dependencies: + minimist: "npm:^1.2.0" + bin: + json5: lib/cli.js + checksum: 10c0/7f75dd797151680a4e14c4224c1343b32a43272aa6e6333ddec2b0822df4ea116971689b251879a1248592da24f7929902c13f83d7390c3f3d44f18e8e9719f5 + languageName: node + linkType: hard + +"json5@npm:^2.1.2, json5@npm:^2.2.3": + version: 2.2.3 + resolution: "json5@npm:2.2.3" + bin: + json5: lib/cli.js + checksum: 10c0/5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c + languageName: node + linkType: hard + +"jsonfile@npm:^4.0.0": + version: 4.0.0 + resolution: "jsonfile@npm:4.0.0" + dependencies: + graceful-fs: "npm:^4.1.6" + dependenciesMeta: + graceful-fs: + optional: true + checksum: 10c0/7dc94b628d57a66b71fb1b79510d460d662eb975b5f876d723f81549c2e9cd316d58a2ddf742b2b93a4fa6b17b2accaf1a738a0e2ea114bdfb13a32e5377e480 + languageName: node + linkType: hard + +"jsprim@npm:^1.2.2": + version: 1.4.1 + resolution: "jsprim@npm:1.4.1" + dependencies: + assert-plus: "npm:1.0.0" + extsprintf: "npm:1.3.0" + json-schema: "npm:0.2.3" + verror: "npm:1.10.0" + checksum: 10c0/e457bd0d5f7eb11477708d77ed37a7dae88caf8226dc807a1a7d320bdb1085b7e3f89c057c2cbbcd543be41bbb934231549ef3842c9a5bbf2def940f2d07a841 + languageName: node + linkType: hard + +"killable@npm:^1.0.1": + version: 1.0.1 + resolution: "killable@npm:1.0.1" + checksum: 10c0/1de0ffe2dd603920685d1b2027136051f095ab42be03e354a43713664e99617cf32cbdb61fc03742c329386d7cf9450edbf4593e50daeaae381e20627b477cd6 + languageName: node + linkType: hard + +"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0": + version: 3.2.2 + resolution: "kind-of@npm:3.2.2" + dependencies: + is-buffer: "npm:^1.1.5" + checksum: 10c0/7e34bc29d4b02c997f92f080de34ebb92033a96736bbb0bb2410e033a7e5ae6571f1fa37b2d7710018f95361473b816c604234197f4f203f9cf149d8ef1574d9 + languageName: node + linkType: hard + +"kind-of@npm:^4.0.0": + version: 4.0.0 + resolution: "kind-of@npm:4.0.0" + dependencies: + is-buffer: "npm:^1.1.5" + checksum: 10c0/d6c44c75ee36898142dfc7106afbd50593216c37f96acb81a7ab33ca1a6938ce97d5692b8fc8fccd035f83811a9d97749d68771116441a48eedd0b68e2973165 + languageName: node + linkType: hard + +"kind-of@npm:^5.0.0": + version: 5.1.0 + resolution: "kind-of@npm:5.1.0" + checksum: 10c0/fe85b7a2ed4b4d5a12e16e01d00d5c336e1760842fe0da38283605b9880c984288935e87b13138909e4d23d2d197a1d492f7393c6638d2c0fab8a900c4fb0392 + languageName: node + linkType: hard + +"kind-of@npm:^6.0.0, kind-of@npm:^6.0.2": + version: 6.0.3 + resolution: "kind-of@npm:6.0.3" + checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4 + languageName: node + linkType: hard + +"klona@npm:^2.0.4": + version: 2.0.6 + resolution: "klona@npm:2.0.6" + checksum: 10c0/94eed2c6c2ce99f409df9186a96340558897b3e62a85afdc1ee39103954d2ebe1c1c4e9fe2b0952771771fa96d70055ede8b27962a7021406374fdb695fd4d01 + languageName: node + linkType: hard + +"launch-editor-middleware@npm:^2.2.1": + version: 2.2.1 + resolution: "launch-editor-middleware@npm:2.2.1" + dependencies: + launch-editor: "npm:^2.2.1" + checksum: 10c0/1016baca82d7f3ebec81281a1d4bc2b73a6ed4b6b332ad5dc5f6bd076bee4e1786f58e3328141eea543e23f6616d5ee890e51f2d98e360435c5454d1130b215d + languageName: node + linkType: hard + +"launch-editor@npm:^2.2.1": + version: 2.2.1 + resolution: "launch-editor@npm:2.2.1" + dependencies: + chalk: "npm:^2.3.0" + shell-quote: "npm:^1.6.1" + checksum: 10c0/651dbe81d418a6c7176bdc5408df6a14502747b5f6115884c36b7479215e6b0f06a689038e05f8261a225ba6af4183e36ded1d61e2dc2c74de20a4cc96305eec + languageName: node + linkType: hard + +"levn@npm:^0.3.0, levn@npm:~0.3.0": + version: 0.3.0 + resolution: "levn@npm:0.3.0" + dependencies: + prelude-ls: "npm:~1.1.2" + type-check: "npm:~0.3.2" + checksum: 10c0/e440df9de4233da0b389cd55bd61f0f6aaff766400bebbccd1231b81801f6dbc1d816c676ebe8d70566394b749fa624b1ed1c68070e9c94999f0bdecc64cb676 + languageName: node + linkType: hard + +"lines-and-columns@npm:^1.1.6": + version: 1.1.6 + resolution: "lines-and-columns@npm:1.1.6" + checksum: 10c0/0dd62f0332c4572f07bf51af5829428989d5f710150ba7ae806524409282f1adbe0c33698137ce1ee3c419779e6ac3aa8974c7a4be7e2d040234e729229cdb21 + languageName: node + linkType: hard + +"loader-fs-cache@npm:^1.0.0": + version: 1.0.3 + resolution: "loader-fs-cache@npm:1.0.3" + dependencies: + find-cache-dir: "npm:^0.1.1" + mkdirp: "npm:^0.5.1" + checksum: 10c0/159a27c92354a9bd3dd4cf6d5a271c50b1ab890171d4ff536404863503a2c776868103d269349307e36c8185df1095e056e020794160046c488c9838e3f6084f + languageName: node + linkType: hard + +"loader-runner@npm:^2.3.1, loader-runner@npm:^2.4.0": + version: 2.4.0 + resolution: "loader-runner@npm:2.4.0" + checksum: 10c0/1f723bd8318453c2d073d7befbf891ba6d2a02f22622688bf7d22e7ba527a0f9476c7fdfedc6bfa2b55c0389d9f406f3a5239ed1b33c9088d77cfed085086a1e + languageName: node + linkType: hard + +"loader-utils@npm:^0.2.16": + version: 0.2.17 + resolution: "loader-utils@npm:0.2.17" + dependencies: + big.js: "npm:^3.1.3" + emojis-list: "npm:^2.0.0" + json5: "npm:^0.5.0" + object-assign: "npm:^4.0.1" + checksum: 10c0/d6b65a0d460d2c8621f72e0471127895f4a25ea3a5d2caabf0710c8e58a904af5876834c6ad89d2fbab35e74c6e7f2f4f8137559e6e4e84b74957f4592bcab0b + languageName: node + linkType: hard + +"loader-utils@npm:^1.0.2, loader-utils@npm:^1.1.0, loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0": + version: 1.4.0 + resolution: "loader-utils@npm:1.4.0" + dependencies: + big.js: "npm:^5.2.2" + emojis-list: "npm:^3.0.0" + json5: "npm:^1.0.1" + checksum: 10c0/b3f383612c23c0adf535d61709fb3eaf864afa54dae45608e3831156b89b4b05a0a4ddc6db7d742071babe872750ba3f4f9ce89326d94f6e096dbed978fa424e + languageName: node + linkType: hard + +"loader-utils@npm:^2.0.0": + version: 2.0.4 + resolution: "loader-utils@npm:2.0.4" + dependencies: + big.js: "npm:^5.2.2" + emojis-list: "npm:^3.0.0" + json5: "npm:^2.1.2" + checksum: 10c0/d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100 + languageName: node + linkType: hard + +"locate-path@npm:^3.0.0": + version: 3.0.0 + resolution: "locate-path@npm:3.0.0" + dependencies: + p-locate: "npm:^3.0.0" + path-exists: "npm:^3.0.0" + checksum: 10c0/3db394b7829a7fe2f4fbdd25d3c4689b85f003c318c5da4052c7e56eed697da8f1bce5294f685c69ff76e32cba7a33629d94396976f6d05fb7f4c755c5e2ae8b + languageName: node + linkType: hard + +"locate-path@npm:^5.0.0": + version: 5.0.0 + resolution: "locate-path@npm:5.0.0" + dependencies: + p-locate: "npm:^4.1.0" + checksum: 10c0/33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59 + languageName: node + linkType: hard + +"lodash.debounce@npm:^4.0.8": + version: 4.0.8 + resolution: "lodash.debounce@npm:4.0.8" + checksum: 10c0/762998a63e095412b6099b8290903e0a8ddcb353ac6e2e0f2d7e7d03abd4275fe3c689d88960eb90b0dde4f177554d51a690f22a343932ecbc50a5d111849987 + languageName: node + linkType: hard + +"lodash.defaultsdeep@npm:^4.6.1": + version: 4.6.1 + resolution: "lodash.defaultsdeep@npm:4.6.1" + checksum: 10c0/0031ca3055d5482fc2e9b55d0ee174a3e956039996fac52dbe94ca67eb50bb72ffc75d0eb86bcc782fefc597ebbc1798df941f27382bec23138e53180427700b + languageName: node + linkType: hard + +"lodash.kebabcase@npm:^4.1.1": + version: 4.1.1 + resolution: "lodash.kebabcase@npm:4.1.1" + checksum: 10c0/da5d8f41dbb5bc723d4bf9203d5096ca8da804d6aec3d2b56457156ba6c8d999ff448d347ebd97490da853cb36696ea4da09a431499f1ee8deb17b094ecf4e33 + languageName: node + linkType: hard + +"lodash.mapvalues@npm:^4.6.0": + version: 4.6.0 + resolution: "lodash.mapvalues@npm:4.6.0" + checksum: 10c0/a976bfc3923d4d8d2034e049ec4700e3aaf141a6143c973d06be3b2c87697923cd0158ee770484ad1af52dfed93ae90d2b76268413db95a42a2f46d7e1754828 + languageName: node + linkType: hard + +"lodash.memoize@npm:^4.1.2": + version: 4.1.2 + resolution: "lodash.memoize@npm:4.1.2" + checksum: 10c0/c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8 + languageName: node + linkType: hard + +"lodash.transform@npm:^4.6.0": + version: 4.6.0 + resolution: "lodash.transform@npm:4.6.0" + checksum: 10c0/ad7f376b00dccff09f8597f19a171f2e074756178ae74887346876e10f6f0d83009460cc0793183cc5ee4e24a72ff86e68031c45b5aa2731c2f681a4dc93fe77 + languageName: node + linkType: hard + +"lodash.uniq@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.uniq@npm:4.5.0" + checksum: 10c0/262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e + languageName: node + linkType: hard + +"lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.3": + version: 4.17.21 + resolution: "lodash@npm:4.17.21" + checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c + languageName: node + linkType: hard + +"log-symbols@npm:^2.2.0": + version: 2.2.0 + resolution: "log-symbols@npm:2.2.0" + dependencies: + chalk: "npm:^2.0.1" + checksum: 10c0/574eb4205f54f0605021aa67ebb372c30ca64e8ddd439efeb8507af83c776dce789e83614e80059014d9e48dcc94c4b60cef2e85f0dc944eea27c799cec62353 + languageName: node + linkType: hard + +"loglevel@npm:^1.6.8": + version: 1.7.1 + resolution: "loglevel@npm:1.7.1" + checksum: 10c0/14b481b7f5a3e2405f2c54c7a5914ba0e65c6cbc961dc90dc8ec67e1cf0ce549330ff5ab9024e52f232f8f2ca78ef27286f72c38f495ba8ab281aff18763b53c + languageName: node + linkType: hard + +"loose-envify@npm:^1.0.0": + version: 1.4.0 + resolution: "loose-envify@npm:1.4.0" + dependencies: + js-tokens: "npm:^3.0.0 || ^4.0.0" + bin: + loose-envify: cli.js + checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e + languageName: node + linkType: hard + +"lottie-web-vue@npm:^1.2.0": + version: 1.2.1 + resolution: "lottie-web-vue@npm:1.2.1" + dependencies: + lottie-web: "npm:^5.7.4" + checksum: 10c0/9605875c3edb89e957430d6d03fa575f4890347484b2090cc404bc8b6059e3a1cf87c8f7aeb052c7febf189ac073fb21ed92295b75c23ab917b1f1d8225a0f06 + languageName: node + linkType: hard + +"lottie-web@npm:^5.7.4": + version: 5.13.0 + resolution: "lottie-web@npm:5.13.0" + checksum: 10c0/b463ad462169df3f7e04b7f3716274e269842554f1d72b8303ca7245628f2512982a59ae31698b3d57fbcda886228ae160fcb2aa518c6cecd8a95974db2458ee + languageName: node + linkType: hard + +"lower-case@npm:^1.1.1": + version: 1.1.4 + resolution: "lower-case@npm:1.1.4" + checksum: 10c0/2153ae5490d655a63addc8e7d2f848c6c94803b342ed2d177f75e8073e9fbb50a733d1432c82e1cb8425fa6eae14b2877bf5bbdcb93ab93bb982fb5c3962c57b + languageName: node + linkType: hard + +"lru-cache@npm:^4.0.1, lru-cache@npm:^4.1.2": + version: 4.1.5 + resolution: "lru-cache@npm:4.1.5" + dependencies: + pseudomap: "npm:^1.0.2" + yallist: "npm:^2.1.2" + checksum: 10c0/1ca5306814e5add9ec63556d6fd9b24a4ecdeaef8e9cea52cbf30301e6b88c8d8ddc7cab45b59b56eb763e6c45af911585dc89925a074ab65e1502e3fe8103cf + languageName: node + linkType: hard + +"lru-cache@npm:^5.1.1": + version: 5.1.1 + resolution: "lru-cache@npm:5.1.1" + dependencies: + yallist: "npm:^3.0.2" + checksum: 10c0/89b2ef2ef45f543011e38737b8a8622a2f8998cddf0e5437174ef8f1f70a8b9d14a918ab3e232cb3ba343b7abddffa667f0b59075b2b80e6b4d63c3de6127482 + languageName: node + linkType: hard + +"magic-string@npm:^0.30.21": + version: 0.30.21 + resolution: "magic-string@npm:0.30.21" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.5.5" + checksum: 10c0/299378e38f9a270069fc62358522ddfb44e94244baa0d6a8980ab2a9b2490a1d03b236b447eee309e17eb3bddfa482c61259d47960eb018a904f0ded52780c4a + languageName: node + linkType: hard + +"make-dir@npm:^2.0.0": + version: 2.1.0 + resolution: "make-dir@npm:2.1.0" + dependencies: + pify: "npm:^4.0.1" + semver: "npm:^5.6.0" + checksum: 10c0/ada869944d866229819735bee5548944caef560d7a8536ecbc6536edca28c72add47cc4f6fc39c54fb25d06b58da1f8994cf7d9df7dadea047064749efc085d8 + languageName: node + linkType: hard + +"make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": + version: 3.1.0 + resolution: "make-dir@npm:3.1.0" + dependencies: + semver: "npm:^6.0.0" + checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa + languageName: node + linkType: hard + +"map-cache@npm:^0.2.2": + version: 0.2.2 + resolution: "map-cache@npm:0.2.2" + checksum: 10c0/05e3eb005c1b80b9f949ca007687640e8c5d0fc88dc45c3c3ab4902a3bec79d66a58f3e3b04d6985d90cd267c629c7b46c977e9c34433e8c11ecfcbb9f0fa290 + languageName: node + linkType: hard + +"map-visit@npm:^1.0.0": + version: 1.0.0 + resolution: "map-visit@npm:1.0.0" + dependencies: + object-visit: "npm:^1.0.0" + checksum: 10c0/fb3475e5311939a6147e339999113db607adc11c7c3cd3103e5e9dbf502898416ecba6b1c7c649c6d4d12941de00cee58b939756bdf20a9efe7d4fa5a5738b73 + languageName: node + linkType: hard + +"math-intrinsics@npm:^1.1.0": + version: 1.1.0 + resolution: "math-intrinsics@npm:1.1.0" + checksum: 10c0/7579ff94e899e2f76ab64491d76cf606274c874d8f2af4a442c016bd85688927fcfca157ba6bf74b08e9439dc010b248ce05b96cc7c126a354c3bae7fcb48b7f + languageName: node + linkType: hard + +"md5.js@npm:^1.3.4": + version: 1.3.5 + resolution: "md5.js@npm:1.3.5" + dependencies: + hash-base: "npm:^3.0.0" + inherits: "npm:^2.0.1" + safe-buffer: "npm:^5.1.2" + checksum: 10c0/b7bd75077f419c8e013fc4d4dada48be71882e37d69a44af65a2f2804b91e253441eb43a0614423a1c91bb830b8140b0dc906bc797245e2e275759584f4efcc5 + languageName: node + linkType: hard + +"mdn-data@npm:2.0.14": + version: 2.0.14 + resolution: "mdn-data@npm:2.0.14" + checksum: 10c0/67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd + languageName: node + linkType: hard + +"mdn-data@npm:2.0.4": + version: 2.0.4 + resolution: "mdn-data@npm:2.0.4" + checksum: 10c0/a935c4530b938407481f7d0ccb82119ae618d9c673d2ee78bb10dcba8bd0ccbe2e2c7fe850ddc60b67e08f4c9d97f50b900993f6c2f2926e64a52ed6baa00b3a + languageName: node + linkType: hard + +"media-typer@npm:0.3.0": + version: 0.3.0 + resolution: "media-typer@npm:0.3.0" + checksum: 10c0/d160f31246907e79fed398470285f21bafb45a62869dc469b1c8877f3f064f5eabc4bcc122f9479b8b605bc5c76187d7871cf84c4ee3ecd3e487da1993279928 + languageName: node + linkType: hard + +"memory-fs@npm:^0.4.1": + version: 0.4.1 + resolution: "memory-fs@npm:0.4.1" + dependencies: + errno: "npm:^0.1.3" + readable-stream: "npm:^2.0.1" + checksum: 10c0/f114c44ad8285103cb0e71420cf5bb628d3eb6cbd918197f5951590ff56ba2072f4a97924949c170320cdf180d2da4e8d16a0edd92ba0ca2d2de51dc932841e2 + languageName: node + linkType: hard + +"memory-fs@npm:^0.5.0": + version: 0.5.0 + resolution: "memory-fs@npm:0.5.0" + dependencies: + errno: "npm:^0.1.3" + readable-stream: "npm:^2.0.1" + checksum: 10c0/2737a27b14a9e8b8cd757be2ad99e8cc504b78a78aba9d6aa18ff1ef528e2223a433413d2df6ab5332997a5a8ccf075e6c6e90e31ab732a55455ca620e4a720b + languageName: node + linkType: hard + +"merge-descriptors@npm:1.0.1": + version: 1.0.1 + resolution: "merge-descriptors@npm:1.0.1" + checksum: 10c0/b67d07bd44cfc45cebdec349bb6e1f7b077ee2fd5beb15d1f7af073849208cb6f144fe403e29a36571baf3f4e86469ac39acf13c318381e958e186b2766f54ec + languageName: node + linkType: hard + +"merge-source-map@npm:^1.1.0": + version: 1.1.0 + resolution: "merge-source-map@npm:1.1.0" + dependencies: + source-map: "npm:^0.6.1" + checksum: 10c0/ac0e0192c9c7e30056c5baa939434c0d1015faa5c7ce7936ad77600f1752c03099134cb33c50f1bb32ec25350e191ca2392c6b76b1eaca89c7c989e42403655f + languageName: node + linkType: hard + +"merge-stream@npm:^2.0.0": + version: 2.0.0 + resolution: "merge-stream@npm:2.0.0" + checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5 + languageName: node + linkType: hard + +"merge2@npm:^1.2.3": + version: 1.4.1 + resolution: "merge2@npm:1.4.1" + checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb + languageName: node + linkType: hard + +"methods@npm:~1.1.2": + version: 1.1.2 + resolution: "methods@npm:1.1.2" + checksum: 10c0/bdf7cc72ff0a33e3eede03708c08983c4d7a173f91348b4b1e4f47d4cdbf734433ad971e7d1e8c77247d9e5cd8adb81ea4c67b0a2db526b758b2233d7814b8b2 + languageName: node + linkType: hard + +"micromatch@npm:^3.1.10, micromatch@npm:^3.1.4": + version: 3.1.10 + resolution: "micromatch@npm:3.1.10" + dependencies: + arr-diff: "npm:^4.0.0" + array-unique: "npm:^0.3.2" + braces: "npm:^2.3.1" + define-property: "npm:^2.0.2" + extend-shallow: "npm:^3.0.2" + extglob: "npm:^2.0.4" + fragment-cache: "npm:^0.2.1" + kind-of: "npm:^6.0.2" + nanomatch: "npm:^1.2.9" + object.pick: "npm:^1.3.0" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.2" + checksum: 10c0/531a32e7ac92bef60657820202be71b63d0f945c08a69cc4c239c0b19372b751483d464a850a2e3a5ff6cc9060641e43d44c303af104c1a27493d137d8af017f + languageName: node + linkType: hard + +"micromatch@npm:^4.0.2": + version: 4.0.4 + resolution: "micromatch@npm:4.0.4" + dependencies: + braces: "npm:^3.0.1" + picomatch: "npm:^2.2.3" + checksum: 10c0/87bc95e3e52ebe413dbadd43c96e797c736bf238f154e3b546859493e83781b6f7fa4dfa54e423034fb9aeea65259ee6480551581271c348d8e19214910a5a64 + languageName: node + linkType: hard + +"miller-rabin@npm:^4.0.0": + version: 4.0.1 + resolution: "miller-rabin@npm:4.0.1" + dependencies: + bn.js: "npm:^4.0.0" + brorand: "npm:^1.0.1" + bin: + miller-rabin: bin/miller-rabin + checksum: 10c0/26b2b96f6e49dbcff7faebb78708ed2f5f9ae27ac8cbbf1d7c08f83cf39bed3d418c0c11034dce997da70d135cc0ff6f3a4c15dc452f8e114c11986388a64346 + languageName: node + linkType: hard + +"mime-db@npm:1.48.0, mime-db@npm:>= 1.43.0 < 2": + version: 1.48.0 + resolution: "mime-db@npm:1.48.0" + checksum: 10c0/58a17590ba92d4de1c88cb41199f8746baaeed5de7aaa76d94925d3f015f37cce65614e6621b545f382ddaa0063e8d8e8aeaf205fd6422be0f04d6aa56e3f8aa + languageName: node + linkType: hard + +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa + languageName: node + linkType: hard + +"mime-types@npm:^2.1.12, mime-types@npm:^2.1.35": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" + dependencies: + mime-db: "npm:1.52.0" + checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2 + languageName: node + linkType: hard + +"mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24": + version: 2.1.31 + resolution: "mime-types@npm:2.1.31" + dependencies: + mime-db: "npm:1.48.0" + checksum: 10c0/8adf6de32bf5be25049a0816c751bf69aa7d245abbeffd1d594b692159616762d30831dae21d37d5e433cd5b824f759ce0e6286c436e140dd71ab8a00d90cdea + languageName: node + linkType: hard + +"mime@npm:1.6.0": + version: 1.6.0 + resolution: "mime@npm:1.6.0" + bin: + mime: cli.js + checksum: 10c0/b92cd0adc44888c7135a185bfd0dddc42c32606401c72896a842ae15da71eb88858f17669af41e498b463cd7eb998f7b48939a25b08374c7924a9c8a6f8a81b0 + languageName: node + linkType: hard + +"mime@npm:^2.4.4": + version: 2.5.2 + resolution: "mime@npm:2.5.2" + bin: + mime: cli.js + checksum: 10c0/6feb4a221498b25913590c6d6b2e980d519b57a6fc07849be3b8ee507a8980211e11b371d2d53d92dd883e46e699cd6f7712e7d71743f036adb5b0a8ea3005d5 + languageName: node + linkType: hard + +"mimic-fn@npm:^1.0.0": + version: 1.2.0 + resolution: "mimic-fn@npm:1.2.0" + checksum: 10c0/ad55214aec6094c0af4c0beec1a13787556f8116ed88807cf3f05828500f21f93a9482326bcd5a077ae91e3e8795b4e76b5b4c8bb12237ff0e4043a365516cba + languageName: node + linkType: hard + +"mimic-fn@npm:^2.1.0": + version: 2.1.0 + resolution: "mimic-fn@npm:2.1.0" + checksum: 10c0/b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4 + languageName: node + linkType: hard + +"mini-css-extract-plugin@npm:^0.9.0": + version: 0.9.0 + resolution: "mini-css-extract-plugin@npm:0.9.0" + dependencies: + loader-utils: "npm:^1.1.0" + normalize-url: "npm:1.9.1" + schema-utils: "npm:^1.0.0" + webpack-sources: "npm:^1.1.0" + peerDependencies: + webpack: ^4.4.0 + checksum: 10c0/80bdad893acc868dfa577af0fe2b9bfad1bb1b0c9b5eddb757f47694eef4c520fc7021b144666dc3a658ed1a72cc27c90c8fd7ff64c399527a42321e53ee913b + languageName: node + linkType: hard + +"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1": + version: 1.0.1 + resolution: "minimalistic-assert@npm:1.0.1" + checksum: 10c0/96730e5601cd31457f81a296f521eb56036e6f69133c0b18c13fe941109d53ad23a4204d946a0d638d7f3099482a0cec8c9bb6d642604612ce43ee536be3dddd + languageName: node + linkType: hard + +"minimalistic-crypto-utils@npm:^1.0.1": + version: 1.0.1 + resolution: "minimalistic-crypto-utils@npm:1.0.1" + checksum: 10c0/790ecec8c5c73973a4fbf2c663d911033e8494d5fb0960a4500634766ab05d6107d20af896ca2132e7031741f19888154d44b2408ada0852446705441383e9f8 + languageName: node + linkType: hard + +"minimatch@npm:^3.0.4": + version: 3.0.4 + resolution: "minimatch@npm:3.0.4" + dependencies: + brace-expansion: "npm:^1.1.7" + checksum: 10c0/d0a2bcd93ebec08a9eef3ca83ba33c9fb6feb93932e0b4dc6aa46c5f37a9404bea7ad9ff7cafe23ce6634f1fe3b206f5315ecbb05812da6e692c21d8ecfd3dae + languageName: node + linkType: hard + +"minimist@npm:^1.2.0": + version: 1.2.5 + resolution: "minimist@npm:1.2.5" + checksum: 10c0/c143b0c199af4df7a55c7a37b6465cdd438acdc6a3a345ba0fe9d94dfcc2042263f650879bc73be607c843deeaeaadf39c864e55bc6d80b36a025eca1a062ee7 + languageName: node + linkType: hard + +"minimist@npm:^1.2.5": + version: 1.2.8 + resolution: "minimist@npm:1.2.8" + checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 + languageName: node + linkType: hard + +"minipass@npm:^3.1.1": + version: 3.1.3 + resolution: "minipass@npm:3.1.3" + dependencies: + yallist: "npm:^4.0.0" + checksum: 10c0/5dbbf1afd68aa686f0b587f2104c96c22b517da2db35787329ff460128efe583ba363e9cd4572895cdf0f0633fa3ad1b65283a953d889a76f11bdfbb19567bc6 + languageName: node + linkType: hard + +"minipass@npm:^7.0.4, minipass@npm:^7.1.2": + version: 7.1.3 + resolution: "minipass@npm:7.1.3" + checksum: 10c0/539da88daca16533211ea5a9ee98dc62ff5742f531f54640dd34429e621955e91cc280a91a776026264b7f9f6735947629f920944e9c1558369e8bf22eb33fbb + languageName: node + linkType: hard + +"minizlib@npm:^3.1.0": + version: 3.1.0 + resolution: "minizlib@npm:3.1.0" + dependencies: + minipass: "npm:^7.1.2" + checksum: 10c0/5aad75ab0090b8266069c9aabe582c021ae53eb33c6c691054a13a45db3b4f91a7fb1bd79151e6b4e9e9a86727b522527c0a06ec7d45206b745d54cd3097bcec + languageName: node + linkType: hard + +"mississippi@npm:^3.0.0": + version: 3.0.0 + resolution: "mississippi@npm:3.0.0" + dependencies: + concat-stream: "npm:^1.5.0" + duplexify: "npm:^3.4.2" + end-of-stream: "npm:^1.1.0" + flush-write-stream: "npm:^1.0.0" + from2: "npm:^2.1.0" + parallel-transform: "npm:^1.1.0" + pump: "npm:^3.0.0" + pumpify: "npm:^1.3.3" + stream-each: "npm:^1.1.0" + through2: "npm:^2.0.0" + checksum: 10c0/97424a331ce1b9f789a0d3fa47d725dad9adfe5e0ead8bc458ba9fb51c4d2630df6b0966ca9dcbb4c90db48737d58126cbf0e3c170697bf41c265606efa91103 + languageName: node + linkType: hard + +"mixin-deep@npm:^1.2.0": + version: 1.3.2 + resolution: "mixin-deep@npm:1.3.2" + dependencies: + for-in: "npm:^1.0.2" + is-extendable: "npm:^1.0.1" + checksum: 10c0/cb39ffb73c377222391af788b4c83d1a6cecb2d9fceb7015384f8deb46e151a9b030c21ef59a79cb524d4557e3f74c7248ab948a62a6e7e296b42644863d183b + languageName: node + linkType: hard + +"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1": + version: 0.5.5 + resolution: "mkdirp@npm:0.5.5" + dependencies: + minimist: "npm:^1.2.5" + bin: + mkdirp: bin/cmd.js + checksum: 10c0/4469faeeba703bc46b7cdbe3097d6373747a581eb8b556ce41c8fd25a826eb3254466c6522ba823c2edb0b6f0da7beb91cf71f040bc4e361534a3e67f0994bd0 + languageName: node + linkType: hard + +"move-concurrently@npm:^1.0.1": + version: 1.0.1 + resolution: "move-concurrently@npm:1.0.1" + dependencies: + aproba: "npm:^1.1.1" + copy-concurrently: "npm:^1.0.0" + fs-write-stream-atomic: "npm:^1.0.8" + mkdirp: "npm:^0.5.1" + rimraf: "npm:^2.5.4" + run-queue: "npm:^1.0.3" + checksum: 10c0/0fe81acf3bbbc322013c2f4ee4a48cf8d180a7d925fb9284c0f1f444e862d7eb0421ee074b68d35357a12f0d5e94a322049dc9da480672331b5b8895743eb66a + languageName: node + linkType: hard + +"ms@npm:2.0.0": + version: 2.0.0 + resolution: "ms@npm:2.0.0" + checksum: 10c0/f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d + languageName: node + linkType: hard + +"ms@npm:2.1.1": + version: 2.1.1 + resolution: "ms@npm:2.1.1" + checksum: 10c0/056140c631e740369fa21142417aba1bd629ab912334715216c666eb681c8f015c622dd4e38bc1d836b30852b05641331661703af13a0397eb0ca420fc1e75d9 + languageName: node + linkType: hard + +"ms@npm:2.1.2": + version: 2.1.2 + resolution: "ms@npm:2.1.2" + checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc + languageName: node + linkType: hard + +"ms@npm:^2.1.1, ms@npm:^2.1.3": + version: 2.1.3 + resolution: "ms@npm:2.1.3" + checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 + languageName: node + linkType: hard + +"multicast-dns-service-types@npm:^1.1.0": + version: 1.1.0 + resolution: "multicast-dns-service-types@npm:1.1.0" + checksum: 10c0/25abc0e9ee509f38d874e22b03d563b16009d3976760d29bed25bf70ea992cfe30b0403743f49342279c67178a03311d31ecc1ec54bf79af2e6fe55f11af2660 + languageName: node + linkType: hard + +"multicast-dns@npm:^6.0.1": + version: 6.2.3 + resolution: "multicast-dns@npm:6.2.3" + dependencies: + dns-packet: "npm:^1.3.1" + thunky: "npm:^1.0.2" + bin: + multicast-dns: cli.js + checksum: 10c0/972fc50869e922d80d66eeb91ad39fd2e107241e0c791fc914e76578e4f7f3dfe3bf007020dd4d7ed4d0ffd69d9aa2238a9f8bbb4d160bd6eb3f35dde0c2c513 + languageName: node + linkType: hard + +"mute-stream@npm:0.0.8": + version: 0.0.8 + resolution: "mute-stream@npm:0.0.8" + checksum: 10c0/18d06d92e5d6d45e2b63c0e1b8f25376af71748ac36f53c059baa8b76ffac31c5ab225480494e7d35d30215ecdb18fed26ec23cafcd2f7733f2f14406bcd19e2 + languageName: node + linkType: hard + +"mz@npm:^2.4.0": + version: 2.7.0 + resolution: "mz@npm:2.7.0" + dependencies: + any-promise: "npm:^1.0.0" + object-assign: "npm:^4.0.1" + thenify-all: "npm:^1.0.0" + checksum: 10c0/103114e93f87362f0b56ab5b2e7245051ad0276b646e3902c98397d18bb8f4a77f2ea4a2c9d3ad516034ea3a56553b60d3f5f78220001ca4c404bd711bd0af39 + languageName: node + linkType: hard + +"nan@npm:^2.12.1": + version: 2.17.0 + resolution: "nan@npm:2.17.0" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/4a231a62dba025f4c4fa814c1e6ffeb450c5cd0852b780f19fe4ea22b86ba0f1f394406dfd628c67fb7f0987e982fa230da1fbd3632258f927b8defd7046c1ad + languageName: node + linkType: hard + +"nanoid@npm:^3.3.11": + version: 3.3.11 + resolution: "nanoid@npm:3.3.11" + bin: + nanoid: bin/nanoid.cjs + checksum: 10c0/40e7f70b3d15f725ca072dfc4f74e81fcf1fbb02e491cf58ac0c79093adc9b0a73b152bcde57df4b79cd097e13023d7504acb38404a4da7bc1cd8e887b82fe0b + languageName: node + linkType: hard + +"nanoid@npm:^3.3.12": + version: 3.3.15 + resolution: "nanoid@npm:3.3.15" + bin: + nanoid: bin/nanoid.cjs + checksum: 10c0/e0b12e3a1d361f74150fa4b25631d0ae29f7162dab01a12f0f1be1f53b7a2a219f9b729504e474d4821207d0fe349bd3c97569ab5cf7ec2fff6aa94711956c93 + languageName: node + linkType: hard + +"nanomatch@npm:^1.2.9": + version: 1.2.13 + resolution: "nanomatch@npm:1.2.13" + dependencies: + arr-diff: "npm:^4.0.0" + array-unique: "npm:^0.3.2" + define-property: "npm:^2.0.2" + extend-shallow: "npm:^3.0.2" + fragment-cache: "npm:^0.2.1" + is-windows: "npm:^1.0.2" + kind-of: "npm:^6.0.2" + object.pick: "npm:^1.3.0" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.1" + checksum: 10c0/0f5cefa755ca2e20c86332821995effb24acb79551ddaf51c1b9112628cad234a0d8fd9ac6aa56ad1f8bfad6ff6ae86e851acb960943249d9fa44b091479953a + languageName: node + linkType: hard + +"natural-compare@npm:^1.4.0": + version: 1.4.0 + resolution: "natural-compare@npm:1.4.0" + checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447 + languageName: node + linkType: hard + +"negotiator@npm:0.6.2": + version: 0.6.2 + resolution: "negotiator@npm:0.6.2" + checksum: 10c0/cda4955b5a0d6624ff3322c9a9e7bfc039b8f2b0133708208edbb28be6ebb62c45493aee098374d8d0aeda60fc37dd08cf53cd60bd5fad3efb8fc36b52e3cdce + languageName: node + linkType: hard + +"neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2": + version: 2.6.2 + resolution: "neo-async@npm:2.6.2" + checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d + languageName: node + linkType: hard + +"nice-try@npm:^1.0.4": + version: 1.0.5 + resolution: "nice-try@npm:1.0.5" + checksum: 10c0/95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f + languageName: node + linkType: hard + +"no-case@npm:^2.2.0": + version: 2.3.2 + resolution: "no-case@npm:2.3.2" + dependencies: + lower-case: "npm:^1.1.1" + checksum: 10c0/63f306e83c18efa0bb37f1c23a25baf4ccf5ebaec70b482fa04d4c5bf8bbb8bcc9a8fbcd818af828ab69f2b602153daf81ec26e448b2bda2d704b8d0c7eec8fa + languageName: node + linkType: hard + +"node-addon-api@npm:^7.0.0": + version: 7.1.1 + resolution: "node-addon-api@npm:7.1.1" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/fb32a206276d608037fa1bcd7e9921e177fe992fc610d098aa3128baca3c0050fc1e014fa007e9b3874cf865ddb4f5bd9f43ccb7cbbbe4efaff6a83e920b17e9 + languageName: node + linkType: hard + +"node-forge@npm:^0.10.0": + version: 0.10.0 + resolution: "node-forge@npm:0.10.0" + checksum: 10c0/9cbf9ac8fc3889a5a46b0248f7238ee4014770bf31d22e04c0c7f04ed91c8be4584c5f534cdf6037e99f236c636c925cba960501ed2b850e077512e152760663 + languageName: node + linkType: hard + +"node-gyp@npm:latest": + version: 13.0.0 + resolution: "node-gyp@npm:13.0.0" + dependencies: + env-paths: "npm:^2.2.0" + exponential-backoff: "npm:^3.1.1" + graceful-fs: "npm:^4.2.6" + nopt: "npm:^10.0.0" + proc-log: "npm:^7.0.0" + semver: "npm:^7.3.5" + tar: "npm:^7.5.4" + tinyglobby: "npm:^0.2.12" + undici: "npm:^6.25.0" + which: "npm:^7.0.0" + bin: + node-gyp: bin/node-gyp.js + checksum: 10c0/e7525c427db2d16aa368b8947187de83083d2a8dda23e3e096a71c22ae637ac5bb8ed7cf6c871f1b9118cd2729dbfee4ff3a4245e2b79226900227b15831b492 + languageName: node + linkType: hard + +"node-libs-browser@npm:^2.2.1": + version: 2.2.1 + resolution: "node-libs-browser@npm:2.2.1" + dependencies: + assert: "npm:^1.1.1" + browserify-zlib: "npm:^0.2.0" + buffer: "npm:^4.3.0" + console-browserify: "npm:^1.1.0" + constants-browserify: "npm:^1.0.0" + crypto-browserify: "npm:^3.11.0" + domain-browser: "npm:^1.1.1" + events: "npm:^3.0.0" + https-browserify: "npm:^1.0.0" + os-browserify: "npm:^0.3.0" + path-browserify: "npm:0.0.1" + process: "npm:^0.11.10" + punycode: "npm:^1.2.4" + querystring-es3: "npm:^0.2.0" + readable-stream: "npm:^2.3.3" + stream-browserify: "npm:^2.0.1" + stream-http: "npm:^2.7.2" + string_decoder: "npm:^1.0.0" + timers-browserify: "npm:^2.0.4" + tty-browserify: "npm:0.0.0" + url: "npm:^0.11.0" + util: "npm:^0.11.0" + vm-browserify: "npm:^1.0.1" + checksum: 10c0/0e05321a6396408903ed642231d2bca7dd96492d074c7af161ba06a63c95378bd3de50b4105eccbbc02d93ba3da69f0ff5e624bc2a8c92ca462ceb6a403e7986 + languageName: node + linkType: hard + +"node-releases@npm:^1.1.71": + version: 1.1.73 + resolution: "node-releases@npm:1.1.73" + checksum: 10c0/0e643cc064585a50fb3036c4657acf51dfd3f06cfa24243afd0e4c0f7b78c294019f8e543846911433f6463d2c80ce37ac0d25eedaef23e764bd48f3ef3ed143 + languageName: node + linkType: hard + +"node-releases@npm:^2.0.48": + version: 2.0.50 + resolution: "node-releases@npm:2.0.50" + checksum: 10c0/ac75ed433864114cfd9862034960bb4f49838343dc9fc31dc7d5be8189ce5f39510ad0bb3a697efe3193d50ab6921e7a3a6ce3aae2a6f8abe62719ffd40a4cac + languageName: node + linkType: hard + +"nopt@npm:^10.0.0": + version: 10.0.1 + resolution: "nopt@npm:10.0.1" + dependencies: + abbrev: "npm:^5.0.0" + bin: + nopt: bin/nopt.js + checksum: 10c0/980d89257f9587f3e1f77877ddbf905d6aa3b738ec33e49a4fa1a059a0dd82eb28063982b150654a7ae9de386f2ead60e56172db7d37cf56de545f7392a2a26a + languageName: node + linkType: hard + +"normalize-package-data@npm:^2.5.0": + version: 2.5.0 + resolution: "normalize-package-data@npm:2.5.0" + dependencies: + hosted-git-info: "npm:^2.1.4" + resolve: "npm:^1.10.0" + semver: "npm:2 || 3 || 4 || 5" + validate-npm-package-license: "npm:^3.0.1" + checksum: 10c0/357cb1646deb42f8eb4c7d42c4edf0eec312f3628c2ef98501963cc4bbe7277021b2b1d977f982b2edce78f5a1014613ce9cf38085c3df2d76730481357ca504 + languageName: node + linkType: hard + +"normalize-path@npm:^1.0.0": + version: 1.0.0 + resolution: "normalize-path@npm:1.0.0" + checksum: 10c0/b8e578b79fb1ef43735712d7af2c2b288d6d2509f2ef8206201933e7d95e38b922f41378b28610bb9424e1e49cb56b85d1d5f493e3287572d57e263010843bf9 + languageName: node + linkType: hard + +"normalize-path@npm:^2.1.1": + version: 2.1.1 + resolution: "normalize-path@npm:2.1.1" + dependencies: + remove-trailing-separator: "npm:^1.0.1" + checksum: 10c0/db814326ff88057437233361b4c7e9cac7b54815b051b57f2d341ce89b1d8ec8cbd43e7fa95d7652b3b69ea8fcc294b89b8530d556a84d1bdace94229e1e9a8b + languageName: node + linkType: hard + +"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": + version: 3.0.0 + resolution: "normalize-path@npm:3.0.0" + checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046 + languageName: node + linkType: hard + +"normalize-range@npm:^0.1.2": + version: 0.1.2 + resolution: "normalize-range@npm:0.1.2" + checksum: 10c0/bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6 + languageName: node + linkType: hard + +"normalize-url@npm:1.9.1": + version: 1.9.1 + resolution: "normalize-url@npm:1.9.1" + dependencies: + object-assign: "npm:^4.0.1" + prepend-http: "npm:^1.0.0" + query-string: "npm:^4.1.0" + sort-keys: "npm:^1.0.0" + checksum: 10c0/5ecd525f743c3fb5370d2bab8e78446f3e3bd7c0c97a5fd3f0bc0c5f396fbd117d13c9118766128d25ed575755cb539dc33a38419f18ca9d8577c8d1cd7a8daf + languageName: node + linkType: hard + +"normalize-url@npm:^3.0.0": + version: 3.3.0 + resolution: "normalize-url@npm:3.3.0" + checksum: 10c0/07c2fdcfac898d97eee256d7f62108034224588263fadc45caba0cc402b2bd59b9bd9e66e0c54ac9ee902fcb27af80cacd36375f641409f46749b4eb10f47352 + languageName: node + linkType: hard + +"npm-run-path@npm:^2.0.0": + version: 2.0.2 + resolution: "npm-run-path@npm:2.0.2" + dependencies: + path-key: "npm:^2.0.0" + checksum: 10c0/95549a477886f48346568c97b08c4fda9cdbf7ce8a4fbc2213f36896d0d19249e32d68d7451bdcbca8041b5fba04a6b2c4a618beaf19849505c05b700740f1de + languageName: node + linkType: hard + +"npm-run-path@npm:^4.0.0": + version: 4.0.1 + resolution: "npm-run-path@npm:4.0.1" + dependencies: + path-key: "npm:^3.0.0" + checksum: 10c0/6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac + languageName: node + linkType: hard + +"nth-check@npm:^1.0.2": + version: 1.0.2 + resolution: "nth-check@npm:1.0.2" + dependencies: + boolbase: "npm:~1.0.0" + checksum: 10c0/1a67ce53a99e276eea672f892d712b29f3e6802bbbef7285ffab72ecea4f972e8244defac1ebded0daffabf459def31355bb9c64e5657ac2ab032c13f185d0fd + languageName: node + linkType: hard + +"nth-check@npm:^2.0.0": + version: 2.0.0 + resolution: "nth-check@npm:2.0.0" + dependencies: + boolbase: "npm:^1.0.0" + checksum: 10c0/ef2042e155aa46de731205847ec8b386962647b2ef14ae51195e3e5da67d0fb2f49bf7492c4d2d760cdfe5caf533a992f4572eb0a0d086a1aaf894329dd782e9 + languageName: node + linkType: hard + +"num2fraction@npm:^1.2.2": + version: 1.2.2 + resolution: "num2fraction@npm:1.2.2" + checksum: 10c0/3bf17b44af00508a2b0370146629710645c3e3ff3c052893680efe3f4a6ff5c953ce9e54734013b02b35744a49352d54fbc5d8b455fac979047ef17dd8ec74bd + languageName: node + linkType: hard + +"oauth-sign@npm:~0.9.0": + version: 0.9.0 + resolution: "oauth-sign@npm:0.9.0" + checksum: 10c0/fc92a516f6ddbb2699089a2748b04f55c47b6ead55a77cd3a2cbbce5f7af86164cb9425f9ae19acfd066f1ad7d3a96a67b8928c6ea946426f6d6c29e448497c2 + languageName: node + linkType: hard + +"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": + version: 4.1.1 + resolution: "object-assign@npm:4.1.1" + checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 + languageName: node + linkType: hard + +"object-copy@npm:^0.1.0": + version: 0.1.0 + resolution: "object-copy@npm:0.1.0" + dependencies: + copy-descriptor: "npm:^0.1.0" + define-property: "npm:^0.2.5" + kind-of: "npm:^3.0.3" + checksum: 10c0/79314b05e9d626159a04f1d913f4c4aba9eae8848511cf5f4c8e3b04bb3cc313b65f60357f86462c959a14c2d58380fedf89b6b32ecec237c452a5ef3900a293 + languageName: node + linkType: hard + +"object-hash@npm:^1.1.4": + version: 1.3.1 + resolution: "object-hash@npm:1.3.1" + checksum: 10c0/2132ca5ada8bb4995a19759810ad3442f7cfb4cde3fbf49f52652144df4198f5abe7e268e7e6707f92332debbf20234e20b54391fc782f236732df8f1742bd01 + languageName: node + linkType: hard + +"object-inspect@npm:^1.10.3": + version: 1.11.0 + resolution: "object-inspect@npm:1.11.0" + checksum: 10c0/eb08be1fecb532088153a23d4beb83b3feb8d49c001844a64b88568a9cc2755020a865b1a62957276e2fe20423576b09fa6e3948000fb9d6cb516171bafbf898 + languageName: node + linkType: hard + +"object-is@npm:^1.0.1": + version: 1.1.5 + resolution: "object-is@npm:1.1.5" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.3" + checksum: 10c0/8c263fb03fc28f1ffb54b44b9147235c5e233dc1ca23768e7d2569740b5d860154d7cc29a30220fe28ed6d8008e2422aefdebfe987c103e1c5d190cf02d9d886 + languageName: node + linkType: hard + +"object-keys@npm:^1.0.12, object-keys@npm:^1.1.1": + version: 1.1.1 + resolution: "object-keys@npm:1.1.1" + checksum: 10c0/b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d + languageName: node + linkType: hard + +"object-visit@npm:^1.0.0": + version: 1.0.1 + resolution: "object-visit@npm:1.0.1" + dependencies: + isobject: "npm:^3.0.0" + checksum: 10c0/086b475bda24abd2318d2b187c3e928959b89f5cb5883d6fe5a42d03719b61fc18e765f658de9ac8730e67ba9ff26d61e73d991215948ff9ecefe771e0071029 + languageName: node + linkType: hard + +"object.assign@npm:^4.1.0, object.assign@npm:^4.1.2": + version: 4.1.2 + resolution: "object.assign@npm:4.1.2" + dependencies: + call-bind: "npm:^1.0.0" + define-properties: "npm:^1.1.3" + has-symbols: "npm:^1.0.1" + object-keys: "npm:^1.1.1" + checksum: 10c0/ee0e796fad8952f05644d11632f046dc4b424f9a41d3816e11a612163b12a873c800456be9acdaec6221b72590ab5267e5fe4bf4cf1c67f88b05f82f133ac829 + languageName: node + linkType: hard + +"object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.0": + version: 2.1.2 + resolution: "object.getownpropertydescriptors@npm:2.1.2" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.3" + es-abstract: "npm:^1.18.0-next.2" + checksum: 10c0/00e7910e98f24f32c1c1846d11c0d47a57d50ec34242d40562815a1137e94d814d87fa13c66b1a750ea3581a728a3c43eb3175aa173ac5e1981ba120d9d93009 + languageName: node + linkType: hard + +"object.pick@npm:^1.3.0": + version: 1.3.0 + resolution: "object.pick@npm:1.3.0" + dependencies: + isobject: "npm:^3.0.1" + checksum: 10c0/cd316ec986e49895a28f2df9182de9cdeee57cd2a952c122aacc86344c28624fe002d9affc4f48b5014ec7c033da9942b08821ddb44db8c5bac5b3ec54bdc31e + languageName: node + linkType: hard + +"object.values@npm:^1.1.0": + version: 1.1.4 + resolution: "object.values@npm:1.1.4" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.3" + es-abstract: "npm:^1.18.2" + checksum: 10c0/c436e669ddd80b4acc4d79afb9cbff0cb794e94d711782a06b412efe3ea4fa08c7096eff22b322c74fc07286e4ff327f3005b3d12f6d769ab0941dca3e7c8f32 + languageName: node + linkType: hard + +"obuf@npm:^1.0.0, obuf@npm:^1.1.2": + version: 1.1.2 + resolution: "obuf@npm:1.1.2" + checksum: 10c0/520aaac7ea701618eacf000fc96ae458e20e13b0569845800fc582f81b386731ab22d55354b4915d58171db00e79cfcd09c1638c02f89577ef092b38c65b7d81 + languageName: node + linkType: hard + +"on-finished@npm:~2.3.0": + version: 2.3.0 + resolution: "on-finished@npm:2.3.0" + dependencies: + ee-first: "npm:1.1.1" + checksum: 10c0/c904f9e518b11941eb60279a3cbfaf1289bd0001f600a950255b1dede9fe3df8cd74f38483550b3bb9485165166acb5db500c3b4c4337aec2815c88c96fcc2ea + languageName: node + linkType: hard + +"on-headers@npm:~1.0.2": + version: 1.0.2 + resolution: "on-headers@npm:1.0.2" + checksum: 10c0/f649e65c197bf31505a4c0444875db0258e198292f34b884d73c2f751e91792ef96bb5cf89aa0f4fecc2e4dc662461dda606b1274b0e564f539cae5d2f5fc32f + languageName: node + linkType: hard + +"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": + version: 1.4.0 + resolution: "once@npm:1.4.0" + dependencies: + wrappy: "npm:1" + checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0 + languageName: node + linkType: hard + +"onetime@npm:^2.0.0": + version: 2.0.1 + resolution: "onetime@npm:2.0.1" + dependencies: + mimic-fn: "npm:^1.0.0" + checksum: 10c0/b4e44a8c34e70e02251bfb578a6e26d6de6eedbed106cd78211d2fd64d28b6281d54924696554e4e966559644243753ac5df73c87f283b0927533d3315696215 + languageName: node + linkType: hard + +"onetime@npm:^5.1.0": + version: 5.1.2 + resolution: "onetime@npm:5.1.2" + dependencies: + mimic-fn: "npm:^2.1.0" + checksum: 10c0/ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f + languageName: node + linkType: hard + +"open@npm:^6.3.0": + version: 6.4.0 + resolution: "open@npm:6.4.0" + dependencies: + is-wsl: "npm:^1.1.0" + checksum: 10c0/447115632b4f3939fa0d973c33e17f28538fd268fd8257fc49763f7de6e76d29d65585b15998bbd2137337cfb70a92084a0e1b183a466e53a4829f704f295823 + languageName: node + linkType: hard + +"opener@npm:^1.5.1": + version: 1.5.2 + resolution: "opener@npm:1.5.2" + bin: + opener: bin/opener-bin.js + checksum: 10c0/dd56256ab0cf796585617bc28e06e058adf09211781e70b264c76a1dbe16e90f868c974e5bf5309c93469157c7d14b89c35dc53fe7293b0e40b4d2f92073bc79 + languageName: node + linkType: hard + +"opn@npm:^5.5.0": + version: 5.5.0 + resolution: "opn@npm:5.5.0" + dependencies: + is-wsl: "npm:^1.1.0" + checksum: 10c0/03f78b1ab464fd0d97543e2a90e47ca872e2324696bc13f741467693060fe058e87e38e9cfc9f3b568e60dfb31579fbe664d8e806b2f219262c423da953bba4c + languageName: node + linkType: hard + +"optionator@npm:^0.8.3": + version: 0.8.3 + resolution: "optionator@npm:0.8.3" + dependencies: + deep-is: "npm:~0.1.3" + fast-levenshtein: "npm:~2.0.6" + levn: "npm:~0.3.0" + prelude-ls: "npm:~1.1.2" + type-check: "npm:~0.3.2" + word-wrap: "npm:~1.2.3" + checksum: 10c0/ad7000ea661792b3ec5f8f86aac28895850988926f483b5f308f59f4607dfbe24c05df2d049532ee227c040081f39401a268cf7bbf3301512f74c4d760dc6dd8 + languageName: node + linkType: hard + +"ora@npm:^3.4.0": + version: 3.4.0 + resolution: "ora@npm:3.4.0" + dependencies: + chalk: "npm:^2.4.2" + cli-cursor: "npm:^2.1.0" + cli-spinners: "npm:^2.0.0" + log-symbols: "npm:^2.2.0" + strip-ansi: "npm:^5.2.0" + wcwidth: "npm:^1.0.1" + checksum: 10c0/04cb375f222c36a16a95e6c39c473644a99a42fc34d35c37507cb836ea0a71f4d831fcd53198a460869114b2730891d63cc1047304afe5ddb078974d468edfb1 + languageName: node + linkType: hard + +"original@npm:^1.0.0": + version: 1.0.2 + resolution: "original@npm:1.0.2" + dependencies: + url-parse: "npm:^1.4.3" + checksum: 10c0/af143d5be62b055ffb6fc2a0d08a650b822f48feca4ea21940c1f7a147727a317faedca254394ad0028ddaa4eecf7cf4376c370d746386cc35974e9122ebb14a + languageName: node + linkType: hard + +"os-browserify@npm:^0.3.0": + version: 0.3.0 + resolution: "os-browserify@npm:0.3.0" + checksum: 10c0/6ff32cb1efe2bc6930ad0fd4c50e30c38010aee909eba8d65be60af55efd6cbb48f0287e3649b4e3f3a63dce5a667b23c187c4293a75e557f0d5489d735bcf52 + languageName: node + linkType: hard + +"os-tmpdir@npm:~1.0.2": + version: 1.0.2 + resolution: "os-tmpdir@npm:1.0.2" + checksum: 10c0/f438450224f8e2687605a8dd318f0db694b6293c5d835ae509a69e97c8de38b6994645337e5577f5001115470414638978cc49da1cdcc25106dad8738dc69990 + languageName: node + linkType: hard + +"p-finally@npm:^1.0.0": + version: 1.0.0 + resolution: "p-finally@npm:1.0.0" + checksum: 10c0/6b8552339a71fe7bd424d01d8451eea92d379a711fc62f6b2fe64cad8a472c7259a236c9a22b4733abca0b5666ad503cb497792a0478c5af31ded793d00937e7 + languageName: node + linkType: hard + +"p-finally@npm:^2.0.0": + version: 2.0.1 + resolution: "p-finally@npm:2.0.1" + checksum: 10c0/a4ee34179f5e0eb5417462ca5afbca4b6b537b051ea87c8ec7649ffb2b60a8e82a06441792fe496ab0d0156c4060a3dfd707973915a1b8369b00f2531e3eab94 + languageName: node + linkType: hard + +"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0, p-limit@npm:^2.2.1": + version: 2.3.0 + resolution: "p-limit@npm:2.3.0" + dependencies: + p-try: "npm:^2.0.0" + checksum: 10c0/8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12 + languageName: node + linkType: hard + +"p-locate@npm:^3.0.0": + version: 3.0.0 + resolution: "p-locate@npm:3.0.0" + dependencies: + p-limit: "npm:^2.0.0" + checksum: 10c0/7b7f06f718f19e989ce6280ed4396fb3c34dabdee0df948376483032f9d5ec22fdf7077ec942143a75827bb85b11da72016497fc10dac1106c837ed593969ee8 + languageName: node + linkType: hard + +"p-locate@npm:^4.1.0": + version: 4.1.0 + resolution: "p-locate@npm:4.1.0" + dependencies: + p-limit: "npm:^2.2.0" + checksum: 10c0/1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9 + languageName: node + linkType: hard + +"p-map@npm:^2.0.0": + version: 2.1.0 + resolution: "p-map@npm:2.1.0" + checksum: 10c0/735dae87badd4737a2dd582b6d8f93e49a1b79eabbc9815a4d63a528d5e3523e978e127a21d784cccb637010e32103a40d2aaa3ab23ae60250b1a820ca752043 + languageName: node + linkType: hard + +"p-retry@npm:^3.0.1": + version: 3.0.1 + resolution: "p-retry@npm:3.0.1" + dependencies: + retry: "npm:^0.12.0" + checksum: 10c0/4fbec30cb0d8d10c5d9d1787a2d2c2b5ee60ddfa1897e86ec4e556ca1dff0901859872d7a7ecc33dd94af6e1c3a92ed79cc828161bbd221a2a1e464971c51b1b + languageName: node + linkType: hard + +"p-try@npm:^2.0.0": + version: 2.2.0 + resolution: "p-try@npm:2.2.0" + checksum: 10c0/c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f + languageName: node + linkType: hard + +"pako@npm:~1.0.5": + version: 1.0.11 + resolution: "pako@npm:1.0.11" + checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe + languageName: node + linkType: hard + +"parallel-transform@npm:^1.1.0": + version: 1.2.0 + resolution: "parallel-transform@npm:1.2.0" + dependencies: + cyclist: "npm:^1.0.1" + inherits: "npm:^2.0.3" + readable-stream: "npm:^2.1.5" + checksum: 10c0/ab0e58569e73681ca4b9c9228189bdb6cbea535295fae344cf0d8342fd33a950961914f3c414f81894c1498fb9ad1c079b4625d2b7ceae9e6ab812f22e3bea3f + languageName: node + linkType: hard + +"param-case@npm:2.1.x": + version: 2.1.1 + resolution: "param-case@npm:2.1.1" + dependencies: + no-case: "npm:^2.2.0" + checksum: 10c0/8ea1b8472fd51d5f50b28d1d754899713805d05f2241e9b8c4acafa2c500b3f47457a3b4932ab75220f14d2c69180bb7338b78a45576e2b4d90da1e6f0285833 + languageName: node + linkType: hard + +"parent-module@npm:^1.0.0": + version: 1.0.1 + resolution: "parent-module@npm:1.0.1" + dependencies: + callsites: "npm:^3.0.0" + checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556 + languageName: node + linkType: hard + +"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5": + version: 5.1.6 + resolution: "parse-asn1@npm:5.1.6" + dependencies: + asn1.js: "npm:^5.2.0" + browserify-aes: "npm:^1.0.0" + evp_bytestokey: "npm:^1.0.0" + pbkdf2: "npm:^3.0.3" + safe-buffer: "npm:^5.1.1" + checksum: 10c0/4ed1d9b9e120c5484d29d67bb90171aac0b73422bc016d6294160aea983275c28a27ab85d862059a36a86a97dd31b7ddd97486802ca9fac67115fe3409e9dcbd + languageName: node + linkType: hard + +"parse-json@npm:^4.0.0": + version: 4.0.0 + resolution: "parse-json@npm:4.0.0" + dependencies: + error-ex: "npm:^1.3.1" + json-parse-better-errors: "npm:^1.0.1" + checksum: 10c0/8d80790b772ccb1bcea4e09e2697555e519d83d04a77c2b4237389b813f82898943a93ffff7d0d2406203bdd0c30dcf95b1661e3a53f83d0e417f053957bef32 + languageName: node + linkType: hard + +"parse-json@npm:^5.0.0": + version: 5.2.0 + resolution: "parse-json@npm:5.2.0" + dependencies: + "@babel/code-frame": "npm:^7.0.0" + error-ex: "npm:^1.3.1" + json-parse-even-better-errors: "npm:^2.3.0" + lines-and-columns: "npm:^1.1.6" + checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585 + languageName: node + linkType: hard + +"parse5-htmlparser2-tree-adapter@npm:^6.0.0": + version: 6.0.1 + resolution: "parse5-htmlparser2-tree-adapter@npm:6.0.1" + dependencies: + parse5: "npm:^6.0.1" + checksum: 10c0/dfa5960e2aaf125707e19a4b1bc333de49232eba5a6ffffb95d313a7d6087c3b7a274b58bee8d3bd41bdf150638815d1d601a42bbf2a0345208c3c35b1279556 + languageName: node + linkType: hard + +"parse5@npm:^5.1.1": + version: 5.1.1 + resolution: "parse5@npm:5.1.1" + checksum: 10c0/b0f87a77a7fea5f242e3d76917c983bbea47703b9371801d51536b78942db6441cbda174bf84eb30e47315ddc6f8a0b57d68e562c790154430270acd76c1fa03 + languageName: node + linkType: hard + +"parse5@npm:^6.0.1": + version: 6.0.1 + resolution: "parse5@npm:6.0.1" + checksum: 10c0/595821edc094ecbcfb9ddcb46a3e1fe3a718540f8320eff08b8cf6742a5114cce2d46d45f95c26191c11b184dcaf4e2960abcd9c5ed9eb9393ac9a37efcfdecb + languageName: node + linkType: hard + +"parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": + version: 1.3.3 + resolution: "parseurl@npm:1.3.3" + checksum: 10c0/90dd4760d6f6174adb9f20cf0965ae12e23879b5f5464f38e92fce8073354341e4b3b76fa3d878351efe7d01e617121955284cfd002ab087fba1a0726ec0b4f5 + languageName: node + linkType: hard + +"pascalcase@npm:^0.1.1": + version: 0.1.1 + resolution: "pascalcase@npm:0.1.1" + checksum: 10c0/48dfe90618e33810bf58211d8f39ad2c0262f19ad6354da1ba563935b5f429f36409a1fb9187c220328f7a4dc5969917f8e3e01ee089b5f1627b02aefe39567b + languageName: node + linkType: hard + +"path-browserify@npm:0.0.1": + version: 0.0.1 + resolution: "path-browserify@npm:0.0.1" + checksum: 10c0/3d59710cddeea06509d91935196185900f3d9d29376dff68ff0e146fbd41d0fb304e983d0158f30cabe4dd2ffcc6a7d3d977631994ee984c88e66aed50a1ccd3 + languageName: node + linkType: hard + +"path-dirname@npm:^1.0.0": + version: 1.0.2 + resolution: "path-dirname@npm:1.0.2" + checksum: 10c0/71e59be2bada7c91f62b976245fd421b7cb01fde3207fe53a82d8880621ad04fd8b434e628c9cf4e796259fc168a107d77cd56837725267c5b2c58cefe2c4e1b + languageName: node + linkType: hard + +"path-exists@npm:^2.0.0": + version: 2.1.0 + resolution: "path-exists@npm:2.1.0" + dependencies: + pinkie-promise: "npm:^2.0.0" + checksum: 10c0/87352f1601c085d5a6eb202f60e5c016c1b790bd0bc09398af446ed3f5c4510b4531ff99cf8acac2d91868886e792927b4292f768b35a83dce12588fb7cbb46e + languageName: node + linkType: hard + +"path-exists@npm:^3.0.0": + version: 3.0.0 + resolution: "path-exists@npm:3.0.0" + checksum: 10c0/17d6a5664bc0a11d48e2b2127d28a0e58822c6740bde30403f08013da599182289c56518bec89407e3f31d3c2b6b296a4220bc3f867f0911fee6952208b04167 + languageName: node + linkType: hard + +"path-exists@npm:^4.0.0": + version: 4.0.0 + resolution: "path-exists@npm:4.0.0" + checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b + languageName: node + linkType: hard + +"path-is-absolute@npm:^1.0.0": + version: 1.0.1 + resolution: "path-is-absolute@npm:1.0.1" + checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078 + languageName: node + linkType: hard + +"path-is-inside@npm:^1.0.2": + version: 1.0.2 + resolution: "path-is-inside@npm:1.0.2" + checksum: 10c0/7fdd4b41672c70461cce734fc222b33e7b447fa489c7c4377c95e7e6852d83d69741f307d88ec0cc3b385b41cb4accc6efac3c7c511cd18512e95424f5fa980c + languageName: node + linkType: hard + +"path-key@npm:^2.0.0, path-key@npm:^2.0.1": + version: 2.0.1 + resolution: "path-key@npm:2.0.1" + checksum: 10c0/dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b + languageName: node + linkType: hard + +"path-key@npm:^3.0.0, path-key@npm:^3.1.0": + version: 3.1.1 + resolution: "path-key@npm:3.1.1" + checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c + languageName: node + linkType: hard + +"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7": + version: 1.0.7 + resolution: "path-parse@npm:1.0.7" + checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1 + languageName: node + linkType: hard + +"path-to-regexp@npm:0.1.7": + version: 0.1.7 + resolution: "path-to-regexp@npm:0.1.7" + checksum: 10c0/50a1ddb1af41a9e68bd67ca8e331a705899d16fb720a1ea3a41e310480948387daf603abb14d7b0826c58f10146d49050a1291ba6a82b78a382d1c02c0b8f905 + languageName: node + linkType: hard + +"path-type@npm:^3.0.0": + version: 3.0.0 + resolution: "path-type@npm:3.0.0" + dependencies: + pify: "npm:^3.0.0" + checksum: 10c0/1332c632f1cac15790ebab8dd729b67ba04fc96f81647496feb1c2975d862d046f41e4b975dbd893048999b2cc90721f72924ad820acc58c78507ba7141a8e56 + languageName: node + linkType: hard + +"pbkdf2@npm:^3.0.3": + version: 3.1.2 + resolution: "pbkdf2@npm:3.1.2" + dependencies: + create-hash: "npm:^1.1.2" + create-hmac: "npm:^1.1.4" + ripemd160: "npm:^2.0.1" + safe-buffer: "npm:^5.0.1" + sha.js: "npm:^2.4.8" + checksum: 10c0/5a30374e87d33fa080a92734d778cf172542cc7e41b96198c4c88763997b62d7850de3fbda5c3111ddf79805ee7c1da7046881c90ac4920b5e324204518b05fd + languageName: node + linkType: hard + +"performance-now@npm:^2.1.0": + version: 2.1.0 + resolution: "performance-now@npm:2.1.0" + checksum: 10c0/22c54de06f269e29f640e0e075207af57de5052a3d15e360c09b9a8663f393f6f45902006c1e71aa8a5a1cdfb1a47fe268826f8496d6425c362f00f5bc3e85d9 + languageName: node + linkType: hard + +"picocolors@npm:^1.1.1": + version: 1.1.1 + resolution: "picocolors@npm:1.1.1" + checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58 + languageName: node + linkType: hard + +"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3": + version: 2.3.0 + resolution: "picomatch@npm:2.3.0" + checksum: 10c0/a65bde78212368e16afb82429a0ea033d20a836270446acb53ec6e31d939bccf1213f788bc49361f7aff47b67c1fb74d898f99964f67f26ca07a3cd815ddbcbb + languageName: node + linkType: hard + +"picomatch@npm:^2.2.2": + version: 2.3.2 + resolution: "picomatch@npm:2.3.2" + checksum: 10c0/a554d1709e59be97d1acb9eaedbbc700a5c03dbd4579807baed95100b00420bc729335440ef15004ae2378984e2487a7c1cebd743cfdb72b6fa9ab69223c0d61 + languageName: node + linkType: hard + +"picomatch@npm:^4.0.3, picomatch@npm:^4.0.4": + version: 4.0.4 + resolution: "picomatch@npm:4.0.4" + checksum: 10c0/e2c6023372cc7b5764719a5ffb9da0f8e781212fa7ca4bd0562db929df8e117460f00dff3cb7509dacfc06b86de924b247f504d0ce1806a37fac4633081466b0 + languageName: node + linkType: hard + +"pify@npm:^2.0.0": + version: 2.3.0 + resolution: "pify@npm:2.3.0" + checksum: 10c0/551ff8ab830b1052633f59cb8adc9ae8407a436e06b4a9718bcb27dc5844b83d535c3a8512b388b6062af65a98c49bdc0dd523d8b2617b188f7c8fee457158dc + languageName: node + linkType: hard + +"pify@npm:^3.0.0": + version: 3.0.0 + resolution: "pify@npm:3.0.0" + checksum: 10c0/fead19ed9d801f1b1fcd0638a1ac53eabbb0945bf615f2f8806a8b646565a04a1b0e7ef115c951d225f042cca388fdc1cd3add46d10d1ed6951c20bd2998af10 + languageName: node + linkType: hard + +"pify@npm:^4.0.1": + version: 4.0.1 + resolution: "pify@npm:4.0.1" + checksum: 10c0/6f9d404b0d47a965437403c9b90eca8bb2536407f03de165940e62e72c8c8b75adda5516c6b9b23675a5877cc0bcac6bdfb0ef0e39414cd2476d5495da40e7cf + languageName: node + linkType: hard + +"pinkie-promise@npm:^2.0.0": + version: 2.0.1 + resolution: "pinkie-promise@npm:2.0.1" + dependencies: + pinkie: "npm:^2.0.0" + checksum: 10c0/11b5e5ce2b090c573f8fad7b517cbca1bb9a247587306f05ae71aef6f9b2cd2b923c304aa9663c2409cfde27b367286179f1379bc4ec18a3fbf2bb0d473b160a + languageName: node + linkType: hard + +"pinkie@npm:^2.0.0": + version: 2.0.4 + resolution: "pinkie@npm:2.0.4" + checksum: 10c0/25228b08b5597da42dc384221aa0ce56ee0fbf32965db12ba838e2a9ca0193c2f0609c45551ee077ccd2060bf109137fdb185b00c6d7e0ed7e35006d20fdcbc6 + languageName: node + linkType: hard + +"pkg-dir@npm:^1.0.0": + version: 1.0.0 + resolution: "pkg-dir@npm:1.0.0" + dependencies: + find-up: "npm:^1.0.0" + checksum: 10c0/aa4c0322b5804fee90081ecc79f89b00922016ff56415a8e6bbafb19833e1bd8001a8999571599fb3212719d4e74e1fdb48338f6ff5b57d857a32cc939701e1a + languageName: node + linkType: hard + +"pkg-dir@npm:^3.0.0": + version: 3.0.0 + resolution: "pkg-dir@npm:3.0.0" + dependencies: + find-up: "npm:^3.0.0" + checksum: 10c0/902a3d0c1f8ac43b1795fa1ba6ffeb37dfd53c91469e969790f6ed5e29ff2bdc50b63ba6115dc056d2efb4a040aa2446d512b3804bdafdf302f734fb3ec21847 + languageName: node + linkType: hard + +"pkg-dir@npm:^4.1.0": + version: 4.2.0 + resolution: "pkg-dir@npm:4.2.0" + dependencies: + find-up: "npm:^4.0.0" + checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728 + languageName: node + linkType: hard + +"pnp-webpack-plugin@npm:^1.6.4": + version: 1.6.4 + resolution: "pnp-webpack-plugin@npm:1.6.4" + dependencies: + ts-pnp: "npm:^1.1.6" + checksum: 10c0/6cedab8a9cd129b9f58408023f80cad528e361685f50c2149da7ad8fb79bd2043d3250c68b8723aa43ecdb913931edf04ecaa4d7afe719d0e151055d41779599 + languageName: node + linkType: hard + +"portfinder@npm:^1.0.26": + version: 1.0.28 + resolution: "portfinder@npm:1.0.28" + dependencies: + async: "npm:^2.6.2" + debug: "npm:^3.1.1" + mkdirp: "npm:^0.5.5" + checksum: 10c0/fefd3d65a6464b498e0e9b4a4b82f29489441bb1892a3350403cfdf6e591e583d9e75bac1c6ae8ca2cdf1a942ae18890831a0a855bb1bb977678acdf9e5a560f + languageName: node + linkType: hard + +"posix-character-classes@npm:^0.1.0": + version: 0.1.1 + resolution: "posix-character-classes@npm:0.1.1" + checksum: 10c0/cce88011548a973b4af58361cd8f5f7b5a6faff8eef0901565802f067bcabf82597e920d4c97c22068464be3cbc6447af589f6cc8a7d813ea7165be60a0395bc + languageName: node + linkType: hard + +"postcss-calc@npm:^7.0.1": + version: 7.0.5 + resolution: "postcss-calc@npm:7.0.5" + dependencies: + postcss: "npm:^7.0.27" + postcss-selector-parser: "npm:^6.0.2" + postcss-value-parser: "npm:^4.0.2" + checksum: 10c0/37f10245a1280d96165a8f56a0cd90fcbc3f9277fc50b54ba79a45f24da4662b8ce57dcffe81331e8997bcc56f7b89fae4e8d9dc27b8c5d72010976d622388e3 + languageName: node + linkType: hard + +"postcss-colormin@npm:^4.0.3": + version: 4.0.3 + resolution: "postcss-colormin@npm:4.0.3" + dependencies: + browserslist: "npm:^4.0.0" + color: "npm:^3.0.0" + has: "npm:^1.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/7f722c3287e51c6103554e536d0ee8497f137f6292874180cb50de98c8e86b0701898aafc81fa133fef29f3f857dc2a36b101d9b629556dcff02487e91e668af + languageName: node + linkType: hard + +"postcss-convert-values@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-convert-values@npm:4.0.1" + dependencies: + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/19d81085b7e74610f35a857eb0daba90fc3f0195e211175051ff7cd77f1a6c2b16e82059495651c37e83a3c47b4ad8eae4eb6e7792ad01a2694ba541f518f50e + languageName: node + linkType: hard + +"postcss-discard-comments@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-discard-comments@npm:4.0.2" + dependencies: + postcss: "npm:^7.0.0" + checksum: 10c0/12b491ae1a730137bc77443d2dda274ec385e8a8994a87eda67ca811c9b733f21d362fac6762f9b850a9093ef645201bedcfda91983909cd1b14092524dbbe26 + languageName: node + linkType: hard + +"postcss-discard-duplicates@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-discard-duplicates@npm:4.0.2" + dependencies: + postcss: "npm:^7.0.0" + checksum: 10c0/ca7a9a1564e4a8aedccb0fb9a8b4b3b42328998d30e54a6cbff8cee85cf9d1751acb802549f2cf8d4a846731f9a22946e83d2ab430ea66332c58e13d9c6e9d08 + languageName: node + linkType: hard + +"postcss-discard-empty@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-discard-empty@npm:4.0.1" + dependencies: + postcss: "npm:^7.0.0" + checksum: 10c0/be6c575a92dfd8b43e3e31af27b4585273e51b8576a8f8b68128fd66a050aeed2395e8f68000ab4047a5a51388fd1c1d6abdcb21469bccf99394faef5638ed94 + languageName: node + linkType: hard + +"postcss-discard-overridden@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-discard-overridden@npm:4.0.1" + dependencies: + postcss: "npm:^7.0.0" + checksum: 10c0/187408dbc7668d8b9c8326b8c8a615c191d1cd159095dd77a35bdd7d53688a650e68f043cdacccb78429a0d0339b834313060ae45c63d022ec3c13f581d37be8 + languageName: node + linkType: hard + +"postcss-load-config@npm:^2.0.0": + version: 2.1.2 + resolution: "postcss-load-config@npm:2.1.2" + dependencies: + cosmiconfig: "npm:^5.0.0" + import-cwd: "npm:^2.0.0" + checksum: 10c0/a91df467d07b9ac3c5373721ac5294e2c21c9acdc9f2e2f43f7dc9d02529bee7d9e65b5ab20165d3f99d2421e38db893109c6bfd5f7432d607bfba5eea0f61df + languageName: node + linkType: hard + +"postcss-loader@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-loader@npm:3.0.0" + dependencies: + loader-utils: "npm:^1.1.0" + postcss: "npm:^7.0.0" + postcss-load-config: "npm:^2.0.0" + schema-utils: "npm:^1.0.0" + checksum: 10c0/1b11a6a3f52c9ef5d86c7be87a16a420fc5396865fcfeaf2d9f21cb5c7b4fd3381ecf9b9fbe748f5efb6de9a17f270fcf3b76f76a45f7d91ffff507b674f0171 + languageName: node + linkType: hard + +"postcss-merge-longhand@npm:^4.0.11": + version: 4.0.11 + resolution: "postcss-merge-longhand@npm:4.0.11" + dependencies: + css-color-names: "npm:0.0.4" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + stylehacks: "npm:^4.0.0" + checksum: 10c0/6611e41d7fd103befdf429277214da56bcba37e4f2e7a5a0d4b463f418e7b66f71bfa6b5bb21be6e92e9d9e30884d9cc13c7f8025abef69e0941a0202afbcf15 + languageName: node + linkType: hard + +"postcss-merge-rules@npm:^4.0.3": + version: 4.0.3 + resolution: "postcss-merge-rules@npm:4.0.3" + dependencies: + browserslist: "npm:^4.0.0" + caniuse-api: "npm:^3.0.0" + cssnano-util-same-parent: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-selector-parser: "npm:^3.0.0" + vendors: "npm:^1.0.0" + checksum: 10c0/999462a396a3987355bce10318db03b2cff08b8162285e98f247713620eb4ac352e325f4dec6362dda91747303d3c83386e48aad3cc8e671f5e51a094a7d9c68 + languageName: node + linkType: hard + +"postcss-minify-font-values@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-minify-font-values@npm:4.0.2" + dependencies: + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/e22eec80302a193f18956ea6f32f3c010603b607e7c35753c9af14d7ac2c53f1f4cc45bd150c478a04805ade8914ec612f67e486f07fd82bc0af1fe779f3670f + languageName: node + linkType: hard + +"postcss-minify-gradients@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-minify-gradients@npm:4.0.2" + dependencies: + cssnano-util-get-arguments: "npm:^4.0.0" + is-color-stop: "npm:^1.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/946546279c2fd2d84c9ce42085c524940a5feb3bc73ca8d45bffc978196194565017531d9b405578f02a5d1c337fd7c982d690aaa56471d1c13475c3cefefbdc + languageName: node + linkType: hard + +"postcss-minify-params@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-minify-params@npm:4.0.2" + dependencies: + alphanum-sort: "npm:^1.0.0" + browserslist: "npm:^4.0.0" + cssnano-util-get-arguments: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + uniqs: "npm:^2.0.0" + checksum: 10c0/c43f5a04f62b864303e14a8584c662d1b3f6f9ed1df5585a43f778197729e3ee2b8fc099b2977b47f813ea11f32e3c8fcd59937ecd8a92b39c8207ce6c745936 + languageName: node + linkType: hard + +"postcss-minify-selectors@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-minify-selectors@npm:4.0.2" + dependencies: + alphanum-sort: "npm:^1.0.0" + has: "npm:^1.0.0" + postcss: "npm:^7.0.0" + postcss-selector-parser: "npm:^3.0.0" + checksum: 10c0/e7f5ffcfb3d9a763201952327c5bf4cd3d4fcb0ffdbab156d935600cbb7bf0d15b7b039449fe3971f54edd33043d7a41580715ee6d57f3cb0336ba1ca915fa12 + languageName: node + linkType: hard + +"postcss-modules-extract-imports@npm:^2.0.0": + version: 2.0.0 + resolution: "postcss-modules-extract-imports@npm:2.0.0" + dependencies: + postcss: "npm:^7.0.5" + checksum: 10c0/170e8d680c267c536563e76979f04dc80e6dfa026d49f1e9ead2d0981a74b0c64d2894a8fd691e50568f12144553cf0b948ab43263872b3f696dcb34b683e238 + languageName: node + linkType: hard + +"postcss-modules-local-by-default@npm:^3.0.2": + version: 3.0.3 + resolution: "postcss-modules-local-by-default@npm:3.0.3" + dependencies: + icss-utils: "npm:^4.1.1" + postcss: "npm:^7.0.32" + postcss-selector-parser: "npm:^6.0.2" + postcss-value-parser: "npm:^4.1.0" + checksum: 10c0/007fd7286b4e120edfdf1a41f2006e9c8cb49e1613a4e3f0fdc184ad14273a1bbfc39ced3bc7cbad9af64bf67056e8ea0dcfda16d3057562343a48ee9ec2ccac + languageName: node + linkType: hard + +"postcss-modules-scope@npm:^2.2.0": + version: 2.2.0 + resolution: "postcss-modules-scope@npm:2.2.0" + dependencies: + postcss: "npm:^7.0.6" + postcss-selector-parser: "npm:^6.0.0" + checksum: 10c0/60b4438d43e6629d72b31a5122037e5574f8a6a4629038cd74afc4e5197cebc55b76c765b6bfcc2421bc740d19c3c97e68918e560a0fe88047c2131d0966df3c + languageName: node + linkType: hard + +"postcss-modules-values@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-modules-values@npm:3.0.0" + dependencies: + icss-utils: "npm:^4.0.0" + postcss: "npm:^7.0.6" + checksum: 10c0/f97b4669446810aa9c4c22538e24faee203e8462f1c7d38923c57140903bc170451dfec5974e480c2c367690735042cbfec187d209d0044d99f829f29ad0e610 + languageName: node + linkType: hard + +"postcss-normalize-charset@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-normalize-charset@npm:4.0.1" + dependencies: + postcss: "npm:^7.0.0" + checksum: 10c0/4eea4cb61e9153c064354919d3a0eb4666d5f2ea36c5cc1d24e9901601a03fb9bb40e5161f7203088afb306c7bdf21dfaf19489378d642a612741deb5cb17723 + languageName: node + linkType: hard + +"postcss-normalize-display-values@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-normalize-display-values@npm:4.0.2" + dependencies: + cssnano-util-get-match: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/01083456e37d466c093defdb7b7fc8779a1ec6fbe0a18469127d243c49fb7c61cc70d378c04461314d7b38327c2833ca928317413bf2a41402b3214a950d7e00 + languageName: node + linkType: hard + +"postcss-normalize-positions@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-normalize-positions@npm:4.0.2" + dependencies: + cssnano-util-get-arguments: "npm:^4.0.0" + has: "npm:^1.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/1b774b7277420869bfeb5921d66584b1669a2a0d47b34e11b839a34049895e6146721d26c20e6aab7928240a8565ac6dec13b6101837ee50b7edc3016f6288f6 + languageName: node + linkType: hard + +"postcss-normalize-repeat-style@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-normalize-repeat-style@npm:4.0.2" + dependencies: + cssnano-util-get-arguments: "npm:^4.0.0" + cssnano-util-get-match: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/a13e6d0aac3a7a0627a180bcca04467dcab23f14a676ded735dee1ca742293ea7baf283f2cf3c8e28b7429b2ab158b6646f4375d0bbbeffec7870fea1818af0b + languageName: node + linkType: hard + +"postcss-normalize-string@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-normalize-string@npm:4.0.2" + dependencies: + has: "npm:^1.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/2827a5a16bbfd87c4f41aa30e818428eb3a86755c43938590e7436c6f7bf7cc17099b37f6b89425f0b7f46d482e230dc3d887426b26566a818eeaa64131e8c8d + languageName: node + linkType: hard + +"postcss-normalize-timing-functions@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-normalize-timing-functions@npm:4.0.2" + dependencies: + cssnano-util-get-match: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/999c3166332b83c7cad2d5cf21dfda52349068eeeec79117304e754d3607dc7ed2133f78c1c0fec870c34e700687a4ed0b4f8780ca3c0a4428b422fbc72ec14e + languageName: node + linkType: hard + +"postcss-normalize-unicode@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-normalize-unicode@npm:4.0.1" + dependencies: + browserslist: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/9841bcfb11c4371cea853c2b88756428215c3dd64b3535b136189ca67f721b309d32d59067ca9ba8a6862a69c1ada4a5ca65c8d40757fd2ba87f313bccc97634 + languageName: node + linkType: hard + +"postcss-normalize-url@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-normalize-url@npm:4.0.1" + dependencies: + is-absolute-url: "npm:^2.0.0" + normalize-url: "npm:^3.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/713d0b87d5dd0aa126f3f4850be581b05c3668887c591f84e89ca90fb892a6a78fb7fdcf4750c968bf804dcd0bd9d7768e0339c7259e891a69c5d6b414333a3f + languageName: node + linkType: hard + +"postcss-normalize-whitespace@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-normalize-whitespace@npm:4.0.2" + dependencies: + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/497ed988df6c4e6f2dcfcc9f6cfff967585c941549d885b02ef55b2d1ab7bceabb633595dd5b6ad1a2998af0c8c6f2d59cdffad4828c86ca79a690dd727a6dc2 + languageName: node + linkType: hard + +"postcss-ordered-values@npm:^4.1.2": + version: 4.1.2 + resolution: "postcss-ordered-values@npm:4.1.2" + dependencies: + cssnano-util-get-arguments: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/6866d7b0b8b7f1986614216af124b36bc10b41995ee690d6a025fb9135438578041be30e779117f20fca94df97189f460d7013d6839d7e2a225802652074f12f + languageName: node + linkType: hard + +"postcss-reduce-initial@npm:^4.0.3": + version: 4.0.3 + resolution: "postcss-reduce-initial@npm:4.0.3" + dependencies: + browserslist: "npm:^4.0.0" + caniuse-api: "npm:^3.0.0" + has: "npm:^1.0.0" + postcss: "npm:^7.0.0" + checksum: 10c0/5358b64afbfc3eb0b51031f4568850a5c9142ccf45a6416736802778972d7157811cefebcd2b3afbbf7267db3d39bb09575a8c976ca6552b99ffbf7fdd5083ea + languageName: node + linkType: hard + +"postcss-reduce-transforms@npm:^4.0.2": + version: 4.0.2 + resolution: "postcss-reduce-transforms@npm:4.0.2" + dependencies: + cssnano-util-get-match: "npm:^4.0.0" + has: "npm:^1.0.0" + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + checksum: 10c0/72b9c83fb8af3ec756a8dedcc13d025068896484da00c6859c4e0980eb37b85766354cdbf83283f1f047417b00fc3f7472f3acd7411e301fcfe067e02fae03f3 + languageName: node + linkType: hard + +"postcss-selector-parser@npm:^3.0.0": + version: 3.1.2 + resolution: "postcss-selector-parser@npm:3.1.2" + dependencies: + dot-prop: "npm:^5.2.0" + indexes-of: "npm:^1.0.1" + uniq: "npm:^1.0.1" + checksum: 10c0/65f8fb1dcd64e9a3de03a6bd5e0a2e67475a01057d8470b46723cd569d1ddba4d18107e45aee26b46d8cdaab6ef8f5aad7c2e934fc4c46386418cc578dcc181b + languageName: node + linkType: hard + +"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2": + version: 6.0.6 + resolution: "postcss-selector-parser@npm:6.0.6" + dependencies: + cssesc: "npm:^3.0.0" + util-deprecate: "npm:^1.0.2" + checksum: 10c0/57b8cee8f9130fb6b3783251e59e1ea782098367d7ea748b69d75fa9be0f0934134c2e426808ec11e3d3489819a407ef0e0036097f255ada41dc1cebd90ec8b0 + languageName: node + linkType: hard + +"postcss-svgo@npm:^4.0.3": + version: 4.0.3 + resolution: "postcss-svgo@npm:4.0.3" + dependencies: + postcss: "npm:^7.0.0" + postcss-value-parser: "npm:^3.0.0" + svgo: "npm:^1.0.0" + checksum: 10c0/555eccf33c533e5f28f8441c5b14a2b1f606d56b8a357efad190f8d6d2646c11e088b740ba21798d41ba7c6819b6bd237a805dd1f8ddd44dd5c1c50ab5532f91 + languageName: node + linkType: hard + +"postcss-unique-selectors@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-unique-selectors@npm:4.0.1" + dependencies: + alphanum-sort: "npm:^1.0.0" + postcss: "npm:^7.0.0" + uniqs: "npm:^2.0.0" + checksum: 10c0/a7c1ef42914b89b05db624667edfcba9cd6dddc90ab9dc0049c42dd03cad02c9a6a128bded04188d32a62de263ac1893b5ff6ce4e8bb1ad628cfd944068d6edf + languageName: node + linkType: hard + +"postcss-value-parser@npm:^3.0.0": + version: 3.3.1 + resolution: "postcss-value-parser@npm:3.3.1" + checksum: 10c0/23eed98d8eeadb1f9ef1db4a2757da0f1d8e7c1dac2a38d6b35d971aab9eb3c6d8a967d0e9f435558834ffcd966afbbe875a56bcc5bcdd09e663008c106b3e47 + languageName: node + linkType: hard + +"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0": + version: 4.1.0 + resolution: "postcss-value-parser@npm:4.1.0" + checksum: 10c0/55b30eaa103765a7cc0468d2a41da6e200f992f2634c63eb89a97dd9b722732365e30dba007c2c040a8cb0c94ba8b70b0c97bcd1de62318ebae72bb5de9537e0 + languageName: node + linkType: hard + +"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.14, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.36, postcss@npm:^7.0.5, postcss@npm:^7.0.6": + version: 7.0.36 + resolution: "postcss@npm:7.0.36" + dependencies: + chalk: "npm:^2.4.2" + source-map: "npm:^0.6.1" + supports-color: "npm:^6.1.0" + checksum: 10c0/8e5dcaf9adf875a3ad9444227391979043958fc08f5a848a58bb716e41d1f7a1618cc3f884a7a19328d7ae341bbaa4f5a75063195dd43da168659688dffecbe1 + languageName: node + linkType: hard + +"postcss@npm:^8.4.14": + version: 8.5.9 + resolution: "postcss@npm:8.5.9" + dependencies: + nanoid: "npm:^3.3.11" + picocolors: "npm:^1.1.1" + source-map-js: "npm:^1.2.1" + checksum: 10c0/7cb2b32202ea1ead03f15cfbb2756a64a0f98942378e99b3dfce33678fe5eaf93e31d675a46e3a0dfb417d7b49b82d8999d0dd42a33c3b128e71ade0f978719a + languageName: node + linkType: hard + +"postcss@npm:^8.5.15": + version: 8.5.16 + resolution: "postcss@npm:8.5.16" + dependencies: + nanoid: "npm:^3.3.12" + picocolors: "npm:^1.1.1" + source-map-js: "npm:^1.2.1" + checksum: 10c0/625de7a02f662f3a340964d14b487bd5097adf16f5f171e257d19005ba37aea8768ee446557500e88e91ca46b4d14d6cb4a0bf033c6ec0c8c0b660d85719f1ef + languageName: node + linkType: hard + +"prelude-ls@npm:~1.1.2": + version: 1.1.2 + resolution: "prelude-ls@npm:1.1.2" + checksum: 10c0/7284270064f74e0bb7f04eb9bff7be677e4146417e599ccc9c1200f0f640f8b11e592d94eb1b18f7aa9518031913bb42bea9c86af07ba69902864e61005d6f18 + languageName: node + linkType: hard + +"prepend-http@npm:^1.0.0": + version: 1.0.4 + resolution: "prepend-http@npm:1.0.4" + checksum: 10c0/c6c173ca439e58163ba7bea7cbba52a1ed11e3e3da1c048da296f37d4b7654f78f7304e03f76d5923f4b83af7e2d55533e0f79064209c75b743ccddee13904f8 + languageName: node + linkType: hard + +"prettier-linter-helpers@npm:^1.0.0": + version: 1.0.1 + resolution: "prettier-linter-helpers@npm:1.0.1" + dependencies: + fast-diff: "npm:^1.1.2" + checksum: 10c0/91cea965681bc5f62c9d26bd3ca6358b81557261d4802e96ec1cf0acbd99d4b61632d53320cd2c3ec7d7f7805a81345644108a41ef46ddc9688e783a9ac792d1 + languageName: node + linkType: hard + +"prettier@npm:^1.18.2 || ^2.0.0, prettier@npm:^2.2.1": + version: 2.8.8 + resolution: "prettier@npm:2.8.8" + bin: + prettier: bin-prettier.js + checksum: 10c0/463ea8f9a0946cd5b828d8cf27bd8b567345cf02f56562d5ecde198b91f47a76b7ac9eae0facd247ace70e927143af6135e8cf411986b8cb8478784a4d6d724a + languageName: node + linkType: hard + +"pretty-error@npm:^2.0.2": + version: 2.1.2 + resolution: "pretty-error@npm:2.1.2" + dependencies: + lodash: "npm:^4.17.20" + renderkid: "npm:^2.0.4" + checksum: 10c0/779743faf707308e5d07c53c3ec94596c0cb631c92104a2721dd5d021ade39505a9151c5a5f838dfd26b02a06752c410eb6de1769c4fe327c90bd083f61a1fa1 + languageName: node + linkType: hard + +"proc-log@npm:^7.0.0": + version: 7.0.0 + resolution: "proc-log@npm:7.0.0" + checksum: 10c0/b89c2d862604f35fec795477b0c7e376feab3ba0d4f4d291c4e959567442697cf451ac557d0623c1cc38af45a78128b983410f397a10c5d3a67f76c33de4754b + languageName: node + linkType: hard + +"process-nextick-args@npm:~2.0.0": + version: 2.0.1 + resolution: "process-nextick-args@npm:2.0.1" + checksum: 10c0/bec089239487833d46b59d80327a1605e1c5287eaad770a291add7f45fda1bb5e28b38e0e061add0a1d0ee0984788ce74fa394d345eed1c420cacf392c554367 + languageName: node + linkType: hard + +"process@npm:^0.11.10": + version: 0.11.10 + resolution: "process@npm:0.11.10" + checksum: 10c0/40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3 + languageName: node + linkType: hard + +"progress@npm:^2.0.0": + version: 2.0.3 + resolution: "progress@npm:2.0.3" + checksum: 10c0/1697e07cb1068055dbe9fe858d242368ff5d2073639e652b75a7eb1f2a1a8d4afd404d719de23c7b48481a6aa0040686310e2dac2f53d776daa2176d3f96369c + languageName: node + linkType: hard + +"promise-inflight@npm:^1.0.1": + version: 1.0.1 + resolution: "promise-inflight@npm:1.0.1" + checksum: 10c0/d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc + languageName: node + linkType: hard + +"proxy-addr@npm:~2.0.5": + version: 2.0.7 + resolution: "proxy-addr@npm:2.0.7" + dependencies: + forwarded: "npm:0.2.0" + ipaddr.js: "npm:1.9.1" + checksum: 10c0/c3eed999781a35f7fd935f398b6d8920b6fb00bbc14287bc6de78128ccc1a02c89b95b56742bf7cf0362cc333c61d138532049c7dedc7a328ef13343eff81210 + languageName: node + linkType: hard + +"proxy-from-env@npm:^2.1.0": + version: 2.1.0 + resolution: "proxy-from-env@npm:2.1.0" + checksum: 10c0/ed01729fd4d094eab619cd7e17ce3698b3413b31eb102c4904f9875e677cd207392795d5b4adee9cec359dfd31c44d5ad7595a3a3ad51c40250e141512281c58 + languageName: node + linkType: hard + +"prr@npm:~1.0.1": + version: 1.0.1 + resolution: "prr@npm:1.0.1" + checksum: 10c0/5b9272c602e4f4472a215e58daff88f802923b84bc39c8860376bb1c0e42aaf18c25d69ad974bd06ec6db6f544b783edecd5502cd3d184748d99080d68e4be5f + languageName: node + linkType: hard + +"pseudomap@npm:^1.0.2": + version: 1.0.2 + resolution: "pseudomap@npm:1.0.2" + checksum: 10c0/5a91ce114c64ed3a6a553aa7d2943868811377388bb31447f9d8028271bae9b05b340fe0b6961a64e45b9c72946aeb0a4ab635e8f7cb3715ffd0ff2beeb6a679 + languageName: node + linkType: hard + +"psl@npm:^1.1.28": + version: 1.8.0 + resolution: "psl@npm:1.8.0" + checksum: 10c0/b5f1956f7530860e1918e7238291689fdc3cab9c2c0cdbc47cde21addcc7f62495d794692cc1e43e54728d273f78037e8e73ac43009509a1a7f823341f4039c8 + languageName: node + linkType: hard + +"public-encrypt@npm:^4.0.0": + version: 4.0.3 + resolution: "public-encrypt@npm:4.0.3" + dependencies: + bn.js: "npm:^4.1.0" + browserify-rsa: "npm:^4.0.0" + create-hash: "npm:^1.1.0" + parse-asn1: "npm:^5.0.0" + randombytes: "npm:^2.0.1" + safe-buffer: "npm:^5.1.2" + checksum: 10c0/6c2cc19fbb554449e47f2175065d6b32f828f9b3badbee4c76585ac28ae8641aafb9bb107afc430c33c5edd6b05dbe318df4f7d6d7712b1093407b11c4280700 + languageName: node + linkType: hard + +"pump@npm:^2.0.0": + version: 2.0.1 + resolution: "pump@npm:2.0.1" + dependencies: + end-of-stream: "npm:^1.1.0" + once: "npm:^1.3.1" + checksum: 10c0/f1fe8960f44d145f8617ea4c67de05392da4557052980314c8f85081aee26953bdcab64afad58a2b1df0e8ff7203e3710e848cbe81a01027978edc6e264db355 + languageName: node + linkType: hard + +"pump@npm:^3.0.0": + version: 3.0.0 + resolution: "pump@npm:3.0.0" + dependencies: + end-of-stream: "npm:^1.1.0" + once: "npm:^1.3.1" + checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478 + languageName: node + linkType: hard + +"pumpify@npm:^1.3.3": + version: 1.5.1 + resolution: "pumpify@npm:1.5.1" + dependencies: + duplexify: "npm:^3.6.0" + inherits: "npm:^2.0.3" + pump: "npm:^2.0.0" + checksum: 10c0/0bcabf9e3dbf2d0cc1f9b84ac80d3c75386111caf8963bfd98817a1e2192000ac0ccc804ca6ccd5b2b8430fdb71347b20fb2f014fe3d41adbacb1b502a841c45 + languageName: node + linkType: hard + +"punycode@npm:1.3.2": + version: 1.3.2 + resolution: "punycode@npm:1.3.2" + checksum: 10c0/281fd20eaf4704f79d80cb0dc65065bf6452ee67989b3e8941aed6360a5a9a8a01d3e2ed71d0bde3cd74fb5a5dd9db4160bed5a8c20bed4b6764c24ce4c7d2d2 + languageName: node + linkType: hard + +"punycode@npm:^1.2.4": + version: 1.4.1 + resolution: "punycode@npm:1.4.1" + checksum: 10c0/354b743320518aef36f77013be6e15da4db24c2b4f62c5f1eb0529a6ed02fbaf1cb52925785f6ab85a962f2b590d9cd5ad730b70da72b5f180e2556b8bd3ca08 + languageName: node + linkType: hard + +"punycode@npm:^2.1.0": + version: 2.3.1 + resolution: "punycode@npm:2.3.1" + checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9 + languageName: node + linkType: hard + +"punycode@npm:^2.1.1": + version: 2.1.1 + resolution: "punycode@npm:2.1.1" + checksum: 10c0/83815ca9b9177f055771f31980cbec7ffaef10257d50a95ab99b4a30f0404846e85fa6887ee1bbc0aaddb7bad6d96e2fa150a016051ff0f6b92be4ad613ddca8 + languageName: node + linkType: hard + +"q@npm:^1.1.2": + version: 1.5.1 + resolution: "q@npm:1.5.1" + checksum: 10c0/7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4 + languageName: node + linkType: hard + +"qs@npm:6.7.0": + version: 6.7.0 + resolution: "qs@npm:6.7.0" + checksum: 10c0/04e6934d8cfa4f352e5bf5fe16eeed75dccad16d1e03b53ece849839b7439940f0df8bf0bc4750306d65baf95ebe165315f61122067e33bfee7b7ef4e3945813 + languageName: node + linkType: hard + +"qs@npm:~6.5.2": + version: 6.5.2 + resolution: "qs@npm:6.5.2" + checksum: 10c0/dab79026d56e6f1fdcc4779a1c6e05d05dad2199443a025815399f545294c9ea2c3ab50a5198600f5f13f52c5672b4389ceccf946919e150467281abf6edf747 + languageName: node + linkType: hard + +"query-string@npm:^4.1.0": + version: 4.3.4 + resolution: "query-string@npm:4.3.4" + dependencies: + object-assign: "npm:^4.1.0" + strict-uri-encode: "npm:^1.0.0" + checksum: 10c0/6181c343074c2049fbbcde63f87c1da5d3a49c6e34c8d94a61d692e886e0b8cd1ae4a4be00b598112bb9c4cb819e423ed503a5d246e4d24ecb0990d8bb21570b + languageName: node + linkType: hard + +"querystring-es3@npm:^0.2.0": + version: 0.2.1 + resolution: "querystring-es3@npm:0.2.1" + checksum: 10c0/476938c1adb45c141f024fccd2ffd919a3746e79ed444d00e670aad68532977b793889648980e7ca7ff5ffc7bfece623118d0fbadcaf217495eeb7059ae51580 + languageName: node + linkType: hard + +"querystring@npm:0.2.0": + version: 0.2.0 + resolution: "querystring@npm:0.2.0" + checksum: 10c0/2036c9424beaacd3978bac9e4ba514331cc73163bea7bf3ad7e2c7355e55501938ec195312c607753f9c6e70b1bf9dfcda38db6241bd299c034e27ac639d64ed + languageName: node + linkType: hard + +"querystringify@npm:^2.1.1": + version: 2.2.0 + resolution: "querystringify@npm:2.2.0" + checksum: 10c0/3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa + languageName: node + linkType: hard + +"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0": + version: 2.1.0 + resolution: "randombytes@npm:2.1.0" + dependencies: + safe-buffer: "npm:^5.1.0" + checksum: 10c0/50395efda7a8c94f5dffab564f9ff89736064d32addf0cc7e8bf5e4166f09f8ded7a0849ca6c2d2a59478f7d90f78f20d8048bca3cdf8be09d8e8a10790388f3 + languageName: node + linkType: hard + +"randomfill@npm:^1.0.3": + version: 1.0.4 + resolution: "randomfill@npm:1.0.4" + dependencies: + randombytes: "npm:^2.0.5" + safe-buffer: "npm:^5.1.0" + checksum: 10c0/11aeed35515872e8f8a2edec306734e6b74c39c46653607f03c68385ab8030e2adcc4215f76b5e4598e028c4750d820afd5c65202527d831d2a5f207fe2bc87c + languageName: node + linkType: hard + +"range-parser@npm:^1.2.1, range-parser@npm:~1.2.1": + version: 1.2.1 + resolution: "range-parser@npm:1.2.1" + checksum: 10c0/96c032ac2475c8027b7a4e9fe22dc0dfe0f6d90b85e496e0f016fbdb99d6d066de0112e680805075bd989905e2123b3b3d002765149294dce0c1f7f01fcc2ea0 + languageName: node + linkType: hard + +"raw-body@npm:2.4.0": + version: 2.4.0 + resolution: "raw-body@npm:2.4.0" + dependencies: + bytes: "npm:3.1.0" + http-errors: "npm:1.7.2" + iconv-lite: "npm:0.4.24" + unpipe: "npm:1.0.0" + checksum: 10c0/c7ff86d9d4a91f0d9ab3e2eb45b2197d2534e0f24fded16989085fe71207539f63100a6fd49507a5ff1907ff38511e510a3e6098102b9e8711cd84d7344a703a + languageName: node + linkType: hard + +"read-pkg@npm:^5.1.1": + version: 5.2.0 + resolution: "read-pkg@npm:5.2.0" + dependencies: + "@types/normalize-package-data": "npm:^2.4.0" + normalize-package-data: "npm:^2.5.0" + parse-json: "npm:^5.0.0" + type-fest: "npm:^0.6.0" + checksum: 10c0/b51a17d4b51418e777029e3a7694c9bd6c578a5ab99db544764a0b0f2c7c0f58f8a6bc101f86a6fceb8ba6d237d67c89acf6170f6b98695d0420ddc86cf109fb + languageName: node + linkType: hard + +"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": + version: 2.3.7 + resolution: "readable-stream@npm:2.3.7" + dependencies: + core-util-is: "npm:~1.0.0" + inherits: "npm:~2.0.3" + isarray: "npm:~1.0.0" + process-nextick-args: "npm:~2.0.0" + safe-buffer: "npm:~5.1.1" + string_decoder: "npm:~1.1.1" + util-deprecate: "npm:~1.0.1" + checksum: 10c0/1708755e6cf9daff6ff60fa5b4575636472289c5b95d38058a91f94732b8d024a940a0d4d955639195ce42c22cab16973ee8fea8deedd24b5fec3dd596465f86 + languageName: node + linkType: hard + +"readable-stream@npm:^3.0.6, readable-stream@npm:^3.6.0": + version: 3.6.0 + resolution: "readable-stream@npm:3.6.0" + dependencies: + inherits: "npm:^2.0.3" + string_decoder: "npm:^1.1.1" + util-deprecate: "npm:^1.0.1" + checksum: 10c0/937bedd29ac8a68331666291922bea892fa2be1a33269e582de9f844a2002f146cf831e39cd49fe6a378d3f0c27358f259ed0e20d20f0bdc6a3f8fc21fce42dc + languageName: node + linkType: hard + +"readdirp@npm:^2.2.1": + version: 2.2.1 + resolution: "readdirp@npm:2.2.1" + dependencies: + graceful-fs: "npm:^4.1.11" + micromatch: "npm:^3.1.10" + readable-stream: "npm:^2.0.2" + checksum: 10c0/770d177372ff2212d382d425d55ca48301fcbf3231ab3827257bbcca7ff44fb51fe4af6acc2dda8512dc7f29da390e9fbea5b2b3fc724b86e85cc828395b7797 + languageName: node + linkType: hard + +"readdirp@npm:^5.0.0": + version: 5.0.0 + resolution: "readdirp@npm:5.0.0" + checksum: 10c0/faf1ec57cff2020f473128da3f8d2a57813cc3a08a36c38cae1c9af32c1579906cc50ba75578043b35bade77e945c098233665797cf9730ba3613a62d6e79219 + languageName: node + linkType: hard + +"readdirp@npm:~3.6.0": + version: 3.6.0 + resolution: "readdirp@npm:3.6.0" + dependencies: + picomatch: "npm:^2.2.1" + checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b + languageName: node + linkType: hard + +"regenerate-unicode-properties@npm:^10.2.2": + version: 10.2.2 + resolution: "regenerate-unicode-properties@npm:10.2.2" + dependencies: + regenerate: "npm:^1.4.2" + checksum: 10c0/66a1d6a1dbacdfc49afd88f20b2319a4c33cee56d245163e4d8f5f283e0f45d1085a78f7f7406dd19ea3a5dd7a7799cd020cd817c97464a7507f9d10fbdce87c + languageName: node + linkType: hard + +"regenerate@npm:^1.4.2": + version: 1.4.2 + resolution: "regenerate@npm:1.4.2" + checksum: 10c0/f73c9eba5d398c818edc71d1c6979eaa05af7a808682749dd079f8df2a6d91a9b913db216c2c9b03e0a8ba2bba8701244a93f45211afbff691c32c7b275db1b8 + languageName: node + linkType: hard + +"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2": + version: 1.0.2 + resolution: "regex-not@npm:1.0.2" + dependencies: + extend-shallow: "npm:^3.0.2" + safe-regex: "npm:^1.1.0" + checksum: 10c0/a0f8d6045f63b22e9759db10e248369c443b41cedd7dba0922d002b66c2734bc2aef0d98c4d45772d1f756245f4c5203856b88b9624bba2a58708858a8d485d6 + languageName: node + linkType: hard + +"regexp.prototype.flags@npm:^1.2.0": + version: 1.3.1 + resolution: "regexp.prototype.flags@npm:1.3.1" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.3" + checksum: 10c0/499745fc4634e1619c050b09afe81aa1b88e0eac589543c8c78baa2e7090df313e1e8e6033bd7206ee498c2640b05593b3dfa3c603beb6ab9773277a8b7e5206 + languageName: node + linkType: hard + +"regexpp@npm:^2.0.1": + version: 2.0.1 + resolution: "regexpp@npm:2.0.1" + checksum: 10c0/4ac2cf4c68941728bffbba5a8f597a23385c2c05afc5bf5de74744ee048765ab84ea3ce3c6a5bdce102a3a54514b75b7add48b4c1abd925ca3afd40e537f2b5f + languageName: node + linkType: hard + +"regexpu-core@npm:^6.3.1": + version: 6.4.0 + resolution: "regexpu-core@npm:6.4.0" + dependencies: + regenerate: "npm:^1.4.2" + regenerate-unicode-properties: "npm:^10.2.2" + regjsgen: "npm:^0.8.0" + regjsparser: "npm:^0.13.0" + unicode-match-property-ecmascript: "npm:^2.0.0" + unicode-match-property-value-ecmascript: "npm:^2.2.1" + checksum: 10c0/1eed9783c023dd06fb1f3ce4b6e3fdf0bc1e30cb036f30aeb2019b351e5e0b74355b40462282ea5db092c79a79331c374c7e9897e44a5ca4509e9f0b570263de + languageName: node + linkType: hard + +"regjsgen@npm:^0.8.0": + version: 0.8.0 + resolution: "regjsgen@npm:0.8.0" + checksum: 10c0/44f526c4fdbf0b29286101a282189e4dbb303f4013cf3fea058668d96d113b9180d3d03d1e13f6d4cbde38b7728bf951aecd9dc199938c080093a9a6f0d7a6bd + languageName: node + linkType: hard + +"regjsparser@npm:^0.13.0": + version: 0.13.2 + resolution: "regjsparser@npm:0.13.2" + dependencies: + jsesc: "npm:~3.1.0" + bin: + regjsparser: bin/parser + checksum: 10c0/261667a3da2552619adbf331eb32b139fef6af59a88343213df2fd5635ec02eb4e7d62a5fcb3b6aecec0df84d5746d36eabfff2502fd34b8ef01b1f983779274 + languageName: node + linkType: hard + +"relateurl@npm:0.2.x": + version: 0.2.7 + resolution: "relateurl@npm:0.2.7" + checksum: 10c0/c248b4e3b32474f116a804b537fa6343d731b80056fb506dffd91e737eef4cac6be47a65aae39b522b0db9d0b1011d1a12e288d82a109ecd94a5299d82f6573a + languageName: node + linkType: hard + +"remove-trailing-separator@npm:^1.0.1": + version: 1.1.0 + resolution: "remove-trailing-separator@npm:1.1.0" + checksum: 10c0/3568f9f8f5af3737b4aee9e6e1e8ec4be65a92da9cb27f989e0893714d50aa95ed2ff02d40d1fa35e1b1a234dc9c2437050ef356704a3999feaca6667d9e9bfc + languageName: node + linkType: hard + +"renderkid@npm:^2.0.4": + version: 2.0.7 + resolution: "renderkid@npm:2.0.7" + dependencies: + css-select: "npm:^4.1.3" + dom-converter: "npm:^0.2.0" + htmlparser2: "npm:^6.1.0" + lodash: "npm:^4.17.21" + strip-ansi: "npm:^3.0.1" + checksum: 10c0/05e19c8861e0f9f3d379a175fbb52e3be3c957022acf52d19d36b23f99bb401b6bc3c493d43213f4d76efb08cb2f13e66df38c9a487249cb8dad1f6170da6a14 + languageName: node + linkType: hard + +"repeat-element@npm:^1.1.2": + version: 1.1.4 + resolution: "repeat-element@npm:1.1.4" + checksum: 10c0/81aa8d82bc845780803ef52df3533fa399974b99df571d0bb86e91f0ffca9ee4b9c4e8e5e72af087938cc28d2aef93d106a6d01da685d72ce96455b90a9f9f69 + languageName: node + linkType: hard + +"repeat-string@npm:^1.6.1": + version: 1.6.1 + resolution: "repeat-string@npm:1.6.1" + checksum: 10c0/87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d + languageName: node + linkType: hard + +"request@npm:^2.88.2": + version: 2.88.2 + resolution: "request@npm:2.88.2" + dependencies: + aws-sign2: "npm:~0.7.0" + aws4: "npm:^1.8.0" + caseless: "npm:~0.12.0" + combined-stream: "npm:~1.0.6" + extend: "npm:~3.0.2" + forever-agent: "npm:~0.6.1" + form-data: "npm:~2.3.2" + har-validator: "npm:~5.1.3" + http-signature: "npm:~1.2.0" + is-typedarray: "npm:~1.0.0" + isstream: "npm:~0.1.2" + json-stringify-safe: "npm:~5.0.1" + mime-types: "npm:~2.1.19" + oauth-sign: "npm:~0.9.0" + performance-now: "npm:^2.1.0" + qs: "npm:~6.5.2" + safe-buffer: "npm:^5.1.2" + tough-cookie: "npm:~2.5.0" + tunnel-agent: "npm:^0.6.0" + uuid: "npm:^3.3.2" + checksum: 10c0/0ec66e7af1391e51ad231de3b1c6c6aef3ebd0a238aa50d4191c7a792dcdb14920eea8d570c702dc5682f276fe569d176f9b8ebc6031a3cf4a630a691a431a63 + languageName: node + linkType: hard + +"require-directory@npm:^2.1.1": + version: 2.1.1 + resolution: "require-directory@npm:2.1.1" + checksum: 10c0/83aa76a7bc1531f68d92c75a2ca2f54f1b01463cb566cf3fbc787d0de8be30c9dbc211d1d46be3497dac5785fe296f2dd11d531945ac29730643357978966e99 + languageName: node + linkType: hard + +"require-main-filename@npm:^2.0.0": + version: 2.0.0 + resolution: "require-main-filename@npm:2.0.0" + checksum: 10c0/db91467d9ead311b4111cbd73a4e67fa7820daed2989a32f7023785a2659008c6d119752d9c4ac011ae07e537eb86523adff99804c5fdb39cd3a017f9b401bb6 + languageName: node + linkType: hard + +"requires-port@npm:^1.0.0": + version: 1.0.0 + resolution: "requires-port@npm:1.0.0" + checksum: 10c0/b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267 + languageName: node + linkType: hard + +"resolve-cwd@npm:^2.0.0": + version: 2.0.0 + resolution: "resolve-cwd@npm:2.0.0" + dependencies: + resolve-from: "npm:^3.0.0" + checksum: 10c0/10c3a7ffeb55af51206f5ca8696ed833376179399336ce8e9df8f76c044c13bccd0e9a3148708daf272193179a581ddb076e203eaa71efa0ad341b243174ca12 + languageName: node + linkType: hard + +"resolve-from@npm:^3.0.0": + version: 3.0.0 + resolution: "resolve-from@npm:3.0.0" + checksum: 10c0/24affcf8e81f4c62f0dcabc774afe0e19c1f38e34e43daac0ddb409d79435fc3037f612b0cc129178b8c220442c3babd673e88e870d27215c99454566e770ebc + languageName: node + linkType: hard + +"resolve-from@npm:^4.0.0": + version: 4.0.0 + resolution: "resolve-from@npm:4.0.0" + checksum: 10c0/8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190 + languageName: node + linkType: hard + +"resolve-url@npm:^0.2.1": + version: 0.2.1 + resolution: "resolve-url@npm:0.2.1" + checksum: 10c0/c285182cfcddea13a12af92129ce0569be27fb0074ffaefbd3ba3da2eac2acecdfc996d435c4982a9fa2b4708640e52837c9153a5ab9255886a00b0b9e8d2a54 + languageName: node + linkType: hard + +"resolve@npm:^1.10.0": + version: 1.20.0 + resolution: "resolve@npm:1.20.0" + dependencies: + is-core-module: "npm:^2.2.0" + path-parse: "npm:^1.0.6" + checksum: 10c0/d2c99e3bfbfd1f5aa4d134fa893b0157b923d6bfdc36563cb126995982ebfd0d93d901f851e4577897580f7c87d9a62d307b811422009fd3d2a8ed0571c2eabb + languageName: node + linkType: hard + +"resolve@npm:^1.22.11": + version: 1.22.12 + resolution: "resolve@npm:1.22.12" + dependencies: + es-errors: "npm:^1.3.0" + is-core-module: "npm:^2.16.1" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/b16dc9b537c02e8c3388f7d3dcff9741d3071625f9a97ac1c885f2b0ca51e78df22328fb6d6ef214dd9101fb7cfc19aa2836fe3410402a94f3f7b8639c7149bf + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin": + version: 1.20.0 + resolution: "resolve@patch:resolve@npm%3A1.20.0#optional!builtin::version=1.20.0&hash=9bd1a5" + dependencies: + is-core-module: "npm:^2.2.0" + path-parse: "npm:^1.0.6" + checksum: 10c0/8785f235b48cf4c87c3c26cb8ee19e428e70bd7b8c697e2cb0ed2b0e8dc75ee44f556713cf7bb61cb3325312c3220794557ba3d8ad5e8d3404b081c7b60ecad3 + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^1.22.11#optional!builtin": + version: 1.22.12 + resolution: "resolve@patch:resolve@npm%3A1.22.12#optional!builtin::version=1.22.12&hash=9bd1a5" + dependencies: + es-errors: "npm:^1.3.0" + is-core-module: "npm:^2.16.1" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/e12af106e16e652bd83060e8afacece4ee3dcbd0f4cf028e3d9ad178e6ced9ecb1c87ee60158b239582313902a717f8adc57a9b76ea54b1994141ba15f420c65 + languageName: node + linkType: hard + +"restore-cursor@npm:^2.0.0": + version: 2.0.0 + resolution: "restore-cursor@npm:2.0.0" + dependencies: + onetime: "npm:^2.0.0" + signal-exit: "npm:^3.0.2" + checksum: 10c0/f5b335bee06f440445e976a7031a3ef53691f9b7c4a9d42a469a0edaf8a5508158a0d561ff2b26a1f4f38783bcca2c0e5c3a44f927326f6694d5b44d7a4993e6 + languageName: node + linkType: hard + +"restore-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "restore-cursor@npm:3.1.0" + dependencies: + onetime: "npm:^5.1.0" + signal-exit: "npm:^3.0.2" + checksum: 10c0/8051a371d6aa67ff21625fa94e2357bd81ffdc96267f3fb0fc4aaf4534028343836548ef34c240ffa8c25b280ca35eb36be00b3cb2133fa4f51896d7e73c6b4f + languageName: node + linkType: hard + +"ret@npm:~0.1.10": + version: 0.1.15 + resolution: "ret@npm:0.1.15" + checksum: 10c0/01f77cad0f7ea4f955852c03d66982609893edc1240c0c964b4c9251d0f9fb6705150634060d169939b096d3b77f4c84d6b6098a5b5d340160898c8581f1f63f + languageName: node + linkType: hard + +"retry@npm:^0.12.0": + version: 0.12.0 + resolution: "retry@npm:0.12.0" + checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe + languageName: node + linkType: hard + +"rgb-regex@npm:^1.0.1": + version: 1.0.1 + resolution: "rgb-regex@npm:1.0.1" + checksum: 10c0/ab43ea8b92c1e0c6d6bc811d7fff05927ae87473f9576363ae57213b1fd10605549a5cf89c79ccb7a02dd32e1f093c79891868ef31fd92cdb5378d7b180d73f5 + languageName: node + linkType: hard + +"rgba-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "rgba-regex@npm:1.0.0" + checksum: 10c0/4296e7dd41c0edf66c18c13824b746099af642e1b52de97addb6b22051398567090cf1df20bacd1d400cfc79aee6f3a428e0def623d358844495e3630189892c + languageName: node + linkType: hard + +"rimraf@npm:2.6.3": + version: 2.6.3 + resolution: "rimraf@npm:2.6.3" + dependencies: + glob: "npm:^7.1.3" + bin: + rimraf: ./bin.js + checksum: 10c0/f1e646f8c567795f2916aef7aadf685b543da6b9a53e482bb04b07472c7eef2b476045ba1e29f401c301c66b630b22b815ab31fdd60c5e1ae6566ff523debf45 + languageName: node + linkType: hard + +"rimraf@npm:^2.5.4, rimraf@npm:^2.6.1, rimraf@npm:^2.6.3": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" + dependencies: + glob: "npm:^7.1.3" + bin: + rimraf: ./bin.js + checksum: 10c0/4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40 + languageName: node + linkType: hard + +"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1": + version: 2.0.2 + resolution: "ripemd160@npm:2.0.2" + dependencies: + hash-base: "npm:^3.0.0" + inherits: "npm:^2.0.1" + checksum: 10c0/f6f0df78817e78287c766687aed4d5accbebc308a8e7e673fb085b9977473c1f139f0c5335d353f172a915bb288098430755d2ad3c4f30612f4dd0c901cd2c3a + languageName: node + linkType: hard + +"run-async@npm:^2.4.0": + version: 2.4.1 + resolution: "run-async@npm:2.4.1" + checksum: 10c0/35a68c8f1d9664f6c7c2e153877ca1d6e4f886e5ca067c25cdd895a6891ff3a1466ee07c63d6a9be306e9619ff7d509494e6d9c129516a36b9fd82263d579ee1 + languageName: node + linkType: hard + +"run-queue@npm:^1.0.0, run-queue@npm:^1.0.3": + version: 1.0.3 + resolution: "run-queue@npm:1.0.3" + dependencies: + aproba: "npm:^1.1.1" + checksum: 10c0/4e8964279d8f160f9ffaabe82eaad11a1d4c0db596a0f2b5257ae9d2b900c7e1ffcece3e5719199436f50718e1e7f45bb4bf7a82e331a4e734d67c2588a90cbb + languageName: node + linkType: hard + +"rxjs@npm:^6.6.0": + version: 6.6.7 + resolution: "rxjs@npm:6.6.7" + dependencies: + tslib: "npm:^1.9.0" + checksum: 10c0/e556a13a9aa89395e5c9d825eabcfa325568d9c9990af720f3f29f04a888a3b854f25845c2b55875d875381abcae2d8100af9cacdc57576e7ed6be030a01d2fe + languageName: node + linkType: hard + +"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": + version: 5.1.2 + resolution: "safe-buffer@npm:5.1.2" + checksum: 10c0/780ba6b5d99cc9a40f7b951d47152297d0e260f0df01472a1b99d4889679a4b94a13d644f7dbc4f022572f09ae9005fa2fbb93bbbd83643316f365a3e9a45b21 + languageName: node + linkType: hard + +"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0": + version: 5.2.1 + resolution: "safe-buffer@npm:5.2.1" + checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3 + languageName: node + linkType: hard + +"safe-regex@npm:^1.1.0": + version: 1.1.0 + resolution: "safe-regex@npm:1.1.0" + dependencies: + ret: "npm:~0.1.10" + checksum: 10c0/547d58aa5184cbef368fd5ed5f28d20f911614748c5da6b35f53fd6626396707587251e6e3d1e3010fd3ff1212e413841b8825eaa5f317017ca62a30899af31a + languageName: node + linkType: hard + +"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": + version: 2.1.2 + resolution: "safer-buffer@npm:2.1.2" + checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4 + languageName: node + linkType: hard + +"sass-loader@npm:^10.1.1": + version: 10.5.2 + resolution: "sass-loader@npm:10.5.2" + dependencies: + klona: "npm:^2.0.4" + loader-utils: "npm:^2.0.0" + neo-async: "npm:^2.6.2" + schema-utils: "npm:^3.0.0" + semver: "npm:^7.3.2" + peerDependencies: + fibers: ">= 3.1.0" + node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 + sass: ^1.3.0 + webpack: ^4.36.0 || ^5.0.0 + peerDependenciesMeta: + fibers: + optional: true + node-sass: + optional: true + sass: + optional: true + checksum: 10c0/5ba4a83459fbb50e21d4f4b1b59baf1ddf8dd404099b6d1f2ec887c6903659e505879915030dd9efb1c6dd5fde2d515a19f418487b73d1cc59f6aad60c79bcf5 + languageName: node + linkType: hard + +"sass@npm:^1.34.1": + version: 1.104.1 + resolution: "sass@npm:1.104.1" + dependencies: + "@parcel/watcher": "npm:^2.4.1" + chokidar: "npm:^5.0.0" + immutable: "npm:^5.1.5" + source-map-js: "npm:>=0.6.2 <2.0.0" + dependenciesMeta: + "@parcel/watcher": + optional: true + bin: + sass: sass.js + checksum: 10c0/d04e1898a9470a7a5052e67cbe5fc4ec342374f6d65a75eb180a5a60d0ee1af85bb2df6d877087169c4d53e358ff0864f2343fd594dc60474ce7a6467ee41961 + languageName: node + linkType: hard + +"sax@npm:~1.2.4": + version: 1.2.4 + resolution: "sax@npm:1.2.4" + checksum: 10c0/6e9b05ff443ee5e5096ce92d31c0740a20d33002fad714ebcb8fc7a664d9ee159103ebe8f7aef0a1f7c5ecacdd01f177f510dff95611c589399baf76437d3fe3 + languageName: node + linkType: hard + +"schema-utils@npm:^1.0.0": + version: 1.0.0 + resolution: "schema-utils@npm:1.0.0" + dependencies: + ajv: "npm:^6.1.0" + ajv-errors: "npm:^1.0.0" + ajv-keywords: "npm:^3.1.0" + checksum: 10c0/670e22d7f0ff0b6f4514a4d6fb27c359101b44b7dbfd9563af201af72eb4a9ff06144020cab5f85b16e88821fd09b97cbdae6c893721c6528c8cb704124e6a2f + languageName: node + linkType: hard + +"schema-utils@npm:^2.0.0, schema-utils@npm:^2.5.0, schema-utils@npm:^2.6.5, schema-utils@npm:^2.7.0": + version: 2.7.1 + resolution: "schema-utils@npm:2.7.1" + dependencies: + "@types/json-schema": "npm:^7.0.5" + ajv: "npm:^6.12.4" + ajv-keywords: "npm:^3.5.2" + checksum: 10c0/f484f34464edd8758712d5d3ba25a306e367dac988aecaf4ce112e99baae73f33a807b5cf869240bb6648c80720b36af2d7d72be3a27faa49a2d4fc63fa3f85f + languageName: node + linkType: hard + +"schema-utils@npm:^3.0.0": + version: 3.3.0 + resolution: "schema-utils@npm:3.3.0" + dependencies: + "@types/json-schema": "npm:^7.0.8" + ajv: "npm:^6.12.5" + ajv-keywords: "npm:^3.5.2" + checksum: 10c0/fafdbde91ad8aa1316bc543d4b61e65ea86970aebbfb750bfb6d8a6c287a23e415e0e926c2498696b242f63af1aab8e585252637fabe811fd37b604351da6500 + languageName: node + linkType: hard + +"select-hose@npm:^2.0.0": + version: 2.0.0 + resolution: "select-hose@npm:2.0.0" + checksum: 10c0/01cc52edd29feddaf379efb4328aededa633f0ac43c64b11a8abd075ff34f05b0d280882c4fbcbdf1a0658202c9cd2ea8d5985174dcf9a2dac7e3a4996fa9b67 + languageName: node + linkType: hard + +"selfsigned@npm:^1.10.8": + version: 1.10.11 + resolution: "selfsigned@npm:1.10.11" + dependencies: + node-forge: "npm:^0.10.0" + checksum: 10c0/4054e22f9398efe2bde89302bbd668218d87af1042619528eb370072d6496dfa5389e6a2a2266f8b2e302effd397973432290db4cc9e9c18d44a35379d2c1538 + languageName: node + linkType: hard + +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0": + version: 5.7.1 + resolution: "semver@npm:5.7.1" + bin: + semver: ./bin/semver + checksum: 10c0/d4884f2aeca28bff35d0bd40ff0a9b2dfc4b36a883bf0ea5dc15d10d9a01bdc9041035b05f825d4b5ac8a56e490703dbf0d986d054de82cc5e9bad3f02ca6e00 + languageName: node + linkType: hard + +"semver@npm:7.0.0": + version: 7.0.0 + resolution: "semver@npm:7.0.0" + bin: + semver: bin/semver.js + checksum: 10c0/7fd341680a967a0abfd66f3a7d36ba44e52ff5d3e799e9a6cdb01a68160b64ef09be82b4af05459effeecdd836f002c2462555d2821cd890dfdfe36a0d9f56a5 + languageName: node + linkType: hard + +"semver@npm:^6.0.0, semver@npm:^6.1.0, semver@npm:^6.1.2, semver@npm:^6.3.0": + version: 6.3.0 + resolution: "semver@npm:6.3.0" + bin: + semver: ./bin/semver.js + checksum: 10c0/1f4959e15bcfbaf727e964a4920f9260141bb8805b399793160da4e7de128e42a7d1f79c1b7d5cd21a6073fba0d55feb9966f5fef3e5ccb8e1d7ead3d7527458 + languageName: node + linkType: hard + +"semver@npm:^6.3.1": + version: 6.3.1 + resolution: "semver@npm:6.3.1" + bin: + semver: bin/semver.js + checksum: 10c0/e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d + languageName: node + linkType: hard + +"semver@npm:^7.3.2": + version: 7.7.4 + resolution: "semver@npm:7.7.4" + bin: + semver: bin/semver.js + checksum: 10c0/5215ad0234e2845d4ea5bb9d836d42b03499546ddafb12075566899fc617f68794bb6f146076b6881d755de17d6c6cc73372555879ec7dce2c2feee947866ad2 + languageName: node + linkType: hard + +"semver@npm:^7.3.5": + version: 7.8.5 + resolution: "semver@npm:7.8.5" + bin: + semver: bin/semver.js + checksum: 10c0/b1f3127a5be8125a94f37188b361c212466c292c6910adce3ec106cff5dc211ccaedc4739c11bb70fda59d6fc1f040a9bca289f4e093451521a2372e5231fe0c + languageName: node + linkType: hard + +"send@npm:0.17.1": + version: 0.17.1 + resolution: "send@npm:0.17.1" + dependencies: + debug: "npm:2.6.9" + depd: "npm:~1.1.2" + destroy: "npm:~1.0.4" + encodeurl: "npm:~1.0.2" + escape-html: "npm:~1.0.3" + etag: "npm:~1.8.1" + fresh: "npm:0.5.2" + http-errors: "npm:~1.7.2" + mime: "npm:1.6.0" + ms: "npm:2.1.1" + on-finished: "npm:~2.3.0" + range-parser: "npm:~1.2.1" + statuses: "npm:~1.5.0" + checksum: 10c0/712e27d5d4f38d6097a649bbe8846a30a6f9d1995e78e1c133a7a351ec26508b0d8fb707dadb6e003f3753d3f9310667e04633522883b81300abd9978b28afd2 + languageName: node + linkType: hard + +"serialize-javascript@npm:^4.0.0": + version: 4.0.0 + resolution: "serialize-javascript@npm:4.0.0" + dependencies: + randombytes: "npm:^2.1.0" + checksum: 10c0/510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d + languageName: node + linkType: hard + +"serve-index@npm:^1.9.1": + version: 1.9.1 + resolution: "serve-index@npm:1.9.1" + dependencies: + accepts: "npm:~1.3.4" + batch: "npm:0.6.1" + debug: "npm:2.6.9" + escape-html: "npm:~1.0.3" + http-errors: "npm:~1.6.2" + mime-types: "npm:~2.1.17" + parseurl: "npm:~1.3.2" + checksum: 10c0/a666471a24196f74371edf2c3c7bcdd82adbac52f600804508754b5296c3567588bf694258b19e0cb23a567acfa20d9721bfdaed3286007b81f9741ada8a3a9c + languageName: node + linkType: hard + +"serve-static@npm:1.14.1": + version: 1.14.1 + resolution: "serve-static@npm:1.14.1" + dependencies: + encodeurl: "npm:~1.0.2" + escape-html: "npm:~1.0.3" + parseurl: "npm:~1.3.3" + send: "npm:0.17.1" + checksum: 10c0/f4ebc459bff763ae372e4148c2af13e2b813033f384cb2bc4e1c129c722fa14bfaf6e85f41c95363d49f97de7244e7961c929b2f942ddbd4c520c9610322dae5 + languageName: node + linkType: hard + +"set-blocking@npm:^2.0.0": + version: 2.0.0 + resolution: "set-blocking@npm:2.0.0" + checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454 + languageName: node + linkType: hard + +"set-value@npm:^2.0.0, set-value@npm:^2.0.1": + version: 2.0.1 + resolution: "set-value@npm:2.0.1" + dependencies: + extend-shallow: "npm:^2.0.1" + is-extendable: "npm:^0.1.1" + is-plain-object: "npm:^2.0.3" + split-string: "npm:^3.0.1" + checksum: 10c0/4c40573c4f6540456e4b38b95f570272c4cfbe1d12890ad4057886da8535047cd772dfadf5b58e2e87aa244dfb4c57e3586f6716b976fc47c5144b6b09e1811b + languageName: node + linkType: hard + +"setimmediate@npm:^1.0.4": + version: 1.0.5 + resolution: "setimmediate@npm:1.0.5" + checksum: 10c0/5bae81bfdbfbd0ce992893286d49c9693c82b1bcc00dcaaf3a09c8f428fdeacf4190c013598b81875dfac2b08a572422db7df779a99332d0fce186d15a3e4d49 + languageName: node + linkType: hard + +"setprototypeof@npm:1.1.0": + version: 1.1.0 + resolution: "setprototypeof@npm:1.1.0" + checksum: 10c0/a77b20876689c6a89c3b42f0c3596a9cae02f90fc902570cbd97198e9e8240382086c9303ad043e88cee10f61eae19f1004e51d885395a1e9bf49f9ebed12872 + languageName: node + linkType: hard + +"setprototypeof@npm:1.1.1": + version: 1.1.1 + resolution: "setprototypeof@npm:1.1.1" + checksum: 10c0/1084b783f2d77908b0a593619e1214c2118c44c7c3277f6099dd7ca8acfc056c009e5d1b2860eae5e8b0ba9bc0a978c15613ff102ccc1093bb48aa6e0ed75e2f + languageName: node + linkType: hard + +"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8": + version: 2.4.11 + resolution: "sha.js@npm:2.4.11" + dependencies: + inherits: "npm:^2.0.1" + safe-buffer: "npm:^5.0.1" + bin: + sha.js: ./bin.js + checksum: 10c0/b7a371bca8821c9cc98a0aeff67444a03d48d745cb103f17228b96793f455f0eb0a691941b89ea1e60f6359207e36081d9be193252b0f128e0daf9cfea2815a5 + languageName: node + linkType: hard + +"shebang-command@npm:^1.2.0": + version: 1.2.0 + resolution: "shebang-command@npm:1.2.0" + dependencies: + shebang-regex: "npm:^1.0.0" + checksum: 10c0/7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d + languageName: node + linkType: hard + +"shebang-command@npm:^2.0.0": + version: 2.0.0 + resolution: "shebang-command@npm:2.0.0" + dependencies: + shebang-regex: "npm:^3.0.0" + checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e + languageName: node + linkType: hard + +"shebang-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "shebang-regex@npm:1.0.0" + checksum: 10c0/9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2 + languageName: node + linkType: hard + +"shebang-regex@npm:^3.0.0": + version: 3.0.0 + resolution: "shebang-regex@npm:3.0.0" + checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690 + languageName: node + linkType: hard + +"shell-quote@npm:^1.6.1": + version: 1.7.2 + resolution: "shell-quote@npm:1.7.2" + checksum: 10c0/656aefdcdc394560ca091140a58b95e97f43d5e14bb60ff4a92556ca48841e49af6e837441e887c7890c7a86ae8542960c90e460a86799b68c53271784909edb + languageName: node + linkType: hard + +"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2": + version: 3.0.3 + resolution: "signal-exit@npm:3.0.3" + checksum: 10c0/645cf460a417158e7d7fd03fb276aa12aecc49ab61a2ea36dac1987870a454e8af476ed926c8a8713a1adfde69c5964a4ca322c87fcca2367b36e1681207cf5f + languageName: node + linkType: hard + +"simple-swizzle@npm:^0.2.2": + version: 0.2.2 + resolution: "simple-swizzle@npm:0.2.2" + dependencies: + is-arrayish: "npm:^0.3.1" + checksum: 10c0/df5e4662a8c750bdba69af4e8263c5d96fe4cd0f9fe4bdfa3cbdeb45d2e869dff640beaaeb1ef0e99db4d8d2ec92f85508c269f50c972174851bc1ae5bd64308 + languageName: node + linkType: hard + +"slash@npm:^1.0.0": + version: 1.0.0 + resolution: "slash@npm:1.0.0" + checksum: 10c0/3944659885d905480f98810542fd314f3e1006eaad25ec78227a7835a469d9ed66fc3dd90abc7377dd2e71f4b5473e8f766bd08198fdd25152a80792e9ed464c + languageName: node + linkType: hard + +"slash@npm:^2.0.0": + version: 2.0.0 + resolution: "slash@npm:2.0.0" + checksum: 10c0/f83dbd3cb62c41bb8fcbbc6bf5473f3234b97fa1d008f571710a9d3757a28c7169e1811cad1554ccb1cc531460b3d221c9a7b37f549398d9a30707f0a5af9193 + languageName: node + linkType: hard + +"slice-ansi@npm:^2.1.0": + version: 2.1.0 + resolution: "slice-ansi@npm:2.1.0" + dependencies: + ansi-styles: "npm:^3.2.0" + astral-regex: "npm:^1.0.0" + is-fullwidth-code-point: "npm:^2.0.0" + checksum: 10c0/c317b21ec9e3d3968f3d5b548cbfc2eae331f58a03f1352621020799cbe695b3611ee972726f8f32d4ca530065a5ec9c74c97fde711c1f41b4a1585876b2c191 + languageName: node + linkType: hard + +"snapdragon-node@npm:^2.0.1": + version: 2.1.1 + resolution: "snapdragon-node@npm:2.1.1" + dependencies: + define-property: "npm:^1.0.0" + isobject: "npm:^3.0.0" + snapdragon-util: "npm:^3.0.1" + checksum: 10c0/7616e6a1ca054afe3ad8defda17ebe4c73b0800d2e0efd635c44ee1b286f8ac7900517314b5330862ce99b28cd2782348ee78bae573ff0f55832ad81d9657f3f + languageName: node + linkType: hard + +"snapdragon-util@npm:^3.0.1": + version: 3.0.1 + resolution: "snapdragon-util@npm:3.0.1" + dependencies: + kind-of: "npm:^3.2.0" + checksum: 10c0/4441856d343399ba7f37f79681949d51b922e290fcc07e7bc94655a50f584befa4fb08f40c3471cd160e004660161964d8ff140cba49baa59aa6caba774240e3 + languageName: node + linkType: hard + +"snapdragon@npm:^0.8.1": + version: 0.8.2 + resolution: "snapdragon@npm:0.8.2" + dependencies: + base: "npm:^0.11.1" + debug: "npm:^2.2.0" + define-property: "npm:^0.2.5" + extend-shallow: "npm:^2.0.1" + map-cache: "npm:^0.2.2" + source-map: "npm:^0.5.6" + source-map-resolve: "npm:^0.5.0" + use: "npm:^3.1.0" + checksum: 10c0/dfdac1f73d47152d72fc07f4322da09bbddfa31c1c9c3ae7346f252f778c45afa5b03e90813332f02f04f6de8003b34a168c456f8bb719024d092f932520ffca + languageName: node + linkType: hard + +"sockjs-client@npm:^1.5.0": + version: 1.5.1 + resolution: "sockjs-client@npm:1.5.1" + dependencies: + debug: "npm:^3.2.6" + eventsource: "npm:^1.0.7" + faye-websocket: "npm:^0.11.3" + inherits: "npm:^2.0.4" + json3: "npm:^3.3.3" + url-parse: "npm:^1.5.1" + checksum: 10c0/f12a77462d64e00136279c3d8554750c3ca624f2ab6f7acc8c9c7188b5550235605e885e552a23f258f6c52e41c71f39c020b9f19d579d1e5a552c351313ebb6 + languageName: node + linkType: hard + +"sockjs@npm:^0.3.21": + version: 0.3.21 + resolution: "sockjs@npm:0.3.21" + dependencies: + faye-websocket: "npm:^0.11.3" + uuid: "npm:^3.4.0" + websocket-driver: "npm:^0.7.4" + checksum: 10c0/a0ea76a465bd9544c12874c044dd4229caaff9a37cf549d547dc3594f083887961d3a2bb476ce6e2eba847aceffb1edddb703c29072ac63eae2a80bb4a4bfeaf + languageName: node + linkType: hard + +"sort-keys@npm:^1.0.0": + version: 1.1.2 + resolution: "sort-keys@npm:1.1.2" + dependencies: + is-plain-obj: "npm:^1.0.0" + checksum: 10c0/5dd383b0299a40277051f7498c3999520138e2eb50d422962f658738341c9e82349fad4a3024d5ba1a3122688fbaf958f2a472d4c53bade55515097c2ce15420 + languageName: node + linkType: hard + +"source-list-map@npm:^2.0.0": + version: 2.0.1 + resolution: "source-list-map@npm:2.0.1" + checksum: 10c0/2e5e421b185dcd857f46c3c70e2e711a65d717b78c5f795e2e248c9d67757882ea989b80ebc08cf164eeeda5f4be8aa95d3b990225070b2daaaf3257c5958149 + languageName: node + linkType: hard + +"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.2.1": + version: 1.2.1 + resolution: "source-map-js@npm:1.2.1" + checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf + languageName: node + linkType: hard + +"source-map-resolve@npm:^0.5.0": + version: 0.5.3 + resolution: "source-map-resolve@npm:0.5.3" + dependencies: + atob: "npm:^2.1.2" + decode-uri-component: "npm:^0.2.0" + resolve-url: "npm:^0.2.1" + source-map-url: "npm:^0.4.0" + urix: "npm:^0.1.0" + checksum: 10c0/410acbe93882e058858d4c1297be61da3e1533f95f25b95903edddc1fb719654e705663644677542d1fb78a66390238fad1a57115fc958a0724cf9bb509caf57 + languageName: node + linkType: hard + +"source-map-support@npm:~0.5.12": + version: 0.5.19 + resolution: "source-map-support@npm:0.5.19" + dependencies: + buffer-from: "npm:^1.0.0" + source-map: "npm:^0.6.0" + checksum: 10c0/a232cb02dc5c2c048460dff3ca1a4c2aa44488822028932daff99b8707c8e4f87d2535dae319d65691c905096f2c06a2517793472634efb01f8a095661b9aa93 + languageName: node + linkType: hard + +"source-map-url@npm:^0.4.0": + version: 0.4.1 + resolution: "source-map-url@npm:0.4.1" + checksum: 10c0/f8af0678500d536c7f643e32094d6718a4070ab4ca2d2326532512cfbe2d5d25a45849b4b385879326f2d7523bb3b686d0360dd347a3cda09fd89a5c28d4bc58 + languageName: node + linkType: hard + +"source-map@npm:^0.5.6": + version: 0.5.7 + resolution: "source-map@npm:0.5.7" + checksum: 10c0/904e767bb9c494929be013017380cbba013637da1b28e5943b566031e29df04fba57edf3f093e0914be094648b577372bd8ad247fa98cfba9c600794cd16b599 + languageName: node + linkType: hard + +"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1": + version: 0.6.1 + resolution: "source-map@npm:0.6.1" + checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011 + languageName: node + linkType: hard + +"source-map@npm:^0.7.3": + version: 0.7.3 + resolution: "source-map@npm:0.7.3" + checksum: 10c0/7d2ddb51f3d2451847692a9ac7808da2b2b3bf7aef92ece33128919040a7e74d9a5edfde7a781f035c974deff876afaf83f2e30484faffffb86484e7408f5d7c + languageName: node + linkType: hard + +"spdx-correct@npm:^3.0.0": + version: 3.1.1 + resolution: "spdx-correct@npm:3.1.1" + dependencies: + spdx-expression-parse: "npm:^3.0.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10c0/25909eecc4024963a8e398399dbdd59ddb925bd7dbecd9c9cf6df0d75c29b68cd30b82123564acc51810eb02cfc4b634a2e16e88aa982433306012e318849249 + languageName: node + linkType: hard + +"spdx-exceptions@npm:^2.1.0": + version: 2.3.0 + resolution: "spdx-exceptions@npm:2.3.0" + checksum: 10c0/83089e77d2a91cb6805a5c910a2bedb9e50799da091f532c2ba4150efdef6e53f121523d3e2dc2573a340dc0189e648b03157097f65465b3a0c06da1f18d7e8a + languageName: node + linkType: hard + +"spdx-expression-parse@npm:^3.0.0": + version: 3.0.1 + resolution: "spdx-expression-parse@npm:3.0.1" + dependencies: + spdx-exceptions: "npm:^2.1.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10c0/6f8a41c87759fa184a58713b86c6a8b028250f158159f1d03ed9d1b6ee4d9eefdc74181c8ddc581a341aa971c3e7b79e30b59c23b05d2436d5de1c30bdef7171 + languageName: node + linkType: hard + +"spdx-license-ids@npm:^3.0.0": + version: 3.0.9 + resolution: "spdx-license-ids@npm:3.0.9" + checksum: 10c0/44914745592a2afcbe776c2291324e3dee129b47217454da5f8f71b023345a42684f45b11d06a55d8ec900ce05ad95b8a26f9ef13eb1bb644013700bd98093ca + languageName: node + linkType: hard + +"spdy-transport@npm:^3.0.0": + version: 3.0.0 + resolution: "spdy-transport@npm:3.0.0" + dependencies: + debug: "npm:^4.1.0" + detect-node: "npm:^2.0.4" + hpack.js: "npm:^2.1.6" + obuf: "npm:^1.1.2" + readable-stream: "npm:^3.0.6" + wbuf: "npm:^1.7.3" + checksum: 10c0/eaf7440fa90724fffc813c386d4a8a7427d967d6e46d7c51d8f8a533d1a6911b9823ea9218703debbae755337e85f110185d7a00ae22ec5c847077b908ce71bb + languageName: node + linkType: hard + +"spdy@npm:^4.0.2": + version: 4.0.2 + resolution: "spdy@npm:4.0.2" + dependencies: + debug: "npm:^4.1.0" + handle-thing: "npm:^2.0.0" + http-deceiver: "npm:^1.2.7" + select-hose: "npm:^2.0.0" + spdy-transport: "npm:^3.0.0" + checksum: 10c0/983509c0be9d06fd00bb9dff713c5b5d35d3ffd720db869acdd5ad7aa6fc0e02c2318b58f75328957d8ff772acdf1f7d19382b6047df342044ff3e2d6805ccdf + languageName: node + linkType: hard + +"split-string@npm:^3.0.1, split-string@npm:^3.0.2": + version: 3.1.0 + resolution: "split-string@npm:3.1.0" + dependencies: + extend-shallow: "npm:^3.0.0" + checksum: 10c0/72d7cd625445c7af215130e1e2bc183013bb9dd48a074eda1d35741e2b0dcb355e6df5b5558a62543a24dcec37dd1d6eb7a6228ff510d3c9de0f3dc1d1da8a70 + languageName: node + linkType: hard + +"sprintf-js@npm:~1.0.2": + version: 1.0.3 + resolution: "sprintf-js@npm:1.0.3" + checksum: 10c0/ecadcfe4c771890140da5023d43e190b7566d9cf8b2d238600f31bec0fc653f328da4450eb04bd59a431771a8e9cc0e118f0aa3974b683a4981b4e07abc2a5bb + languageName: node + linkType: hard + +"sshpk@npm:^1.7.0": + version: 1.16.1 + resolution: "sshpk@npm:1.16.1" + dependencies: + asn1: "npm:~0.2.3" + assert-plus: "npm:^1.0.0" + bcrypt-pbkdf: "npm:^1.0.0" + dashdash: "npm:^1.12.0" + ecc-jsbn: "npm:~0.1.1" + getpass: "npm:^0.1.1" + jsbn: "npm:~0.1.0" + safer-buffer: "npm:^2.0.2" + tweetnacl: "npm:~0.14.0" + bin: + sshpk-conv: bin/sshpk-conv + sshpk-sign: bin/sshpk-sign + sshpk-verify: bin/sshpk-verify + checksum: 10c0/0fd664954f6c9dd07d77076e26c15de4ede5ea4457df86119c0c67d28b53d7a97647431e198869ebaf680cf8d292db2114a28d4c30841125e50c0de37a4b89bf + languageName: node + linkType: hard + +"ssri@npm:^6.0.1": + version: 6.0.2 + resolution: "ssri@npm:6.0.2" + dependencies: + figgy-pudding: "npm:^3.5.1" + checksum: 10c0/e6f18c57dc9fed69343db5c59f95ef334e9664bfbdbad686c190ef2c6ad6b35e9b56cb203f3e4eb7eee6cb7bb602daa26dab6685e3847f0b5c464cdf7d9c2cee + languageName: node + linkType: hard + +"ssri@npm:^8.0.1": + version: 8.0.1 + resolution: "ssri@npm:8.0.1" + dependencies: + minipass: "npm:^3.1.1" + checksum: 10c0/5cfae216ae02dcd154d1bbed2d0a60038a4b3a2fcaac3c7e47401ff4e058e551ee74cfdba618871bf168cd583db7b8324f94af6747d4303b73cd4c3f6dc5c9c2 + languageName: node + linkType: hard + +"stable@npm:^0.1.8": + version: 0.1.8 + resolution: "stable@npm:0.1.8" + checksum: 10c0/df74b5883075076e78f8e365e4068ecd977af6c09da510cfc3148a303d4b87bc9aa8f7c48feb67ed4ef970b6140bd9eabba2129e28024aa88df5ea0114cba39d + languageName: node + linkType: hard + +"stackframe@npm:^1.3.4": + version: 1.3.4 + resolution: "stackframe@npm:1.3.4" + checksum: 10c0/18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989 + languageName: node + linkType: hard + +"static-extend@npm:^0.1.1": + version: 0.1.2 + resolution: "static-extend@npm:0.1.2" + dependencies: + define-property: "npm:^0.2.5" + object-copy: "npm:^0.1.0" + checksum: 10c0/284f5865a9e19d079f1badbcd70d5f9f82e7a08393f818a220839cd5f71729e89105e1c95322bd28e833161d484cee671380ca443869ae89578eef2bf55c0653 + languageName: node + linkType: hard + +"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": + version: 1.5.0 + resolution: "statuses@npm:1.5.0" + checksum: 10c0/e433900956357b3efd79b1c547da4d291799ac836960c016d10a98f6a810b1b5c0dcc13b5a7aa609a58239b5190e1ea176ad9221c2157d2fd1c747393e6b2940 + languageName: node + linkType: hard + +"stream-browserify@npm:^2.0.1": + version: 2.0.2 + resolution: "stream-browserify@npm:2.0.2" + dependencies: + inherits: "npm:~2.0.1" + readable-stream: "npm:^2.0.2" + checksum: 10c0/485562bd5d962d633ae178449029c6fa2611052e356bdb5668f768544aa4daa94c4f9a97de718f3f30ad98f3cb98a5f396252bb3855aff153c138f79c0e8f6ac + languageName: node + linkType: hard + +"stream-each@npm:^1.1.0": + version: 1.2.3 + resolution: "stream-each@npm:1.2.3" + dependencies: + end-of-stream: "npm:^1.1.0" + stream-shift: "npm:^1.0.0" + checksum: 10c0/7ed229d3b7c24373058b5742b00066da8d3122d1487c8219a025ed53a8978545c77654a529a8e9c62ba83ae80c424cbb0204776b49abf72270d2e8154831dd5f + languageName: node + linkType: hard + +"stream-http@npm:^2.7.2": + version: 2.8.3 + resolution: "stream-http@npm:2.8.3" + dependencies: + builtin-status-codes: "npm:^3.0.0" + inherits: "npm:^2.0.1" + readable-stream: "npm:^2.3.6" + to-arraybuffer: "npm:^1.0.0" + xtend: "npm:^4.0.0" + checksum: 10c0/fbe7d327a29216bbabe88d3819bb8f7a502f11eeacf3212579e5af1f76fa7283f6ffa66134ab7d80928070051f571d1029e85f65ce3369fffd4c4df3669446c4 + languageName: node + linkType: hard + +"stream-shift@npm:^1.0.0": + version: 1.0.1 + resolution: "stream-shift@npm:1.0.1" + checksum: 10c0/b63a0d178cde34b920ad93e2c0c9395b840f408d36803b07c61416edac80ef9e480a51910e0ceea0d679cec90921bcd2cccab020d3a9fa6c73a98b0fbec132fd + languageName: node + linkType: hard + +"strict-uri-encode@npm:^1.0.0": + version: 1.1.0 + resolution: "strict-uri-encode@npm:1.1.0" + checksum: 10c0/eb8a4109ba2588239787389313ba58ec49e043d4c64a1d44716defe5821a68ae49abe0cdefed9946ca9fc2a4af7ecf321da92422b0a67258ec0a3638b053ae62 + languageName: node + linkType: hard + +"string-width@npm:^3.0.0, string-width@npm:^3.1.0": + version: 3.1.0 + resolution: "string-width@npm:3.1.0" + dependencies: + emoji-regex: "npm:^7.0.1" + is-fullwidth-code-point: "npm:^2.0.0" + strip-ansi: "npm:^5.1.0" + checksum: 10c0/85fa0d4f106e7999bb68c1c640c76fa69fb8c069dab75b009e29c123914e2d3b532e6cfa4b9d1bd913176fc83dedd7a2d7bf40d21a81a8a1978432cedfb65b91 + languageName: node + linkType: hard + +"string-width@npm:^4.1.0, string-width@npm:^4.2.0": + version: 4.2.2 + resolution: "string-width@npm:4.2.2" + dependencies: + emoji-regex: "npm:^8.0.0" + is-fullwidth-code-point: "npm:^3.0.0" + strip-ansi: "npm:^6.0.0" + checksum: 10c0/3874075d5b9c29f4260a338bf3d8152f266a8e6cf27538fd5c89f9dee0a5148d602df5c07c1308707b8a20029aac7842aebb6f861a84e24e79b3d97531894c23 + languageName: node + linkType: hard + +"string-width@npm:^4.2.3": + version: 4.2.3 + resolution: "string-width@npm:4.2.3" + dependencies: + emoji-regex: "npm:^8.0.0" + is-fullwidth-code-point: "npm:^3.0.0" + strip-ansi: "npm:^6.0.1" + checksum: 10c0/1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b + languageName: node + linkType: hard + +"string.prototype.trimend@npm:^1.0.4": + version: 1.0.4 + resolution: "string.prototype.trimend@npm:1.0.4" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.3" + checksum: 10c0/9fca11ab237f31cf55736e3e987deb312dd8e1bea7515e0f62949f1494f714083089a432ad5d99ea83f690a9290f58d0ce3d3f3356f5717e4c349d7d1b642af7 + languageName: node + linkType: hard + +"string.prototype.trimstart@npm:^1.0.4": + version: 1.0.4 + resolution: "string.prototype.trimstart@npm:1.0.4" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.3" + checksum: 10c0/4e4f836f9416c3db176587ab4e9b62f45b11489ab93c2b14e796c82a4f1c912278f31a4793cc00c2bee11002e56c964e9f131b8f78d96ffbd89822a11bd786fe + languageName: node + linkType: hard + +"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1": + version: 1.3.0 + resolution: "string_decoder@npm:1.3.0" + dependencies: + safe-buffer: "npm:~5.2.0" + checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d + languageName: node + linkType: hard + +"string_decoder@npm:~1.1.1": + version: 1.1.1 + resolution: "string_decoder@npm:1.1.1" + dependencies: + safe-buffer: "npm:~5.1.0" + checksum: 10c0/b4f89f3a92fd101b5653ca3c99550e07bdf9e13b35037e9e2a1c7b47cec4e55e06ff3fc468e314a0b5e80bfbaf65c1ca5a84978764884ae9413bec1fc6ca924e + languageName: node + linkType: hard + +"strip-ansi@npm:^3.0.1": + version: 3.0.1 + resolution: "strip-ansi@npm:3.0.1" + dependencies: + ansi-regex: "npm:^2.0.0" + checksum: 10c0/f6e7fbe8e700105dccf7102eae20e4f03477537c74b286fd22cfc970f139002ed6f0d9c10d0e21aa9ed9245e0fa3c9275930e8795c5b947da136e4ecb644a70f + languageName: node + linkType: hard + +"strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0": + version: 5.2.0 + resolution: "strip-ansi@npm:5.2.0" + dependencies: + ansi-regex: "npm:^4.1.0" + checksum: 10c0/de4658c8a097ce3b15955bc6008f67c0790f85748bdc025b7bc8c52c7aee94bc4f9e50624516150ed173c3db72d851826cd57e7a85fe4e4bb6dbbebd5d297fdf + languageName: node + linkType: hard + +"strip-ansi@npm:^6.0.0": + version: 6.0.0 + resolution: "strip-ansi@npm:6.0.0" + dependencies: + ansi-regex: "npm:^5.0.0" + checksum: 10c0/85257c80250541cc0e65088c7dc768563bdbd1bf7120471d6d3a73cdc60e8149a50038c12a6fd4a30b674587f306ae42e2cc73ac3095daf193633daa0bd8f928 + languageName: node + linkType: hard + +"strip-ansi@npm:^6.0.1": + version: 6.0.1 + resolution: "strip-ansi@npm:6.0.1" + dependencies: + ansi-regex: "npm:^5.0.1" + checksum: 10c0/1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952 + languageName: node + linkType: hard + +"strip-eof@npm:^1.0.0": + version: 1.0.0 + resolution: "strip-eof@npm:1.0.0" + checksum: 10c0/f336beed8622f7c1dd02f2cbd8422da9208fae81daf184f73656332899978919d5c0ca84dc6cfc49ad1fc4dd7badcde5412a063cf4e0d7f8ed95a13a63f68f45 + languageName: node + linkType: hard + +"strip-final-newline@npm:^2.0.0": + version: 2.0.0 + resolution: "strip-final-newline@npm:2.0.0" + checksum: 10c0/bddf8ccd47acd85c0e09ad7375409d81653f645fda13227a9d459642277c253d877b68f2e5e4d819fe75733b0e626bac7e954c04f3236f6d196f79c94fa4a96f + languageName: node + linkType: hard + +"strip-indent@npm:^2.0.0": + version: 2.0.0 + resolution: "strip-indent@npm:2.0.0" + checksum: 10c0/d88dbef5d2aaa3eb622a9011151b2543b886c581366003ad2bd8c168b419dfbf83f28dcb8962b670ab71a818895d998479b0eac08fba99ee0267b600d11bd764 + languageName: node + linkType: hard + +"strip-json-comments@npm:^3.0.1": + version: 3.1.1 + resolution: "strip-json-comments@npm:3.1.1" + checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd + languageName: node + linkType: hard + +"stylehacks@npm:^4.0.0": + version: 4.0.3 + resolution: "stylehacks@npm:4.0.3" + dependencies: + browserslist: "npm:^4.0.0" + postcss: "npm:^7.0.0" + postcss-selector-parser: "npm:^3.0.0" + checksum: 10c0/d063adba9018dbf765f80bd4fa5136dfabd5d9bb7b3654a4990c633c539e0f38e758fc9d16c12876afbcec1dd6534d9e9178aa0a3e183345ff034eae9605d35b + languageName: node + linkType: hard + +"supports-color@npm:^5.3.0": + version: 5.5.0 + resolution: "supports-color@npm:5.5.0" + dependencies: + has-flag: "npm:^3.0.0" + checksum: 10c0/6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05 + languageName: node + linkType: hard + +"supports-color@npm:^6.1.0": + version: 6.1.0 + resolution: "supports-color@npm:6.1.0" + dependencies: + has-flag: "npm:^3.0.0" + checksum: 10c0/ebf2befe41b55932c6d77192b91775f1403c389440ce2dab6f72663cf32ee87a1d9dea3512131a18e45ccac91424a8873b266142828489d0206d65ee93d224b6 + languageName: node + linkType: hard + +"supports-color@npm:^7.1.0": + version: 7.2.0 + resolution: "supports-color@npm:7.2.0" + dependencies: + has-flag: "npm:^4.0.0" + checksum: 10c0/afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124 + languageName: node + linkType: hard + +"supports-preserve-symlinks-flag@npm:^1.0.0": + version: 1.0.0 + resolution: "supports-preserve-symlinks-flag@npm:1.0.0" + checksum: 10c0/6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39 + languageName: node + linkType: hard + +"svg-tags@npm:^1.0.0": + version: 1.0.0 + resolution: "svg-tags@npm:1.0.0" + checksum: 10c0/5867e29e8f431bf7aecf5a244d1af5725f80a1086187dbc78f26d8433b5e96b8fe9361aeb10d1699ff483b9afec785a10916b9312fe9d734d1a7afd48226c954 + languageName: node + linkType: hard + +"svgo@npm:^1.0.0": + version: 1.3.2 + resolution: "svgo@npm:1.3.2" + dependencies: + chalk: "npm:^2.4.1" + coa: "npm:^2.0.2" + css-select: "npm:^2.0.0" + css-select-base-adapter: "npm:^0.1.1" + css-tree: "npm:1.0.0-alpha.37" + csso: "npm:^4.0.2" + js-yaml: "npm:^3.13.1" + mkdirp: "npm:~0.5.1" + object.values: "npm:^1.1.0" + sax: "npm:~1.2.4" + stable: "npm:^0.1.8" + unquote: "npm:~1.1.1" + util.promisify: "npm:~1.0.0" + bin: + svgo: ./bin/svgo + checksum: 10c0/261a82b08acf63accd7a54b47b4ffcd2fc7e7d7f8efef3cbc61184583b24b4c5434656004c30190302821af0f6d7b047eac730b0dcdab5d179e6a74383ccc776 + languageName: node + linkType: hard + +"table@npm:^5.2.3": + version: 5.4.6 + resolution: "table@npm:5.4.6" + dependencies: + ajv: "npm:^6.10.2" + lodash: "npm:^4.17.14" + slice-ansi: "npm:^2.1.0" + string-width: "npm:^3.0.0" + checksum: 10c0/87ad7b7cc926aa06e0e2a91a0fb4fcb8b365da87969bc5c74b54cae5d518a089245f44bf80f945ec1aa74c405782db15eeb1dd1926315d842cdc9dbb9371672e + languageName: node + linkType: hard + +"tapable@npm:^1.0.0, tapable@npm:^1.1.3": + version: 1.1.3 + resolution: "tapable@npm:1.1.3" + checksum: 10c0/c9f0265e55e45821ec672b9b9ee8a35d95bf3ea6b352199f8606a2799018e89cfe4433c554d424b31fc67c4be26b05d4f36dc3c607def416fdb2514cd63dba50 + languageName: node + linkType: hard + +"tar@npm:^7.5.4": + version: 7.5.19 + resolution: "tar@npm:7.5.19" + dependencies: + "@isaacs/fs-minipass": "npm:^4.0.0" + chownr: "npm:^3.0.0" + minipass: "npm:^7.1.2" + minizlib: "npm:^3.1.0" + yallist: "npm:^5.0.0" + checksum: 10c0/7022e8cb04a8ceccc0689f2c731743fa2aab2e3c3f559f7dbc37b65ef7d5913049b427284eded2ec0765c5db5ff72dd7939fe2ae15785ff422cef2116c95d798 + languageName: node + linkType: hard + +"terser-webpack-plugin@npm:^1.4.3, terser-webpack-plugin@npm:^1.4.4": + version: 1.4.5 + resolution: "terser-webpack-plugin@npm:1.4.5" + dependencies: + cacache: "npm:^12.0.2" + find-cache-dir: "npm:^2.1.0" + is-wsl: "npm:^1.1.0" + schema-utils: "npm:^1.0.0" + serialize-javascript: "npm:^4.0.0" + source-map: "npm:^0.6.1" + terser: "npm:^4.1.2" + webpack-sources: "npm:^1.4.0" + worker-farm: "npm:^1.7.0" + peerDependencies: + webpack: ^4.0.0 + checksum: 10c0/97164cfa383cf988832427e912cd9606471452f15f8bfb905ae51f1a42561f90ea541141e1e530e59f8307639fed7dfdbd626aec8390acd6ad80e58ea3fcf6df + languageName: node + linkType: hard + +"terser@npm:^4.1.2": + version: 4.8.0 + resolution: "terser@npm:4.8.0" + dependencies: + commander: "npm:^2.20.0" + source-map: "npm:~0.6.1" + source-map-support: "npm:~0.5.12" + bin: + terser: bin/terser + checksum: 10c0/5dbe6684ecfba94b20c556d0774e8ac05265509bf9fe7e05ed306ac839f7de33e72b9238a4a35d274f340330358d0cff88b543545ae7433f0e2a05ddf61159f1 + languageName: node + linkType: hard + +"text-table@npm:^0.2.0": + version: 0.2.0 + resolution: "text-table@npm:0.2.0" + checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c + languageName: node + linkType: hard + +"thenify-all@npm:^1.0.0": + version: 1.6.0 + resolution: "thenify-all@npm:1.6.0" + dependencies: + thenify: "npm:>= 3.1.0 < 4" + checksum: 10c0/9b896a22735e8122754fe70f1d65f7ee691c1d70b1f116fda04fea103d0f9b356e3676cb789506e3909ae0486a79a476e4914b0f92472c2e093d206aed4b7d6b + languageName: node + linkType: hard + +"thenify@npm:>= 3.1.0 < 4": + version: 3.3.1 + resolution: "thenify@npm:3.3.1" + dependencies: + any-promise: "npm:^1.0.0" + checksum: 10c0/f375aeb2b05c100a456a30bc3ed07ef03a39cbdefe02e0403fb714b8c7e57eeaad1a2f5c4ecfb9ce554ce3db9c2b024eba144843cd9e344566d9fcee73b04767 + languageName: node + linkType: hard + +"thread-loader@npm:^2.1.3": + version: 2.1.3 + resolution: "thread-loader@npm:2.1.3" + dependencies: + loader-runner: "npm:^2.3.1" + loader-utils: "npm:^1.1.0" + neo-async: "npm:^2.6.0" + peerDependencies: + webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 + checksum: 10c0/41c8a67e04d2036212fbc5b61d58e5b18865322fa343a23cbf20fe208a09b27f9c3f3f935b4762ddb19e9cc31dccaa81cffa23518e7221b9c89b0a4d831fc5b6 + languageName: node + linkType: hard + +"through2@npm:^2.0.0": + version: 2.0.5 + resolution: "through2@npm:2.0.5" + dependencies: + readable-stream: "npm:~2.3.6" + xtend: "npm:~4.0.1" + checksum: 10c0/cbfe5b57943fa12b4f8c043658c2a00476216d79c014895cef1ac7a1d9a8b31f6b438d0e53eecbb81054b93128324a82ecd59ec1a4f91f01f7ac113dcb14eade + languageName: node + linkType: hard + +"through@npm:^2.3.6": + version: 2.3.8 + resolution: "through@npm:2.3.8" + checksum: 10c0/4b09f3774099de0d4df26d95c5821a62faee32c7e96fb1f4ebd54a2d7c11c57fe88b0a0d49cf375de5fee5ae6bf4eb56dbbf29d07366864e2ee805349970d3cc + languageName: node + linkType: hard + +"thunky@npm:^1.0.2": + version: 1.1.0 + resolution: "thunky@npm:1.1.0" + checksum: 10c0/369764f39de1ce1de2ba2fa922db4a3f92e9c7f33bcc9a713241bc1f4a5238b484c17e0d36d1d533c625efb00e9e82c3e45f80b47586945557b45abb890156d2 + languageName: node + linkType: hard + +"timers-browserify@npm:^2.0.4": + version: 2.0.12 + resolution: "timers-browserify@npm:2.0.12" + dependencies: + setimmediate: "npm:^1.0.4" + checksum: 10c0/98e84db1a685bc8827c117a8bc62aac811ad56a995d07938fc7ed8cdc5bf3777bfe2d4e5da868847194e771aac3749a20f6cdd22091300fe889a76fe214a4641 + languageName: node + linkType: hard + +"timsort@npm:^0.3.0": + version: 0.3.0 + resolution: "timsort@npm:0.3.0" + checksum: 10c0/571b2054a0db3cf80eb255f8609a1f798cae9176f9ec6e3fbd03d64186c015cc9e1e75b88ba38e1d71aebcc03a931352522c7387dcb90caeb148375c7bc106f4 + languageName: node + linkType: hard + +"tinyglobby@npm:^0.2.12": + version: 0.2.17 + resolution: "tinyglobby@npm:0.2.17" + dependencies: + fdir: "npm:^6.5.0" + picomatch: "npm:^4.0.4" + checksum: 10c0/7f7bb0f197c88bc4b20c231e0deca4240ca3bf313a88f5a7fee93a872b84966a4d50220947c0455ad07a60b3b360961c5b7fd979222aeb716a9f99b412002e4c + languageName: node + linkType: hard + +"tmp@npm:^0.0.33": + version: 0.0.33 + resolution: "tmp@npm:0.0.33" + dependencies: + os-tmpdir: "npm:~1.0.2" + checksum: 10c0/69863947b8c29cabad43fe0ce65cec5bb4b481d15d4b4b21e036b060b3edbf3bc7a5541de1bacb437bb3f7c4538f669752627fdf9b4aaf034cebd172ba373408 + languageName: node + linkType: hard + +"to-arraybuffer@npm:^1.0.0": + version: 1.0.1 + resolution: "to-arraybuffer@npm:1.0.1" + checksum: 10c0/2460bd95524f4845a751e4f8bf9937f9f3dcd1651f104e1512868782f858f8302c1cf25bbc30794bc1b3ff65c4e135158377302f2abaff43a2d8e3c38dfe098c + languageName: node + linkType: hard + +"to-object-path@npm:^0.3.0": + version: 0.3.0 + resolution: "to-object-path@npm:0.3.0" + dependencies: + kind-of: "npm:^3.0.2" + checksum: 10c0/731832a977614c03a770363ad2bd9e9c82f233261861724a8e612bb90c705b94b1a290a19f52958e8e179180bb9b71121ed65e245691a421467726f06d1d7fc3 + languageName: node + linkType: hard + +"to-regex-range@npm:^2.1.0": + version: 2.1.1 + resolution: "to-regex-range@npm:2.1.1" + dependencies: + is-number: "npm:^3.0.0" + repeat-string: "npm:^1.6.1" + checksum: 10c0/440d82dbfe0b2e24f36dd8a9467240406ad1499fc8b2b0f547372c22ed1d092ace2a3eb522bb09bfd9c2f39bf1ca42eb78035cf6d2b8c9f5c78da3abc96cd949 + languageName: node + linkType: hard + +"to-regex-range@npm:^5.0.1": + version: 5.0.1 + resolution: "to-regex-range@npm:5.0.1" + dependencies: + is-number: "npm:^7.0.0" + checksum: 10c0/487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892 + languageName: node + linkType: hard + +"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2": + version: 3.0.2 + resolution: "to-regex@npm:3.0.2" + dependencies: + define-property: "npm:^2.0.2" + extend-shallow: "npm:^3.0.2" + regex-not: "npm:^1.0.2" + safe-regex: "npm:^1.1.0" + checksum: 10c0/99d0b8ef397b3f7abed4bac757b0f0bb9f52bfd39167eb7105b144becfaa9a03756892352d01ac6a911f0c1ceef9f81db68c46899521a3eed054082042796120 + languageName: node + linkType: hard + +"toidentifier@npm:1.0.0": + version: 1.0.0 + resolution: "toidentifier@npm:1.0.0" + checksum: 10c0/27a37b8b21126e7216d40c02f410065b1de35b0f844368d0ccaabba7987595703006d45e5c094b086220cbbc5864d4b99766b460110e4bc15b9db574c5c58be2 + languageName: node + linkType: hard + +"toposort@npm:^1.0.0": + version: 1.0.7 + resolution: "toposort@npm:1.0.7" + checksum: 10c0/a9ddfacf64edae723520bb866c98f00ebf7d9aa45185a3f5b517c30678d22029a444348ca260fbf199ac99bd0bdc3abc21e220775406b90e78bb8a1bb30de875 + languageName: node + linkType: hard + +"tough-cookie@npm:~2.5.0": + version: 2.5.0 + resolution: "tough-cookie@npm:2.5.0" + dependencies: + psl: "npm:^1.1.28" + punycode: "npm:^2.1.1" + checksum: 10c0/e1cadfb24d40d64ca16de05fa8192bc097b66aeeb2704199b055ff12f450e4f30c927ce250f53d01f39baad18e1c11d66f65e545c5c6269de4c366fafa4c0543 + languageName: node + linkType: hard + +"tryer@npm:^1.0.1": + version: 1.0.1 + resolution: "tryer@npm:1.0.1" + checksum: 10c0/19070409a0009dc26127636cc14d2415e9cf8b1dc07b29694e57ea8bb5ea1bded012c0e792f6235b46e31189a7b866841668b3850867ff7eac1a6b55332c960d + languageName: node + linkType: hard + +"ts-pnp@npm:^1.1.6": + version: 1.2.0 + resolution: "ts-pnp@npm:1.2.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/ff32b4f810f9d99f676d70fe2c0e327cb6c812214bd4fc7135870b039f9e85a85b2c20f8fe030d9bd36e9598a12faa391f10aecb95df624b92f1af6bd47dc397 + languageName: node + linkType: hard + +"tslib@npm:^1.9.0": + version: 1.14.1 + resolution: "tslib@npm:1.14.1" + checksum: 10c0/69ae09c49eea644bc5ebe1bca4fa4cc2c82b7b3e02f43b84bd891504edf66dbc6b2ec0eef31a957042de2269139e4acff911e6d186a258fb14069cd7f6febce2 + languageName: node + linkType: hard + +"tty-browserify@npm:0.0.0": + version: 0.0.0 + resolution: "tty-browserify@npm:0.0.0" + checksum: 10c0/c0c68206565f1372e924d5cdeeff1a0d9cc729833f1da98c03d78be8f939e5f61a107bd0ab77d1ef6a47d62bb0e48b1081fbea273acf404959e22fd3891439c5 + languageName: node + linkType: hard + +"tunnel-agent@npm:^0.6.0": + version: 0.6.0 + resolution: "tunnel-agent@npm:0.6.0" + dependencies: + safe-buffer: "npm:^5.0.1" + checksum: 10c0/4c7a1b813e7beae66fdbf567a65ec6d46313643753d0beefb3c7973d66fcec3a1e7f39759f0a0b4465883499c6dc8b0750ab8b287399af2e583823e40410a17a + languageName: node + linkType: hard + +"tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0": + version: 0.14.5 + resolution: "tweetnacl@npm:0.14.5" + checksum: 10c0/4612772653512c7bc19e61923fbf42903f5e0389ec76a4a1f17195859d114671ea4aa3b734c2029ce7e1fa7e5cc8b80580f67b071ecf0b46b5636d030a0102a2 + languageName: node + linkType: hard + +"type-check@npm:~0.3.2": + version: 0.3.2 + resolution: "type-check@npm:0.3.2" + dependencies: + prelude-ls: "npm:~1.1.2" + checksum: 10c0/776217116b2b4e50e368c7ee0c22c0a85e982881c16965b90d52f216bc296d6a52ef74f9202d22158caacc092a7645b0b8d5fe529a96e3fe35d0fb393966c875 + languageName: node + linkType: hard + +"type-fest@npm:^0.21.3": + version: 0.21.3 + resolution: "type-fest@npm:0.21.3" + checksum: 10c0/902bd57bfa30d51d4779b641c2bc403cdf1371fb9c91d3c058b0133694fcfdb817aef07a47f40faf79039eecbaa39ee9d3c532deff244f3a19ce68cea71a61e8 + languageName: node + linkType: hard + +"type-fest@npm:^0.6.0": + version: 0.6.0 + resolution: "type-fest@npm:0.6.0" + checksum: 10c0/0c585c26416fce9ecb5691873a1301b5aff54673c7999b6f925691ed01f5b9232db408cdbb0bd003d19f5ae284322523f44092d1f81ca0a48f11f7cf0be8cd38 + languageName: node + linkType: hard + +"type-fest@npm:^0.8.1": + version: 0.8.1 + resolution: "type-fest@npm:0.8.1" + checksum: 10c0/dffbb99329da2aa840f506d376c863bd55f5636f4741ad6e65e82f5ce47e6914108f44f340a0b74009b0cb5d09d6752ae83203e53e98b1192cf80ecee5651636 + languageName: node + linkType: hard + +"type-is@npm:~1.6.17, type-is@npm:~1.6.18": + version: 1.6.18 + resolution: "type-is@npm:1.6.18" + dependencies: + media-typer: "npm:0.3.0" + mime-types: "npm:~2.1.24" + checksum: 10c0/a23daeb538591b7efbd61ecf06b6feb2501b683ffdc9a19c74ef5baba362b4347e42f1b4ed81f5882a8c96a3bfff7f93ce3ffaf0cbbc879b532b04c97a55db9d + languageName: node + linkType: hard + +"typedarray@npm:^0.0.6": + version: 0.0.6 + resolution: "typedarray@npm:0.0.6" + checksum: 10c0/6005cb31df50eef8b1f3c780eb71a17925f3038a100d82f9406ac2ad1de5eb59f8e6decbdc145b3a1f8e5836e17b0c0002fb698b9fe2516b8f9f9ff602d36412 + languageName: node + linkType: hard + +"uglify-js@npm:3.4.x": + version: 3.4.10 + resolution: "uglify-js@npm:3.4.10" + dependencies: + commander: "npm:~2.19.0" + source-map: "npm:~0.6.1" + bin: + uglifyjs: bin/uglifyjs + checksum: 10c0/54021f980d6a4a9ad808be3d4d8a7bf52c009c16d4c54c60ed9142490b337b627e5d6616edea93b682f5eb5dced057b185345cc0110425e81e54bc92e535acdd + languageName: node + linkType: hard + +"ui@workspace:.": + version: 0.0.0-use.local + resolution: "ui@workspace:." + dependencies: + "@babel/eslint-parser": "npm:^7.11.0" + "@carbon/icons-vue": "npm:^10.37.0" + "@carbon/vue": "npm:^2.40.0" + "@nethserver/ns8-ui-lib": "npm:^2.0.0" + "@vue/cli-plugin-babel": "npm:~4.5.18" + "@vue/cli-plugin-eslint": "npm:~4.5.18" + "@vue/cli-plugin-router": "npm:~4.5.18" + "@vue/cli-plugin-vuex": "npm:~4.5.18" + "@vue/cli-service": "npm:~4.5.18" + "@vue/eslint-config-prettier": "npm:^6.0.0" + await-to-js: "npm:^3.0.0" + axios: "npm:^1.18.1" + carbon-components: "npm:^10.41.0" + core-js: "npm:^3.6.5" + eslint: "npm:^6.7.2" + eslint-plugin-prettier: "npm:^3.3.1" + eslint-plugin-vue: "npm:^6.2.2" + lottie-web-vue: "npm:^1.2.0" + prettier: "npm:^2.2.1" + sass: "npm:^1.34.1" + sass-loader: "npm:^10.1.1" + vue: "npm:^2.7.0" + vue-axios: "npm:^3.2.4" + vue-date-fns: "npm:^2.0.1" + vue-debounce: "npm:^4.0.0" + vue-i18n: "npm:^8.24.4" + vue-loader: "npm:^15.10.0" + vue-router: "npm:^3.2.0" + vuex: "npm:^3.4.0" + languageName: unknown + linkType: soft + +"unbox-primitive@npm:^1.0.1": + version: 1.0.1 + resolution: "unbox-primitive@npm:1.0.1" + dependencies: + function-bind: "npm:^1.1.1" + has-bigints: "npm:^1.0.1" + has-symbols: "npm:^1.0.2" + which-boxed-primitive: "npm:^1.0.2" + checksum: 10c0/6f0b91b0744c6f9fd05afa70484914b70686596be628543a143fab018733f902ff39fad2c3cf8f00fd5d32ba8bce8edf9cf61cee940c1af892316e112b25812b + languageName: node + linkType: hard + +"undici-types@npm:~8.3.0": + version: 8.3.0 + resolution: "undici-types@npm:8.3.0" + checksum: 10c0/c8aa7e2fbebfce519654dafadc0ece59be888d2ccaf180fb4495da875e7b536d2456345c384069c7e6f3e9c9ab7435f074957da306f142343eee86ff8048855a + languageName: node + linkType: hard + +"undici@npm:^6.25.0": + version: 6.27.0 + resolution: "undici@npm:6.27.0" + checksum: 10c0/f88c3dae3957dbf9d93cb481440aced317bd3c4941b5914fea5efba516d51138988cdb5c76006f0bb1337e41d56c3443351055d492e73af2428521c37ba2a76f + languageName: node + linkType: hard + +"unicode-canonical-property-names-ecmascript@npm:^2.0.0": + version: 2.0.1 + resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.1" + checksum: 10c0/f83bc492fdbe662860795ef37a85910944df7310cac91bd778f1c19ebc911e8b9cde84e703de631e5a2fcca3905e39896f8fc5fc6a44ddaf7f4aff1cda24f381 + languageName: node + linkType: hard + +"unicode-match-property-ecmascript@npm:^2.0.0": + version: 2.0.0 + resolution: "unicode-match-property-ecmascript@npm:2.0.0" + dependencies: + unicode-canonical-property-names-ecmascript: "npm:^2.0.0" + unicode-property-aliases-ecmascript: "npm:^2.0.0" + checksum: 10c0/4d05252cecaf5c8e36d78dc5332e03b334c6242faf7cf16b3658525441386c0a03b5f603d42cbec0f09bb63b9fd25c9b3b09667aee75463cac3efadae2cd17ec + languageName: node + linkType: hard + +"unicode-match-property-value-ecmascript@npm:^2.2.1": + version: 2.2.1 + resolution: "unicode-match-property-value-ecmascript@npm:2.2.1" + checksum: 10c0/93acd1ad9496b600e5379d1aaca154cf551c5d6d4a0aefaf0984fc2e6288e99220adbeb82c935cde461457fb6af0264a1774b8dfd4d9a9e31548df3352a4194d + languageName: node + linkType: hard + +"unicode-property-aliases-ecmascript@npm:^2.0.0": + version: 2.2.0 + resolution: "unicode-property-aliases-ecmascript@npm:2.2.0" + checksum: 10c0/b338529831c988ac696f2bdbcd4579d1c5cc844b24eda7269973c457fa81989bdb49a366af37a448eb1a60f1dae89559ea2a5854db2797e972a0162eee0778c6 + languageName: node + linkType: hard + +"union-value@npm:^1.0.0": + version: 1.0.1 + resolution: "union-value@npm:1.0.1" + dependencies: + arr-union: "npm:^3.1.0" + get-value: "npm:^2.0.6" + is-extendable: "npm:^0.1.1" + set-value: "npm:^2.0.1" + checksum: 10c0/8758d880cb9545f62ce9cfb9b791b2b7a206e0ff5cc4b9d7cd6581da2c6839837fbb45e639cf1fd8eef3cae08c0201b614b7c06dd9f5f70d9dbe7c5fe2fbf592 + languageName: node + linkType: hard + +"uniq@npm:^1.0.1": + version: 1.0.1 + resolution: "uniq@npm:1.0.1" + checksum: 10c0/369dca4a07fdd8de9e48378b9d4b6861722ca71d5f496e91687916bd4b48b8cf3d6db1677be1b40eea63bc6d4728efb4b4e0bd7a89c5fd2d23e7a2cff8009c7a + languageName: node + linkType: hard + +"uniqs@npm:^2.0.0": + version: 2.0.0 + resolution: "uniqs@npm:2.0.0" + checksum: 10c0/f244b158f6b3d30ddea2092c581fe9eb746d6db889a859fd0001e4b7566767bfcc53cdf11e6286f097bb130ebad71025709f41f2e4dd38e5c2f03ec28052baab + languageName: node + linkType: hard + +"unique-filename@npm:^1.1.1": + version: 1.1.1 + resolution: "unique-filename@npm:1.1.1" + dependencies: + unique-slug: "npm:^2.0.0" + checksum: 10c0/d005bdfaae6894da8407c4de2b52f38b3c58ec86e79fc2ee19939da3085374413b073478ec54e721dc8e32b102cf9e50d0481b8331abdc62202e774b789ea874 + languageName: node + linkType: hard + +"unique-slug@npm:^2.0.0": + version: 2.0.2 + resolution: "unique-slug@npm:2.0.2" + dependencies: + imurmurhash: "npm:^0.1.4" + checksum: 10c0/9eabc51680cf0b8b197811a48857e41f1364b25362300c1ff636c0eca5ec543a92a38786f59cf0697e62c6f814b11ecbe64e8093db71246468a1f03b80c83970 + languageName: node + linkType: hard + +"universalify@npm:^0.1.0": + version: 0.1.2 + resolution: "universalify@npm:0.1.2" + checksum: 10c0/e70e0339f6b36f34c9816f6bf9662372bd241714dc77508d231d08386d94f2c4aa1ba1318614f92015f40d45aae1b9075cd30bd490efbe39387b60a76ca3f045 + languageName: node + linkType: hard + +"unpipe@npm:1.0.0, unpipe@npm:~1.0.0": + version: 1.0.0 + resolution: "unpipe@npm:1.0.0" + checksum: 10c0/193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c + languageName: node + linkType: hard + +"unquote@npm:~1.1.1": + version: 1.1.1 + resolution: "unquote@npm:1.1.1" + checksum: 10c0/de59fb48cbaadc636002c6563dcb6b1bce95c91ebecb92addbc9bb47982cb03e7d8a8371c9617267b9e5746bbcb4403394139bc1310106b9ac4c26790ed57859 + languageName: node + linkType: hard + +"unset-value@npm:^1.0.0": + version: 1.0.0 + resolution: "unset-value@npm:1.0.0" + dependencies: + has-value: "npm:^0.3.1" + isobject: "npm:^3.0.0" + checksum: 10c0/68a796dde4a373afdbf017de64f08490a3573ebee549136da0b3a2245299e7f65f647ef70dc13c4ac7f47b12fba4de1646fa0967a365638578fedce02b9c0b1f + languageName: node + linkType: hard + +"upath@npm:^1.1.1": + version: 1.2.0 + resolution: "upath@npm:1.2.0" + checksum: 10c0/3746f24099bf69dbf8234cecb671e1016e1f6b26bd306de4ff8966fb0bc463fa1014ffc48646b375de1ab573660e3a0256f6f2a87218b2dfa1779a84ef6992fa + languageName: node + linkType: hard + +"update-browserslist-db@npm:^1.2.3": + version: 1.2.3 + resolution: "update-browserslist-db@npm:1.2.3" + dependencies: + escalade: "npm:^3.2.0" + picocolors: "npm:^1.1.1" + peerDependencies: + browserslist: ">= 4.21.0" + bin: + update-browserslist-db: cli.js + checksum: 10c0/13a00355ea822388f68af57410ce3255941d5fb9b7c49342c4709a07c9f230bbef7f7499ae0ca7e0de532e79a82cc0c4edbd125f1a323a1845bf914efddf8bec + languageName: node + linkType: hard + +"upper-case@npm:^1.1.1": + version: 1.1.3 + resolution: "upper-case@npm:1.1.3" + checksum: 10c0/3e4d3a90519915bb591db84d72610392518806d8287b8f7541d87642d30388f42b2def1ed2f687e5792ee025e8f7e17d3a0dcbd5b3b59e306ceb1f3b8121ef54 + languageName: node + linkType: hard + +"uri-js@npm:^4.2.2": + version: 4.4.1 + resolution: "uri-js@npm:4.4.1" + dependencies: + punycode: "npm:^2.1.0" + checksum: 10c0/4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c + languageName: node + linkType: hard + +"urix@npm:^0.1.0": + version: 0.1.0 + resolution: "urix@npm:0.1.0" + checksum: 10c0/264f1b29360c33c0aec5fb9819d7e28f15d1a3b83175d2bcc9131efe8583f459f07364957ae3527f1478659ec5b2d0f1ad401dfb625f73e4d424b3ae35fc5fc0 + languageName: node + linkType: hard + +"url-loader@npm:^2.2.0": + version: 2.3.0 + resolution: "url-loader@npm:2.3.0" + dependencies: + loader-utils: "npm:^1.2.3" + mime: "npm:^2.4.4" + schema-utils: "npm:^2.5.0" + peerDependencies: + file-loader: "*" + webpack: ^4.0.0 + peerDependenciesMeta: + file-loader: + optional: true + checksum: 10c0/2169e98b8834802f1395477a449561efb34fb47a1275458175273a89c7c9db51c169e21537d421eb8dcab6f22c368d8287935e13bb4b13b49e1b2e5ac098d936 + languageName: node + linkType: hard + +"url-parse@npm:^1.4.3, url-parse@npm:^1.5.1": + version: 1.5.3 + resolution: "url-parse@npm:1.5.3" + dependencies: + querystringify: "npm:^2.1.1" + requires-port: "npm:^1.0.0" + checksum: 10c0/b1a5f236f5eb1a2d0f0939acea8229e5eb0618b6eeaae3e1d08536d61c79547c18c313905eee5ac5376297f966b0297ed2157103c991d838ef4d235d2c5958b5 + languageName: node + linkType: hard + +"url@npm:^0.11.0": + version: 0.11.0 + resolution: "url@npm:0.11.0" + dependencies: + punycode: "npm:1.3.2" + querystring: "npm:0.2.0" + checksum: 10c0/bbe05f9f570ec5c06421c50ca63f287e61279092eed0891db69a9619323703ccd3987e6eed234c468794cf25680c599680d5c1f58d26090f1956c8e9ed8346a2 + languageName: node + linkType: hard + +"use@npm:^3.1.0": + version: 3.1.1 + resolution: "use@npm:3.1.1" + checksum: 10c0/75b48673ab80d5139c76922630d5a8a44e72ed58dbaf54dee1b88352d10e1c1c1fc332066c782d8ae9a56503b85d3dc67ff6d2ffbd9821120466d1280ebb6d6e + languageName: node + linkType: hard + +"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1": + version: 1.0.2 + resolution: "util-deprecate@npm:1.0.2" + checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942 + languageName: node + linkType: hard + +"util.promisify@npm:1.0.0": + version: 1.0.0 + resolution: "util.promisify@npm:1.0.0" + dependencies: + define-properties: "npm:^1.1.2" + object.getownpropertydescriptors: "npm:^2.0.3" + checksum: 10c0/af9df9d111b1464586e4fa414ccf6de61c3a14c0664a66a497438a0507d47f65389f5e025c048ef7e2bf6dba73e95adc3d0c56111a0952ae0282817fc4dd83b2 + languageName: node + linkType: hard + +"util.promisify@npm:~1.0.0": + version: 1.0.1 + resolution: "util.promisify@npm:1.0.1" + dependencies: + define-properties: "npm:^1.1.3" + es-abstract: "npm:^1.17.2" + has-symbols: "npm:^1.0.1" + object.getownpropertydescriptors: "npm:^2.1.0" + checksum: 10c0/d72b7c1344816bc9c8713efbf5cb23b536730a8fb7df9ae50654d9efa4d24241fc5ecc69a7dc63b9a2f98cabc9635c303923671933f8c6f41fa7d64fe2188e27 + languageName: node + linkType: hard + +"util@npm:0.10.3": + version: 0.10.3 + resolution: "util@npm:0.10.3" + dependencies: + inherits: "npm:2.0.1" + checksum: 10c0/88bb58fec3b1f5f43dea27795f61f24b3b505bbba6f3ad6e91b32db0cd0928b2acb54ebe21603a75743c6e21a52f954cd2ffb6cddafed5a01169dd1287db3ff3 + languageName: node + linkType: hard + +"util@npm:^0.11.0": + version: 0.11.1 + resolution: "util@npm:0.11.1" + dependencies: + inherits: "npm:2.0.3" + checksum: 10c0/8e9d1a85e661c8a8d9883d821aedbff3f8d9c3accd85357020905386ada5653b20389fc3591901e2a0bde64f8dc86b28c3f990114aa5a38eaaf30b455fa3cdf6 + languageName: node + linkType: hard + +"utila@npm:~0.4": + version: 0.4.0 + resolution: "utila@npm:0.4.0" + checksum: 10c0/2791604e09ca4f77ae314df83e80d1805f867eb5c7e13e7413caee01273c278cf2c9a3670d8d25c889a877f7b149d892fe61b0181a81654b425e9622ab23d42e + languageName: node + linkType: hard + +"utils-merge@npm:1.0.1": + version: 1.0.1 + resolution: "utils-merge@npm:1.0.1" + checksum: 10c0/02ba649de1b7ca8854bfe20a82f1dfbdda3fb57a22ab4a8972a63a34553cf7aa51bc9081cf7e001b035b88186d23689d69e71b510e610a09a4c66f68aa95b672 + languageName: node + linkType: hard + +"uuid@npm:^3.3.2, uuid@npm:^3.4.0": + version: 3.4.0 + resolution: "uuid@npm:3.4.0" + bin: + uuid: ./bin/uuid + checksum: 10c0/1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347 + languageName: node + linkType: hard + +"v8-compile-cache@npm:^2.0.3": + version: 2.3.0 + resolution: "v8-compile-cache@npm:2.3.0" + checksum: 10c0/b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688 + languageName: node + linkType: hard + +"validate-npm-package-license@npm:^3.0.1": + version: 3.0.4 + resolution: "validate-npm-package-license@npm:3.0.4" + dependencies: + spdx-correct: "npm:^3.0.0" + spdx-expression-parse: "npm:^3.0.0" + checksum: 10c0/7b91e455a8de9a0beaa9fe961e536b677da7f48c9a493edf4d4d4a87fd80a7a10267d438723364e432c2fcd00b5650b5378275cded362383ef570276e6312f4f + languageName: node + linkType: hard + +"vary@npm:~1.1.2": + version: 1.1.2 + resolution: "vary@npm:1.1.2" + checksum: 10c0/f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f + languageName: node + linkType: hard + +"vendors@npm:^1.0.0": + version: 1.0.4 + resolution: "vendors@npm:1.0.4" + checksum: 10c0/a9b097f3607013a23bf447cbaff85b79b694cc23b20e81a6aea1ea9e1c59854c93f7c87abcc71b57999e050606e499d9ce18df67968823644b20f6e03d56022a + languageName: node + linkType: hard + +"verror@npm:1.10.0": + version: 1.10.0 + resolution: "verror@npm:1.10.0" + dependencies: + assert-plus: "npm:^1.0.0" + core-util-is: "npm:1.0.2" + extsprintf: "npm:^1.2.0" + checksum: 10c0/37ccdf8542b5863c525128908ac80f2b476eed36a32cb944de930ca1e2e78584cc435c4b9b4c68d0fc13a47b45ff364b4be43aa74f8804f9050140f660fb660d + languageName: node + linkType: hard + +"vm-browserify@npm:^1.0.1": + version: 1.1.2 + resolution: "vm-browserify@npm:1.1.2" + checksum: 10c0/0cc1af6e0d880deb58bc974921320c187f9e0a94f25570fca6b1bd64e798ce454ab87dfd797551b1b0cc1849307421aae0193cedf5f06bdb5680476780ee344b + languageName: node + linkType: hard + +"vue-axios@npm:^3.2.4": + version: 3.6.0 + resolution: "vue-axios@npm:3.6.0" + peerDependencies: + axios: "*" + vue: ^3.0.0 || ^2.0.0 + checksum: 10c0/88b00d526fc18896bf1f2fdbcffcd3383bbf10be2d326c90d80c1cb87d936ab0a758a953e43a485ce8d928315bc742b46bda80f6b846d921be275f92716be311 + languageName: node + linkType: hard + +"vue-date-fns@npm:^2.0.1": + version: 2.0.2 + resolution: "vue-date-fns@npm:2.0.2" + dependencies: + date-fns: "npm:^2.0.0" + checksum: 10c0/c3a70d0df25e8c45de71e9f10bc1d076485ebf6b8598ebc42d2e7125369cde2f7f49347dbe237fbae034b97da6195556c146948f0099c08ebad4b640ff01e85e + languageName: node + linkType: hard + +"vue-debounce@npm:^4.0.0": + version: 4.0.1 + resolution: "vue-debounce@npm:4.0.1" + peerDependencies: + vue: ">= 2.0.0" + checksum: 10c0/d27fb67ca583e20875760bed59223cec116ecbbd41605448f541f8262f10c8e9445c09755bc41759ebe0a7bf67bd5d6e79613f9cb3685bb36e7174472a027246 + languageName: node + linkType: hard + +"vue-eslint-parser@npm:^7.0.0": + version: 7.8.0 + resolution: "vue-eslint-parser@npm:7.8.0" + dependencies: + debug: "npm:^4.1.1" + eslint-scope: "npm:^5.1.1" + eslint-visitor-keys: "npm:^1.1.0" + espree: "npm:^6.2.1" + esquery: "npm:^1.4.0" + lodash: "npm:^4.17.21" + semver: "npm:^6.3.0" + peerDependencies: + eslint: ">=5.0.0" + checksum: 10c0/89d83a6a25a613d75b65504f856026741a348613066993c97fc8a4a6ecfd9e031c066be067fcf5c644a4d242a69f87b3af176e78b0b4f06d9521d015a2fd15ec + languageName: node + linkType: hard + +"vue-hot-reload-api@npm:^2.3.0": + version: 2.3.4 + resolution: "vue-hot-reload-api@npm:2.3.4" + checksum: 10c0/6501a93582c2bba0f17564d1c61b4301e844e14fbac1cb7c3d726c40961375aefa89f2cc4ee8289c3663e12d108c28a5872ba35cfa7f091d1bcaa39feff9ac60 + languageName: node + linkType: hard + +"vue-i18n@npm:^8.24.4": + version: 8.28.2 + resolution: "vue-i18n@npm:8.28.2" + checksum: 10c0/6e76958f30d2be85fc8ebe8f1463301791f4cd7bf716a81058b219ef2764bb8e1c6ed5099a2ed205a2157e32d2dbea47ffe3e6a3ff4612cf9cfe4bad2efe7e84 + languageName: node + linkType: hard + +"vue-loader-v16@npm:vue-loader@^16.1.0": + version: 16.8.3 + resolution: "vue-loader@npm:16.8.3" + dependencies: + chalk: "npm:^4.1.0" + hash-sum: "npm:^2.0.0" + loader-utils: "npm:^2.0.0" + peerDependencies: + webpack: ^4.1.0 || ^5.0.0-0 + checksum: 10c0/db793259b61bc719e4501b7682f1d7039f2f60408acb0b6c1deae73853fea74bfb603315fe410b3a63a3261c08122e657f106a06ddf4b1a4d919f34a5c0684a0 + languageName: node + linkType: hard + +"vue-loader@npm:^15.10.0, vue-loader@npm:^15.9.2": + version: 15.11.1 + resolution: "vue-loader@npm:15.11.1" + dependencies: + "@vue/component-compiler-utils": "npm:^3.1.0" + hash-sum: "npm:^1.0.2" + loader-utils: "npm:^1.1.0" + vue-hot-reload-api: "npm:^2.3.0" + vue-style-loader: "npm:^4.1.0" + peerDependencies: + css-loader: "*" + webpack: ^3.0.0 || ^4.1.0 || ^5.0.0-0 + peerDependenciesMeta: + cache-loader: + optional: true + prettier: + optional: true + vue-template-compiler: + optional: true + checksum: 10c0/22491414f3743d485cf8d966837314706abf35d330bf055e356d55f16df8d4ab21fb712c7168509f7492d62cdf799aedf8d31df36d89bd5a4479b9f90fa094c1 + languageName: node + linkType: hard + +"vue-router@npm:^3.2.0": + version: 3.6.5 + resolution: "vue-router@npm:3.6.5" + checksum: 10c0/f1c81854a7bb943fe78ad1516acc948fffbf71646ee4d568c52c0c680dd4763152d1c317ac240a5066bc24682700b4698bd135d54c2fc7d8cb21d068a99e50ac + languageName: node + linkType: hard + +"vue-style-loader@npm:^4.1.0, vue-style-loader@npm:^4.1.2": + version: 4.1.3 + resolution: "vue-style-loader@npm:4.1.3" + dependencies: + hash-sum: "npm:^1.0.2" + loader-utils: "npm:^1.0.2" + checksum: 10c0/871362711561c817c6b96650cf4bcf422c51d46808650da7e6ec39499d76445d08a1f9f1d1aa0f6cffb191cd128fbd77b6e233d9689a87c21d7e546689bed04c + languageName: node + linkType: hard + +"vue-template-es2015-compiler@npm:^1.9.0": + version: 1.9.1 + resolution: "vue-template-es2015-compiler@npm:1.9.1" + checksum: 10c0/21d27d1c6afe10a47f17793e18afb7f321888d3ca728bfdb2a79ff49789ed9b40e98abcb68b5499f3da1bbb76a0f188b94aeb5ab0e879f46d6399ac5d4ae38c8 + languageName: node + linkType: hard + +"vue@npm:^2.7.0, vue@npm:^2.7.10": + version: 2.7.16 + resolution: "vue@npm:2.7.16" + dependencies: + "@vue/compiler-sfc": "npm:2.7.16" + csstype: "npm:^3.1.0" + checksum: 10c0/15bf536c131a863d03c42386a4bbc82316262129421ef70e88d1758bcf951446ef51edeff42e3b27d026015330fe73d90155fca270eb5eadd30b0290735f2c3e + languageName: node + linkType: hard + +"vuex@npm:^3.4.0": + version: 3.6.2 + resolution: "vuex@npm:3.6.2" + peerDependencies: + vue: ^2.0.0 + checksum: 10c0/726f2ff4ecf070bd4c65e98bf31910c3b57a83218be5623a35a57849075ce16ec117fc9f37cc905f9515200ad5e5a6976bdb075a5a701f9fe5c4364d5a72fc71 + languageName: node + linkType: hard + +"warning@npm:^3.0.0": + version: 3.0.0 + resolution: "warning@npm:3.0.0" + dependencies: + loose-envify: "npm:^1.0.0" + checksum: 10c0/6a2a56ab3139d3927193d926a027e74e1449fa47cc692feea95f8a81a4bb5b7f10c312def94cce03f3b58cb26ba3247858e75d17d596451d2c483a62e8204705 + languageName: node + linkType: hard + +"watchpack-chokidar2@npm:^2.0.1": + version: 2.0.1 + resolution: "watchpack-chokidar2@npm:2.0.1" + dependencies: + chokidar: "npm:^2.1.8" + checksum: 10c0/9b8d880ae2543dd4f26a69f6b7f881119494f6b772b7431027a06a5cf963e0ebc1cac91a3ef479365c358b693c65fa80a1f8297427fa11fd4c080c3d6408c372 + languageName: node + linkType: hard + +"watchpack@npm:^1.7.4": + version: 1.7.5 + resolution: "watchpack@npm:1.7.5" + dependencies: + chokidar: "npm:^3.4.1" + graceful-fs: "npm:^4.1.2" + neo-async: "npm:^2.5.0" + watchpack-chokidar2: "npm:^2.0.1" + dependenciesMeta: + chokidar: + optional: true + watchpack-chokidar2: + optional: true + checksum: 10c0/53e3b112064f5de9edbb2a14973fb3901d9697b24cc70f8531a143eaace2353a273ca25c0ba21def8d3803cfedb8f6861ca1e49e9782257e40d5b5f8f5365c86 + languageName: node + linkType: hard + +"wbuf@npm:^1.1.0, wbuf@npm:^1.7.3": + version: 1.7.3 + resolution: "wbuf@npm:1.7.3" + dependencies: + minimalistic-assert: "npm:^1.0.0" + checksum: 10c0/56edcc5ef2b3d30913ba8f1f5cccc364d180670b24d5f3f8849c1e6fb514e5c7e3a87548ae61227a82859eba6269c11393ae24ce12a2ea1ecb9b465718ddced7 + languageName: node + linkType: hard + +"wcwidth@npm:^1.0.1": + version: 1.0.1 + resolution: "wcwidth@npm:1.0.1" + dependencies: + defaults: "npm:^1.0.3" + checksum: 10c0/5b61ca583a95e2dd85d7078400190efd452e05751a64accb8c06ce4db65d7e0b0cde9917d705e826a2e05cc2548f61efde115ffa374c3e436d04be45c889e5b4 + languageName: node + linkType: hard + +"webpack-bundle-analyzer@npm:^3.8.0": + version: 3.9.0 + resolution: "webpack-bundle-analyzer@npm:3.9.0" + dependencies: + acorn: "npm:^7.1.1" + acorn-walk: "npm:^7.1.1" + bfj: "npm:^6.1.1" + chalk: "npm:^2.4.1" + commander: "npm:^2.18.0" + ejs: "npm:^2.6.1" + express: "npm:^4.16.3" + filesize: "npm:^3.6.1" + gzip-size: "npm:^5.0.0" + lodash: "npm:^4.17.19" + mkdirp: "npm:^0.5.1" + opener: "npm:^1.5.1" + ws: "npm:^6.0.0" + bin: + webpack-bundle-analyzer: lib/bin/analyzer.js + checksum: 10c0/442b2e0740ad12c0a1887dcd294cc89c776bfc01301194ea5dd73ab26a7045dd3efee4eca27e4ebdf887729e20f600fe56430e42104dce6abcc4d6ca8f5c3e00 + languageName: node + linkType: hard + +"webpack-chain@npm:^6.4.0": + version: 6.5.1 + resolution: "webpack-chain@npm:6.5.1" + dependencies: + deepmerge: "npm:^1.5.2" + javascript-stringify: "npm:^2.0.1" + checksum: 10c0/a652bad8b8982c80461bc30f1822ac3a2ed7f1070a631d49751ee90c3d7e66bbc90da1e56f07df98aa57ffb47dab6bcd1b6c570d8ef0dca79a97a379e6e68146 + languageName: node + linkType: hard + +"webpack-dev-middleware@npm:^3.7.2": + version: 3.7.3 + resolution: "webpack-dev-middleware@npm:3.7.3" + dependencies: + memory-fs: "npm:^0.4.1" + mime: "npm:^2.4.4" + mkdirp: "npm:^0.5.1" + range-parser: "npm:^1.2.1" + webpack-log: "npm:^2.0.0" + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: 10c0/f9bd8318c6f356d006dc99e3e46ef8870d67640e43f26cfcd2bb36c9e7eaf64015513f43498e92b532896f7fbd8f32c0710d4489fc81d7a45ea328d7e4cf3085 + languageName: node + linkType: hard + +"webpack-dev-server@npm:^3.11.0": + version: 3.11.2 + resolution: "webpack-dev-server@npm:3.11.2" + dependencies: + ansi-html: "npm:0.0.7" + bonjour: "npm:^3.5.0" + chokidar: "npm:^2.1.8" + compression: "npm:^1.7.4" + connect-history-api-fallback: "npm:^1.6.0" + debug: "npm:^4.1.1" + del: "npm:^4.1.1" + express: "npm:^4.17.1" + html-entities: "npm:^1.3.1" + http-proxy-middleware: "npm:0.19.1" + import-local: "npm:^2.0.0" + internal-ip: "npm:^4.3.0" + ip: "npm:^1.1.5" + is-absolute-url: "npm:^3.0.3" + killable: "npm:^1.0.1" + loglevel: "npm:^1.6.8" + opn: "npm:^5.5.0" + p-retry: "npm:^3.0.1" + portfinder: "npm:^1.0.26" + schema-utils: "npm:^1.0.0" + selfsigned: "npm:^1.10.8" + semver: "npm:^6.3.0" + serve-index: "npm:^1.9.1" + sockjs: "npm:^0.3.21" + sockjs-client: "npm:^1.5.0" + spdy: "npm:^4.0.2" + strip-ansi: "npm:^3.0.1" + supports-color: "npm:^6.1.0" + url: "npm:^0.11.0" + webpack-dev-middleware: "npm:^3.7.2" + webpack-log: "npm:^2.0.0" + ws: "npm:^6.2.1" + yargs: "npm:^13.3.2" + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack-dev-server: bin/webpack-dev-server.js + checksum: 10c0/ee307572fad37ce1088c295c591dfb33287effb914593b51702974e606672e6a100b8cf410f9cf31caf8879c52594c80e0f376e637f4918b148657effda58f60 + languageName: node + linkType: hard + +"webpack-log@npm:^2.0.0": + version: 2.0.0 + resolution: "webpack-log@npm:2.0.0" + dependencies: + ansi-colors: "npm:^3.0.0" + uuid: "npm:^3.3.2" + checksum: 10c0/515b800433da1c0b5722317baaeb05fc185da5a1fde5e39d25bed0b05c13ee3a544aa13844db8590696274a3c5dc04fd5abdd39f38f8c46a4084b74ff0dc9c60 + languageName: node + linkType: hard + +"webpack-merge@npm:^4.2.2": + version: 4.2.2 + resolution: "webpack-merge@npm:4.2.2" + dependencies: + lodash: "npm:^4.17.15" + checksum: 10c0/283cb4ffe4d4ae6de23d595154868780126835ded241748da0b070c6cca6974c229493ac0b6b7160c2c92950c950c8e5edf036a192da78e32e22a9c81593ad16 + languageName: node + linkType: hard + +"webpack-sources@npm:^1.1.0, webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1": + version: 1.4.3 + resolution: "webpack-sources@npm:1.4.3" + dependencies: + source-list-map: "npm:^2.0.0" + source-map: "npm:~0.6.1" + checksum: 10c0/78dafb3e1e297d3f4eb6204311e8c64d28cd028f82887ba33aaf03fffc82482d8e1fdf6de25a60f4dde621d3565f4c3b1bfb350f09add8f4e54e00279ff3db5e + languageName: node + linkType: hard + +"webpack@npm:^4.0.0": + version: 4.46.0 + resolution: "webpack@npm:4.46.0" + dependencies: + "@webassemblyjs/ast": "npm:1.9.0" + "@webassemblyjs/helper-module-context": "npm:1.9.0" + "@webassemblyjs/wasm-edit": "npm:1.9.0" + "@webassemblyjs/wasm-parser": "npm:1.9.0" + acorn: "npm:^6.4.1" + ajv: "npm:^6.10.2" + ajv-keywords: "npm:^3.4.1" + chrome-trace-event: "npm:^1.0.2" + enhanced-resolve: "npm:^4.5.0" + eslint-scope: "npm:^4.0.3" + json-parse-better-errors: "npm:^1.0.2" + loader-runner: "npm:^2.4.0" + loader-utils: "npm:^1.2.3" + memory-fs: "npm:^0.4.1" + micromatch: "npm:^3.1.10" + mkdirp: "npm:^0.5.3" + neo-async: "npm:^2.6.1" + node-libs-browser: "npm:^2.2.1" + schema-utils: "npm:^1.0.0" + tapable: "npm:^1.1.3" + terser-webpack-plugin: "npm:^1.4.3" + watchpack: "npm:^1.7.4" + webpack-sources: "npm:^1.4.1" + peerDependenciesMeta: + webpack-cli: + optional: true + webpack-command: + optional: true + bin: + webpack: bin/webpack.js + checksum: 10c0/3451b48b926d7c295a4eba65bb7ff9a7d2d49a848014ea0945f446ebf4c1ca5bdd15681b444f5dfd8bbc4856afda55211d30a173ae721b8108f229792e6fb509 + languageName: node + linkType: hard + +"websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4": + version: 0.7.4 + resolution: "websocket-driver@npm:0.7.4" + dependencies: + http-parser-js: "npm:>=0.5.1" + safe-buffer: "npm:>=5.1.0" + websocket-extensions: "npm:>=0.1.1" + checksum: 10c0/5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1 + languageName: node + linkType: hard + +"websocket-extensions@npm:>=0.1.1": + version: 0.1.4 + resolution: "websocket-extensions@npm:0.1.4" + checksum: 10c0/bbc8c233388a0eb8a40786ee2e30d35935cacbfe26ab188b3e020987e85d519c2009fe07cfc37b7f718b85afdba7e54654c9153e6697301f72561bfe429177e0 + languageName: node + linkType: hard + +"which-boxed-primitive@npm:^1.0.2": + version: 1.0.2 + resolution: "which-boxed-primitive@npm:1.0.2" + dependencies: + is-bigint: "npm:^1.0.1" + is-boolean-object: "npm:^1.1.0" + is-number-object: "npm:^1.0.4" + is-string: "npm:^1.0.5" + is-symbol: "npm:^1.0.3" + checksum: 10c0/0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e + languageName: node + linkType: hard + +"which-module@npm:^2.0.0": + version: 2.0.0 + resolution: "which-module@npm:2.0.0" + checksum: 10c0/946ffdbcd6f0cf517638f8f2319c6d51e528c3b41bc2c0f5dc3dc46047347abd7326aea5cdf5def0a8b32bdca313ac87a32ce5a76b943fe1ca876c4557e6b716 + languageName: node + linkType: hard + +"which@npm:^1.2.9": + version: 1.3.1 + resolution: "which@npm:1.3.1" + dependencies: + isexe: "npm:^2.0.0" + bin: + which: ./bin/which + checksum: 10c0/e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59 + languageName: node + linkType: hard + +"which@npm:^2.0.1": + version: 2.0.2 + resolution: "which@npm:2.0.2" + dependencies: + isexe: "npm:^2.0.0" + bin: + node-which: ./bin/node-which + checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f + languageName: node + linkType: hard + +"which@npm:^7.0.0": + version: 7.0.0 + resolution: "which@npm:7.0.0" + dependencies: + isexe: "npm:^4.0.0" + bin: + node-which: bin/which.js + checksum: 10c0/ca0b54f198f78bbc4b7c02e34bda8d335cb352e0adb4cbca1c37b1a957af3a879a82c4c27ca6525bc942f548d8b64f816ef6528360af9f3de55ffb9b979b620d + languageName: node + linkType: hard + +"word-wrap@npm:~1.2.3": + version: 1.2.3 + resolution: "word-wrap@npm:1.2.3" + checksum: 10c0/1cb6558996deb22c909330db1f01d672feee41d7f0664492912de3de282da3f28ba2d49e87b723024e99d56ba2dac2f3ab28f8db07ac199f5e5d5e2e437833de + languageName: node + linkType: hard + +"worker-farm@npm:^1.7.0": + version: 1.7.0 + resolution: "worker-farm@npm:1.7.0" + dependencies: + errno: "npm:~0.1.7" + checksum: 10c0/069a032f9198a07273a7608dc0c23d7288c1c25256b66008e1ae95838cda6fa2c7aefb3b7ba760f975c8d18120ca54eb193afb66d7237b2a05e5da12c1c961f7 + languageName: node + linkType: hard + +"wrap-ansi@npm:^5.1.0": + version: 5.1.0 + resolution: "wrap-ansi@npm:5.1.0" + dependencies: + ansi-styles: "npm:^3.2.0" + string-width: "npm:^3.0.0" + strip-ansi: "npm:^5.0.0" + checksum: 10c0/fcd0b39b7453df512f2fe8c714a1c1b147fe3e6a4b5a2e4de6cadc3af47212f335eceaffe588e98322d6345e72672137e2c0b834d8a662e73a32296c1c8216bb + languageName: node + linkType: hard + +"wrap-ansi@npm:^6.2.0": + version: 6.2.0 + resolution: "wrap-ansi@npm:6.2.0" + dependencies: + ansi-styles: "npm:^4.0.0" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + checksum: 10c0/baad244e6e33335ea24e86e51868fe6823626e3a3c88d9a6674642afff1d34d9a154c917e74af8d845fd25d170c4ea9cf69a47133c3f3656e1252b3d462d9f6c + languageName: node + linkType: hard + +"wrap-ansi@npm:^7.0.0": + version: 7.0.0 + resolution: "wrap-ansi@npm:7.0.0" + dependencies: + ansi-styles: "npm:^4.0.0" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + checksum: 10c0/d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da + languageName: node + linkType: hard + +"wrappy@npm:1": + version: 1.0.2 + resolution: "wrappy@npm:1.0.2" + checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0 + languageName: node + linkType: hard + +"write@npm:1.0.3": + version: 1.0.3 + resolution: "write@npm:1.0.3" + dependencies: + mkdirp: "npm:^0.5.1" + checksum: 10c0/2ab5472e32ce2d25279a9d22365c5dd5b95fe40497ca43fa329aa61687fca56e36837615a1b6adfc4ca540389383185680a23497d75a1698b1dcbb52741d29a4 + languageName: node + linkType: hard + +"ws@npm:^6.0.0, ws@npm:^6.2.1": + version: 6.2.2 + resolution: "ws@npm:6.2.2" + dependencies: + async-limiter: "npm:~1.0.0" + checksum: 10c0/d628a1e95668a296644b4f51ce5debb43d9f1d89ebb2e32fef205a685b9439378eb824d60ce3a40bbc3bad0e887d84a56b343f2076f48d74f17c4c0800c42967 + languageName: node + linkType: hard + +"xtend@npm:^4.0.0, xtend@npm:~4.0.1": + version: 4.0.2 + resolution: "xtend@npm:4.0.2" + checksum: 10c0/366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e + languageName: node + linkType: hard + +"y18n@npm:^4.0.0": + version: 4.0.3 + resolution: "y18n@npm:4.0.3" + checksum: 10c0/308a2efd7cc296ab2c0f3b9284fd4827be01cfeb647b3ba18230e3a416eb1bc887ac050de9f8c4fd9e7856b2e8246e05d190b53c96c5ad8d8cb56dffb6f81024 + languageName: node + linkType: hard + +"y18n@npm:^5.0.5": + version: 5.0.8 + resolution: "y18n@npm:5.0.8" + checksum: 10c0/4df2842c36e468590c3691c894bc9cdbac41f520566e76e24f59401ba7d8b4811eb1e34524d57e54bc6d864bcb66baab7ffd9ca42bf1eda596618f9162b91249 + languageName: node + linkType: hard + +"yallist@npm:^2.1.2": + version: 2.1.2 + resolution: "yallist@npm:2.1.2" + checksum: 10c0/0b9e25aa00adf19e01d2bcd4b208aee2b0db643d9927131797b7af5ff69480fc80f1c3db738cbf3946f0bddf39d8f2d0a5709c644fd42d4aa3a4e6e786c087b5 + languageName: node + linkType: hard + +"yallist@npm:^3.0.2": + version: 3.1.1 + resolution: "yallist@npm:3.1.1" + checksum: 10c0/c66a5c46bc89af1625476f7f0f2ec3653c1a1791d2f9407cfb4c2ba812a1e1c9941416d71ba9719876530e3340a99925f697142989371b72d93b9ee628afd8c1 + languageName: node + linkType: hard + +"yallist@npm:^4.0.0": + version: 4.0.0 + resolution: "yallist@npm:4.0.0" + checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a + languageName: node + linkType: hard + +"yallist@npm:^5.0.0": + version: 5.0.0 + resolution: "yallist@npm:5.0.0" + checksum: 10c0/a499c81ce6d4a1d260d4ea0f6d49ab4da09681e32c3f0472dee16667ed69d01dae63a3b81745a24bd78476ec4fcf856114cb4896ace738e01da34b2c42235416 + languageName: node + linkType: hard + +"yargs-parser@npm:^13.1.2": + version: 13.1.2 + resolution: "yargs-parser@npm:13.1.2" + dependencies: + camelcase: "npm:^5.0.0" + decamelize: "npm:^1.2.0" + checksum: 10c0/aeded49d2285c5e284e48b7c69eab4a6cf1c94decfdba073125cc4054ff49da7128a3c7c840edb6b497a075e455be304e89ba4b9228be35f1ed22f4a7bba62cc + languageName: node + linkType: hard + +"yargs-parser@npm:^20.2.2": + version: 20.2.9 + resolution: "yargs-parser@npm:20.2.9" + checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72 + languageName: node + linkType: hard + +"yargs@npm:^13.3.2": + version: 13.3.2 + resolution: "yargs@npm:13.3.2" + dependencies: + cliui: "npm:^5.0.0" + find-up: "npm:^3.0.0" + get-caller-file: "npm:^2.0.1" + require-directory: "npm:^2.1.1" + require-main-filename: "npm:^2.0.0" + set-blocking: "npm:^2.0.0" + string-width: "npm:^3.0.0" + which-module: "npm:^2.0.0" + y18n: "npm:^4.0.0" + yargs-parser: "npm:^13.1.2" + checksum: 10c0/6612f9f0ffeee07fff4c85f153d10eba4072bf5c11e1acba96153169f9d771409dfb63253dbb0841ace719264b663cd7b18c75c0eba91af7740e76094239d386 + languageName: node + linkType: hard + +"yargs@npm:^16.0.0": + version: 16.2.0 + resolution: "yargs@npm:16.2.0" + dependencies: + cliui: "npm:^7.0.2" + escalade: "npm:^3.1.1" + get-caller-file: "npm:^2.0.5" + require-directory: "npm:^2.1.1" + string-width: "npm:^4.2.0" + y18n: "npm:^5.0.5" + yargs-parser: "npm:^20.2.2" + checksum: 10c0/b1dbfefa679848442454b60053a6c95d62f2d2e21dd28def92b647587f415969173c6e99a0f3bab4f1b67ee8283bf735ebe3544013f09491186ba9e8a9a2b651 + languageName: node + linkType: hard + +"yorkie@npm:^2.0.0": + version: 2.0.0 + resolution: "yorkie@npm:2.0.0" + dependencies: + execa: "npm:^0.8.0" + is-ci: "npm:^1.0.10" + normalize-path: "npm:^1.0.0" + strip-indent: "npm:^2.0.0" + checksum: 10c0/fe9962cf122c00a3633a1ed5286de845234bab9ada64426bb1c0ec4047c9316eba7fbaed7c5dad34702eaf3fd761ba62c2a9048da29392096d815f8797222164 + languageName: node + linkType: hard From d89da13e206e5bb68c182930e69906bb1d5e17ea Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 29 Sep 2026 09:18:11 +1300 Subject: [PATCH 082/250] fix(ns8): lowercase registry namespace before image commit buildah commit ran before the lowercase normalization, so the build failed on ghcr.io/Calnode (uppercase owner) with 'repository name must be lowercase'. Normalize at variable prep; every use below is safe. --- packaging/ns8/build-images.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packaging/ns8/build-images.sh b/packaging/ns8/build-images.sh index b373ec18..8fc0b6bd 100644 --- a/packaging/ns8/build-images.sh +++ b/packaging/ns8/build-images.sh @@ -28,8 +28,10 @@ if [ ! -d imageroot ] || [ ! -d ui ]; then exit 1 fi -# Prepare variables for later use +# Prepare variables for later use. Registry namespaces must be lowercase +# (docker:// rejects uppercase); normalize up front so every use below is safe. repobase="${REPOBASE:-ghcr.io/calnode}" +repobase="${repobase,,}" reponame="ns8-calnode" app_image="${APP_IMAGE:-ghcr.io/calnode/calnode:latest}" read -r -a imagetags <<< "${IMAGETAGS:-latest}" @@ -73,13 +75,9 @@ buildah config --entrypoint=/ \ --label="org.nethserver.volumes=calnode-data" \ --label="org.nethserver.images=${app_image}" \ "${container}" -# Commit the image +# Commit the image (repobase already lowercased at variable prep above). buildah commit "${container}" "${repobase}/${reponame}:build" -# Warning! docker:// protocol expects lowercase letters (,,) -repobase="${repobase,,}" -reponame="${reponame,,}" - if [ "${PUSH:-0}" = "1" ]; then for imagetag in "${imagetags[@]}"; do buildah tag "${repobase}/${reponame}:build" "${repobase}/${reponame}:${imagetag}" From ff47709483f67e93a69d910a570559a236dd6281 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 29 Sep 2026 09:57:32 +1300 Subject: [PATCH 083/250] fix(ns8 review): edge-only main tags, stop grace, stamped pull image, restore docs - main pushes module :edge only; :latest stays pinned to releases, mirroring docker-publish.yml - podman stop grace 10s -> 45s (app needs 30s HTTP drain + worker bound) - configure-module warm-pulls the stamped app ref instead of :latest - README: non-NS8 data adoption is CLI-only via encryption_key --- .github/workflows/ns8-module.yml | 5 +++-- packaging/ns8/README.md | 7 +++++++ packaging/ns8/build-images.sh | 6 ++++-- .../ns8/imageroot/actions/configure-module/20configure | 4 +++- packaging/ns8/imageroot/systemd/user/calnode.service | 5 ++++- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ns8-module.yml b/.github/workflows/ns8-module.yml index 3ec8223b..afe38069 100644 --- a/.github/workflows/ns8-module.yml +++ b/.github/workflows/ns8-module.yml @@ -5,7 +5,8 @@ name: NS8 module publish # the Calnode app itself is pulled from its own registry at install time. # * PR → validate + build only. Nothing is pushed. # * push to dev → push `:dev`, running app `:dev`. -# * push to main → push `:edge` + `:latest`, running app `:edge`. +# * push to main → push `:edge`, running app `:edge` (`:latest` stays +# pinned to releases, mirroring docker-publish.yml). # * push a `vX.Y.Z` tag → push `:X.Y.Z`, `:X.Y` and `:latest`, running app # `:X.Y.Z`. Module and app tags move together, so a # module release can never point at the wrong app. @@ -53,7 +54,7 @@ jobs: echo "module_tags=${version} ${version%.*} latest" >> "$GITHUB_OUTPUT" echo "app_image=ghcr.io/calnode/calnode:${version}" >> "$GITHUB_OUTPUT" elif [[ "${GITHUB_REF}" == refs/heads/main ]]; then - echo "module_tags=edge latest" >> "$GITHUB_OUTPUT" + echo "module_tags=edge" >> "$GITHUB_OUTPUT" echo "app_image=ghcr.io/calnode/calnode:edge" >> "$GITHUB_OUTPUT" elif [[ "${GITHUB_REF}" == refs/heads/dev ]]; then echo "module_tags=dev" >> "$GITHUB_OUTPUT" diff --git a/packaging/ns8/README.md b/packaging/ns8/README.md index 3f3d6721..144ecf16 100644 --- a/packaging/ns8/README.md +++ b/packaging/ns8/README.md @@ -74,6 +74,13 @@ section, then re-run `configure-module` with the same hostname if the route needs recreating. Keep at least one tested backup: the encryption key and the database are only useful together. +Adopting data from a non-NS8 install is CLI-only: import the SQLite file +into the `calnode-data` volume, then pass its key explicitly, e.g. +`api-cli run module//configure-module --data '{"host": "...", +"encryption_key": ""}'`. The Settings page does +not expose the key field; cluster backup/restore never needs it (the key +travels inside the backed-up module state). + UNTESTED: no live NS8 node was reachable while writing this, so install, configure, update, backup and restore steps above are documented from the NS8 module layout but have not been run against a real cluster. The diff --git a/packaging/ns8/build-images.sh b/packaging/ns8/build-images.sh index 8fc0b6bd..117aeb52 100644 --- a/packaging/ns8/build-images.sh +++ b/packaging/ns8/build-images.sh @@ -37,12 +37,14 @@ app_image="${APP_IMAGE:-ghcr.io/calnode/calnode:latest}" read -r -a imagetags <<< "${IMAGETAGS:-latest}" # Stage imageroot with the app image reference stamped in, so the committed -# tree keeps a placeholder and releases pin the exact app tag. +# tree keeps a placeholder and releases pin the exact app tag. Both the +# systemd unit and configure-module's warm-pull default are stamped. stage=$(mktemp -d) trap 'rm -rf "${stage}"' EXIT cp -r imageroot "${stage}/imageroot" sed -i "s#__CALNODE_APP_IMAGE__#${app_image}#g" \ - "${stage}/imageroot/systemd/user/calnode.service" + "${stage}/imageroot/systemd/user/calnode.service" \ + "${stage}/imageroot/actions/configure-module/20configure" if grep -q "__CALNODE_APP_IMAGE__" -r "${stage}/imageroot"; then echo "App image placeholder was not fully substituted." >&2 exit 1 diff --git a/packaging/ns8/imageroot/actions/configure-module/20configure b/packaging/ns8/imageroot/actions/configure-module/20configure index c23ccad0..6748db0b 100644 --- a/packaging/ns8/imageroot/actions/configure-module/20configure +++ b/packaging/ns8/imageroot/actions/configure-module/20configure @@ -25,7 +25,9 @@ import agent.tasks STATE_DIR = os.getcwd() ENV_FILE = os.path.join(STATE_DIR, "calnode.env") CONFIG_FILE = os.path.join(STATE_DIR, "config.json") -CALNODE_IMAGE = "ghcr.io/calnode/calnode:latest" +# Stamped at build time (build-images.sh) to the exact app ref this module +# release runs, so a pinned install warms the right image instead of :latest. +CALNODE_IMAGE = "__CALNODE_APP_IMAGE__" def read_env_file(path): diff --git a/packaging/ns8/imageroot/systemd/user/calnode.service b/packaging/ns8/imageroot/systemd/user/calnode.service index 1ded145b..ca370740 100644 --- a/packaging/ns8/imageroot/systemd/user/calnode.service +++ b/packaging/ns8/imageroot/systemd/user/calnode.service @@ -34,7 +34,10 @@ ExecStart=/usr/bin/podman run \ --volume=calnode-data:/data \ --env-file=calnode.env \ __CALNODE_APP_IMAGE__ -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/calnode.ctr-id -t 10 +# 45s grace: the app allows up to 30s HTTP drain plus worker shutdown, so the +# default 10s would SIGKILL updates mid-request. Data stays safe either way +# (jobs are crash-recoverable), this is about clean connection draining. +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/calnode.ctr-id -t 45 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/calnode.ctr-id PIDFile=%t/calnode.pid Type=forking From 7f73d7d2df0d653fd7746d15c4c9380c372950f6 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 29 Sep 2026 14:06:14 +1300 Subject: [PATCH 084/250] fix(livekit): explain host takeover instead of silently dropping controls (#101) Sharing the host link lets anyone take over as host (single-host demotion), and the demoted side just lost its cog with no explanation. The room now warns host-link holders pre-join not to share it, and shows who took over on demotion with a reclaim hint for owners. --- internal/handler/assets/livekit-room.js | 30 +++++++++++++ internal/handler/assets/room-logic.js | 46 +++++++++++++++++++- internal/handler/assets/room-logic.test.js | 27 ++++++++++++ internal/handler/templates/livekit-room.html | 8 ++++ 4 files changed, 110 insertions(+), 1 deletion(-) diff --git a/internal/handler/assets/livekit-room.js b/internal/handler/assets/livekit-room.js index 47af2ff3..1bea3ea5 100644 --- a/internal/handler/assets/livekit-room.js +++ b/internal/handler/assets/livekit-room.js @@ -26,6 +26,7 @@ $(s).classList.toggle('hidden', s !== id); }); if (id !== 'lk-room') $('lk-rec-banner').classList.add('hidden'); // the banner only belongs in-room + $('lk-host-banner').classList.add('hidden'); } function fail(msg) { if (msg) $('lk-error-msg').textContent = msg; @@ -36,6 +37,22 @@ if (!msg) { el.classList.add('hidden'); return; } el.textContent = msg; el.classList.remove('hidden'); } + // Name of whoever currently holds the host badge (not me), or ''. + function currentHostName() { + if (!room || !room.localParticipant) return ''; + var me = room.localParticipant.identity; + var all = Array.from(room.remoteParticipants.values()); + for (var i = 0; i < all.length; i++) { + if (all[i] && all[i].identity !== me && all[i].metadata === 'host') { + return all[i].name || all[i].identity; + } + } + return ''; + } + function showHostBanner(msg) { + $('lk-host-banner-msg').textContent = msg; + $('lk-host-banner').classList.remove('hidden'); + } function initial(name) { return (name || '?').trim().charAt(0).toUpperCase() || '?'; } // ----- Prejoin ----- @@ -98,6 +115,11 @@ function initPrejoin() { if (!roomToken) { fail('This meeting link is missing its access token.'); return; } + // Host link (#101): warn before they share it. The role is display-only here; + // the server re-verifies on /token, so a forged role buys nothing. + if (RoomLogic.roleFromToken(roomToken) === 'host') { + $('lk-hostlink-note').classList.remove('hidden'); + } syncToggle($('lk-pre-cam'), camOn, 'Camera'); syncToggle($('lk-pre-mic'), micOn, 'Mic'); $('lk-pre-cam').onclick = function () { camOn = !camOn; syncToggle($('lk-pre-cam'), camOn, 'Camera'); startPreview(); }; @@ -459,8 +481,15 @@ // Reflect the host badge for whoever this is (newly-promoted host, or a demoted one). setHostBadge(participant.identity, m === 'host'); if (participant.identity === room.localParticipant.identity) { + var wasHost = isHost; isHost = RoomLogic.nextIsHost(isHost, m); // see room-logic.js (tested) applyRoomMeta(); // refresh record + screen buttons + host menu for the new status + // Demoted by a shared host link (#101): say who took over instead of + // silently dropping the controls. Reclaim visibility comes from the + // refreshed UI state (owner keeps it). + var note = RoomLogic.demoteNotice(wasHost, isHost, currentHostName(), + !$('lk-hm-reclaim').classList.contains('hidden')); + if (note) showHostBanner(note); } }) .on(RE.Disconnected, function () { closeLeaveModal(); showOnly('lk-left'); }); @@ -517,6 +546,7 @@ paintChatBadge(); $('lk-chat-btn').onclick = function () { setChat(!chatOpen); }; $('lk-chat-close').onclick = function () { setChat(false); }; + $('lk-host-banner-x').onclick = function () { $('lk-host-banner').classList.add('hidden'); }; $('lk-chat-form').onsubmit = function (e) { e.preventDefault(); var inp = $('lk-chat-input'); sendChat(inp.value); inp.value = ''; }; $('lk-leave').onclick = leaveOrPrompt; $('lk-end-all').onclick = endForAll; diff --git a/internal/handler/assets/room-logic.js b/internal/handler/assets/room-logic.js index 63942a07..83c4b298 100644 --- a/internal/handler/assets/room-logic.js +++ b/internal/handler/assets/room-logic.js @@ -35,5 +35,49 @@ }; } - return { amHost: amHost, nextIsHost: nextIsHost, hostUi: hostUi }; + // roleFromToken — read the join link's role for DISPLAY HINTS ONLY (the prejoin + // host-link warning). The payload is signed but not encrypted; the server + // re-verifies on /token, so a forged role buys nothing. Returns 'host' or ''. + // Manual base64url decode (no atob/Buffer): this module runs in browsers and + // node alike and must stay dependency-free. + var B64URL = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'; + function b64urlDecode(s) { + var bits = '', out = ''; + s = String(s).replace(/=+$/, ''); + for (var i = 0; i < s.length; i++) { + var v = B64URL.indexOf(s.charAt(i)); + if (v < 0) throw new Error('bad char'); + bits += ('000000' + v.toString(2)).slice(-6); + } + for (var j = 0; j + 8 <= bits.length; j += 8) { + out += String.fromCharCode(parseInt(bits.substr(j, 8), 2)); + } + return decodeURIComponent(escape(out)); + } + function roleFromToken(tok) { + if (!tok || typeof tok !== 'string') return ''; + var dot = tok.indexOf('.'); + if (dot < 0) return ''; + try { + var payload = JSON.parse(b64urlDecode(tok.slice(0, dot))); + return payload && payload.role === 'host' ? 'host' : ''; + } catch (e) { + return ''; + } + } + + // demoteNotice — what to tell ME when my host status just changed. An upgrade + // needs no words (the controls appearing say it). A downgrade names the new + // host when known — this is the "where did my settings cog go" moment, almost + // always because this host link was shared and someone else opened it. + function demoteNotice(wasHost, isHostNow, otherHostName, canReclaim) { + if (!wasHost || isHostNow) return null; + var msg = otherHostName + ? otherHostName + ' took over as host — you are now attending.' + : 'Someone else took over as host — you are now attending.'; + if (canReclaim) msg += ' Take host back from the menu if that was a mistake.'; + return msg; + } + + return { amHost: amHost, nextIsHost: nextIsHost, hostUi: hostUi, roleFromToken: roleFromToken, demoteNotice: demoteNotice }; }); diff --git a/internal/handler/assets/room-logic.test.js b/internal/handler/assets/room-logic.test.js index 6d92c5e9..599e8fc0 100644 --- a/internal/handler/assets/room-logic.test.js +++ b/internal/handler/assets/room-logic.test.js @@ -61,3 +61,30 @@ test('hostUi — consent not re-prompted once decided', () => { test('hostUi — host is never consent-prompted (their record click IS consent)', () => { assert.equal(RL.hostUi({ isHost: true, recording: true, consentDecided: false }).consentPrompt, false); }); + +function roomTokenFor(role) { + const raw = Buffer.from(JSON.stringify({ r: 'booking-b1', e: 9999999999, role })).toString('base64') + .replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''); + return raw + '.sig'; +} + +test('roleFromToken — host vs attendee vs garbage', () => { + assert.equal(RL.roleFromToken(roomTokenFor('host')), 'host'); + assert.equal(RL.roleFromToken(roomTokenFor('')), ''); + assert.equal(RL.roleFromToken(roomTokenFor('admin')), ''); + assert.equal(RL.roleFromToken('not-a-token'), ''); + assert.equal(RL.roleFromToken(''), ''); + assert.equal(RL.roleFromToken(null), ''); +}); + +test('demoteNotice — names the new host, reclaim hint only when capable', () => { + assert.equal(RL.demoteNotice(true, false, 'Ana', true), + 'Ana took over as host — you are now attending. Take host back from the menu if that was a mistake.'); + assert.equal(RL.demoteNotice(true, false, 'Ana', false), + 'Ana took over as host — you are now attending.'); + assert.equal(RL.demoteNotice(true, false, '', false), + 'Someone else took over as host — you are now attending.'); + assert.equal(RL.demoteNotice(false, false, 'Ana', false), null); // never was host: nothing to explain + assert.equal(RL.demoteNotice(true, true, 'Ana', false), null); // still host: controls say it + assert.equal(RL.demoteNotice(false, true, '', false), null); // upgrade: controls say it +}); diff --git a/internal/handler/templates/livekit-room.html b/internal/handler/templates/livekit-room.html index f2add80b..afe21d46 100644 --- a/internal/handler/templates/livekit-room.html +++ b/internal/handler/templates/livekit-room.html @@ -127,6 +127,12 @@ .rec-dot { width:9px; height:9px; border-radius:50%; background:#fff; animation:recpulse 1.4s infinite; } @keyframes recpulse { 0%,100% { opacity:1; } 50% { opacity:.3; } } .ctrl.recording { background:var(--danger); color:#fff; } + /* Host-takeover notice (a demote with an explanation, not a silent control loss) */ + .host-banner { background:#1f2937; } + .host-banner button { background:none; border:0; color:#fff; font-size:1rem; line-height:1; cursor:pointer; padding:0 0 0 4px; } + /* Prejoin host-link warning */ + .hostlink-note { margin:12px 0 0; padding:10px 12px; border-radius:10px; font-size:.85rem; + background:rgba(245,158,11,.12); border:1px solid rgba(245,158,11,.45); } /* Host controls menu (gear popover above the bar) */ .hm-wrap { position:relative; display:inline-flex; } @@ -167,6 +173,7 @@

    Ready to join?

    + @@ -224,6 +231,7 @@

    Can't join this meeting

    +
    + +
    +

    Calendar invite

    +
    +
    + + + + {INVITE_DELIVERY.find((o) => o.value === form.invite_delivery)?.label ?? 'Select…'} + + + {#each INVITE_DELIVERY as o} + {o.label} + {/each} + + +
    +

    + {#if form.invite_delivery === 'calnode'} + Invitees get the invite from your workspace's email sender + (Settings → Email), never from a host's + own address. Hosts still see the meeting on their own calendar, with the meeting link. + {:else} + The host's connected calendar invites the booker, so the invite shows the host's own + email address. Choose Calnode to keep hosts' addresses private or to book as a team. + {/if} +

    +
    +
    +

    Price

    diff --git a/internal/booking/booking.go b/internal/booking/booking.go index 85ac6321..bcdc46b2 100644 --- a/internal/booking/booking.go +++ b/internal/booking/booking.go @@ -14,6 +14,17 @@ var ( ErrEmailThrottled = errors.New("booking: too many bookings from this email address") ) +// Who sends a booking's calendar invite to the booker (event_types/bookings.invite_delivery, +// migration 00068). +const ( + // InviteByCalendar: the booker is a guest on each host's calendar event, and the host's + // provider (Google, Microsoft) emails the invite from the host's own account. + InviteByCalendar = "calendar" + // InviteByCalnode: the hosts' events are created without guests, and Calnode sends the + // invite itself, organized by the instance's sender identity instead of any one host. + InviteByCalnode = "calnode" +) + // Booking is a confirmed or cancelled appointment. type Booking struct { ID string @@ -88,4 +99,10 @@ type CreateParams struct { // creation transaction, next to the active cap, so concurrent submissions // can't both slip past a read-then-write check. MaxBookingsPerHour int + // InviteDelivery records who sends the booker's calendar invite for this booking: + // InviteByCalendar (the hosts' connected calendars; the default when empty) or + // InviteByCalnode (Calnode's own .ics, with the hosts' events created guestless). + // Stored on the booking so its reschedule and cancel follow the mode it was created + // with, not whatever the event type is set to by then. + InviteDelivery string } diff --git a/internal/booking/service.go b/internal/booking/service.go index 419b49de..60945577 100644 --- a/internal/booking/service.go +++ b/internal/booking/service.go @@ -152,12 +152,18 @@ func (s *Service) Create(ctx context.Context, p CreateParams) (*Booking, error) } bookingID := uid.New() + inviteDelivery := p.InviteDelivery + if inviteDelivery == "" { + inviteDelivery = InviteByCalendar + } _, err = tx.ExecContext(ctx, ` INSERT INTO bookings - (id, event_type_id, host_id, start_at, end_at, status, location_value, location_type, created_at, updated_at) - VALUES (?, ?, ?, ?, ?, 'confirmed', ?, ?, ?, ?)`, - bookingID, p.EventTypeID, chosenHost, startStr, endStr, p.LocationValue, p.LocationType, now, now) + (id, event_type_id, host_id, start_at, end_at, status, location_value, location_type, + invite_delivery, created_at, updated_at) + VALUES (?, ?, ?, ?, ?, 'confirmed', ?, ?, ?, ?, ?)`, + bookingID, p.EventTypeID, chosenHost, startStr, endStr, p.LocationValue, p.LocationType, + inviteDelivery, now, now) if err != nil { if db.IsUniqueViolation(err) { return nil, ErrDoubleBooked diff --git a/internal/db/migrations/00068_invite_delivery.sql b/internal/db/migrations/00068_invite_delivery.sql new file mode 100644 index 00000000..b8c75110 --- /dev/null +++ b/internal/db/migrations/00068_invite_delivery.sql @@ -0,0 +1,25 @@ +-- +goose Up +-- Who sends the booker's calendar invite. +-- +-- 'calendar' (default, today's behaviour): the event is created on each host's connected +-- calendar with the booker as a guest, and Google/Microsoft email the invite. The invite +-- comes from the host's own account, so the booker sees the host's personal address. +-- +-- 'calnode': the host events are still created (they block time and mint the Meet/Teams +-- link) but WITHOUT the booker as a guest, so the provider emails nobody. Calnode sends +-- the invite itself as an .ics on the confirmation email, organized by the instance's +-- sender identity (Settings -> Email). For teams booking under one name, or hosts who +-- do not want their personal address on every invite. +-- +-- Stored on the booking as well as the event type: the mode a booking was CREATED with +-- decides how its reschedule and cancel are delivered. Reading the event type's current +-- mode instead would, after the setting changes, cancel a Google-invited booking with an +-- .ics nobody has (or leave a Calnode-invited one with no cancellation at all). +ALTER TABLE event_types ADD COLUMN invite_delivery TEXT NOT NULL DEFAULT 'calendar' + CHECK (invite_delivery IN ('calendar', 'calnode')); +ALTER TABLE bookings ADD COLUMN invite_delivery TEXT NOT NULL DEFAULT 'calendar' + CHECK (invite_delivery IN ('calendar', 'calnode')); + +-- +goose Down +ALTER TABLE bookings DROP COLUMN invite_delivery; +ALTER TABLE event_types DROP COLUMN invite_delivery; diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index fcfb363f..3253edf3 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -472,6 +472,9 @@ type bookableEventType struct { // so the page can grey them out. Read by the public slots endpoint only: the MCP // tool and the booking assistant must keep seeing bookable times and nothing else. ShowTakenSlots bool + // InviteDelivery is who sends the booker's invite (booking.InviteByCalendar/ByCalnode), + // copied onto each booking at creation. + InviteDelivery string } // loadBookableEventType loads an event type by slug for the booking-creation/slot paths. @@ -486,12 +489,14 @@ func (h *Handler) loadBookableEventType(ctx context.Context, slug string) (*book SELECT id, user_id, name, duration_minutes, slot_interval_minutes, location_type, location_value, allow_phone_call, routing_mode, rr_strategy, buffer_before_minutes, buffer_after_minutes, min_notice_minutes, max_future_days, - is_active, is_public, show_taken_slots, max_active_bookings, price_cents, currency + is_active, is_public, show_taken_slots, max_active_bookings, price_cents, currency, + invite_delivery FROM event_types WHERE slug = ?`, slug). Scan(&et.ID, &et.UserID, &et.Name, &et.DurationMinutes, &et.SlotIntervalMinutes, &et.LocationType, &et.LocationValue, &et.AllowPhoneCall, &et.RoutingMode, &et.RRStrategy, &et.BufferBeforeMinutes, &et.BufferAfterMinutes, &et.MinNoticeMinutes, &et.MaxFutureDays, - &isActive, &isPublic, &showTaken, &et.MaxActiveBookings, &et.PriceCents, &et.Currency) + &isActive, &isPublic, &showTaken, &et.MaxActiveBookings, &et.PriceCents, &et.Currency, + &et.InviteDelivery) if err != nil || isActive == 0 || isPublic == 0 { return nil, errEventTypeNotFound } @@ -570,6 +575,7 @@ func (h *Handler) createBookingForSlug(ctx context.Context, slug string, startAt Answers: answers, MaxActivePerInvitee: et.MaxActiveBookings, MaxBookingsPerHour: maxBookingsPerEmailPerHour, + InviteDelivery: et.InviteDelivery, }) if err != nil { return nil, err @@ -900,6 +906,7 @@ func (h *Handler) CreateBooking(w http.ResponseWriter, r *http.Request) { Answers: answers, MaxActivePerInvitee: et.MaxActiveBookings, MaxBookingsPerHour: maxBookingsPerEmailPerHour, + InviteDelivery: et.InviteDelivery, }) if err != nil { if errors.Is(err, booking.ErrDoubleBooked) { @@ -1012,6 +1019,9 @@ type bookingConfirmationInput struct { // OrganizerLocale is the attendee's resolved locale code (e.g. "es") — same value // stored on booking_attendees.locale, threaded into the confirmation email. OrganizerLocale string + // InviteDelivery is the booking's stored invite mode; dispatchBookingConfirmation + // fills it from the booking row, so callers need not. + InviteDelivery string } // hostPrefsOrDefault loads a host's notification prefs, defaulting to allOnPrefs and @@ -1037,6 +1047,8 @@ func (h *Handler) hostBookingData(ctx context.Context, base mailer.BookingData, hd.HostName, hd.HostEmail = host.Name, host.Email hd.AttachICS = h.noConnectedDestination(ctx, host.UserID) hd.ICSSequence = int(updatedAt.Unix()) + // The host's own copy is organized by the host, whichever way the booker was invited. + hd.HideHostInInvite = false return hd } @@ -1192,7 +1204,7 @@ func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Book Start: b.StartAt, End: b.EndAt, OrganizerName: in.OrganizerName, - OrganizerEmail: in.OrganizerEmail, + OrganizerEmail: calendarInvitee(in.InviteDelivery, in.OrganizerEmail), AddMeet: autoGenMeet && host.IsPrimary, }) if err != nil { @@ -1280,6 +1292,7 @@ func sendWithRetry(ctx context.Context, logger *slog.Logger, bookingID, who stri func (h *Handler) dispatchBookingConfirmation(b *booking.Booking, in bookingConfirmationInput) { ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) defer cancel() + in.InviteDelivery = h.bookingInviteDelivery(ctx, b.ID) bData := mailer.BookingData{ BookingID: b.ID, EventTypeName: in.EventTypeName, @@ -1325,7 +1338,7 @@ func (h *Handler) dispatchBookingConfirmation(b *booking.Booking, in bookingConf // Attendee confirmation, once. "With:" names the primary host; gated on the // primary host's notification preference (matches prior behaviour). bData.HostName, bData.HostEmail = primaryHost(hosts).Name, primaryHost(hosts).Email - bData.AttachICS = h.noConnectedDestination(ctx, b.HostID) + h.applyInviteDelivery(ctx, &bData, in.InviteDelivery, b.HostID) bData.ICSSequence = int(b.UpdatedAt.Unix()) confirmFailed := hostFailed if primaryPrefs.NotifyConfirmation { @@ -1770,7 +1783,7 @@ func (h *Handler) cancelSideEffects(b booking.Booking) { } } } - d.AttachICS = h.noConnectedDestination(ctx, b.HostID) + h.applyInviteDelivery(ctx, &d, h.bookingInviteDelivery(ctx, b.ID), b.HostID) d.ICSSequence = int(b.UpdatedAt.Unix()) if primaryPrefs.NotifyCancellation { if err := mailer.SendCancellationToAttendee(ctx, h.mailer, d); err != nil { diff --git a/internal/handler/calendar_reconcile.go b/internal/handler/calendar_reconcile.go index 7194d04f..b012cb32 100644 --- a/internal/handler/calendar_reconcile.go +++ b/internal/handler/calendar_reconcile.go @@ -187,13 +187,13 @@ func (h *Handler) reconcileCreations(ctx context.Context, gc *calendar.Service) cutoff := nowT.Add(-5 * time.Minute).Format(time.RFC3339) type missing struct { bookingID, userID, etName, orgName, orgEmail, orgLocale, startStr, endStr string - locationType, bookingLoc string + locationType, bookingLoc, inviteMode string isPrimary bool } var items []missing rows, err := h.db.QueryContext(ctx, ` SELECT bh.booking_id, bh.user_id, bh.is_primary, et.name, COALESCE(NULLIF(b.location_type, ''), et.location_type), - COALESCE(b.location_value, ''), + COALESCE(b.location_value, ''), b.invite_delivery, COALESCE(o.name, ''), COALESCE(o.email, ''), COALESCE(o.locale, ''), b.start_at, b.end_at FROM booking_hosts bh JOIN bookings b ON b.id = bh.booking_id @@ -209,7 +209,7 @@ func (h *Handler) reconcileCreations(ctx context.Context, gc *calendar.Service) var m missing var primary int if err := rows.Scan(&m.bookingID, &m.userID, &primary, &m.etName, &m.locationType, - &m.bookingLoc, &m.orgName, &m.orgEmail, &m.orgLocale, &m.startStr, &m.endStr); err == nil { + &m.bookingLoc, &m.inviteMode, &m.orgName, &m.orgEmail, &m.orgLocale, &m.startStr, &m.endStr); err == nil { m.isPrimary = primary != 0 items = append(items, m) } @@ -248,7 +248,7 @@ func (h *Handler) reconcileCreations(ctx context.Context, gc *calendar.Service) Start: start, End: end, OrganizerName: m.orgName, - OrganizerEmail: m.orgEmail, + OrganizerEmail: calendarInvitee(m.inviteMode, m.orgEmail), AddMeet: autoGenMeet, }) if err != nil { diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index a49413a9..0f7e63cd 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -7,6 +7,7 @@ import ( "net/http" "strings" + "github.com/calnode/calnode/internal/booking" "github.com/calnode/calnode/internal/db" "github.com/calnode/calnode/internal/uid" ) @@ -39,7 +40,11 @@ type eventTypeJSON struct { // ShowTakenSlots renders already-booked times greyed out on the booking page // instead of omitting them. Off by default: the slots endpoint is public, so this // makes the host's booked hours legible to anyone with the link (#19). - ShowTakenSlots bool `json:"show_taken_slots"` + ShowTakenSlots bool `json:"show_taken_slots"` + // InviteDelivery is who sends the booker's calendar invite: "calendar" (each host's + // connected calendar, from the host's own address) or "calnode" (Calnode's own .ics, + // from the instance sender, so no host address reaches the booker). See migration 00068. + InviteDelivery string `json:"invite_delivery"` IsPublic bool `json:"is_public"` CreatedAt string `json:"created_at"` MsgConfirmation *string `json:"msg_confirmation"` @@ -95,7 +100,7 @@ func scanEventTypeRow(s rowScanner, trailing ...any) (*eventTypeJSON, error) { &isActive, &isPublic, &showTaken, &et.CreatedAt, &msgConf, &msgCancel, &msgResched, &msgRemind, &msgGreeting, &subjConf, &subjCancel, &subjResched, &subjRemind, - &et.PriceCents, &et.Currency, + &et.PriceCents, &et.Currency, &et.InviteDelivery, } dests = append(dests, trailing...) err := s.Scan(dests...) @@ -154,7 +159,7 @@ const etColumns = `id, slug, name, description, is_active, is_public, show_taken_slots, created_at, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, msg_greeting, subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder, - price_cents, currency` + price_cents, currency, invite_delivery` // selectETCols fetches a single owner-scoped event type (no `owned` column). const selectETCols = "SELECT " + etColumns + " FROM event_types" @@ -221,6 +226,7 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { MaxActiveBookings *int `json:"max_active_bookings"` AllowPhoneCall *bool `json:"allow_phone_call"` ShowTakenSlots *bool `json:"show_taken_slots"` + InviteDelivery *string `json:"invite_delivery"` } if err := json.NewDecoder(r.Body).Decode(&req); err != nil { h.writeError(w, http.StatusBadRequest, "invalid JSON") @@ -295,6 +301,18 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { if req.ShowTakenSlots != nil && *req.ShowTakenSlots { showTaken = 1 } + inviteDelivery := booking.InviteByCalendar + if req.InviteDelivery != nil { + if !validInviteDelivery(*req.InviteDelivery) { + h.writeError(w, http.StatusBadRequest, "invite_delivery must be 'calendar' or 'calnode'") + return + } + if *req.InviteDelivery == booking.InviteByCalnode && !h.inviteSenderReady(r.Context()) { + h.writeError(w, http.StatusBadRequest, errInviteSenderMissing.Error()) + return + } + inviteDelivery = *req.InviteDelivery + } id := uid.New() tx, err := h.db.BeginTx(r.Context(), nil) @@ -310,12 +328,12 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { (id, user_id, slug, name, description, duration_minutes, slot_interval_minutes, location_type, location_value, allow_phone_call, routing_mode, buffer_before_minutes, buffer_after_minutes, - min_notice_minutes, max_future_days, max_active_bookings, show_taken_slots, + min_notice_minutes, max_future_days, max_active_bookings, show_taken_slots, invite_delivery, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, id, user.ID, req.Slug, req.Name, req.Description, req.DurationMinutes, slotInterval, locType, req.LocationValue, req.AllowPhoneCall != nil && *req.AllowPhoneCall, - routingMode, bufBefore, bufAfter, minNotice, maxFuture, maxActive, showTaken, + routingMode, bufBefore, bufAfter, minNotice, maxFuture, maxActive, showTaken, inviteDelivery, defaultMsgConfirmation, defaultMsgCancellation, defaultMsgReschedule, defaultMsgReminder) if err != nil { if db.IsUniqueViolation(err) { @@ -448,6 +466,7 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { IsPublic *bool `json:"is_public"` AllowPhoneCall *bool `json:"allow_phone_call"` ShowTakenSlots *bool `json:"show_taken_slots"` + InviteDelivery *string `json:"invite_delivery"` Archived *bool `json:"archived"` MsgConfirmation *string `json:"msg_confirmation"` MsgCancellation *string `json:"msg_cancellation"` @@ -602,6 +621,10 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { } set("show_taken_slots", v) } + if req.InviteDelivery != nil && !validInviteDelivery(*req.InviteDelivery) { + h.writeError(w, http.StatusBadRequest, "invite_delivery must be 'calendar' or 'calnode'") + return + } if req.Archived != nil { if *req.Archived { // strftime literal (no bound value) — matches the DB's timestamp format; @@ -670,10 +693,10 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { // Look up the event type ID + current location (needed for reminder upsert, to // verify ownership, and to validate the effective online-meeting location below). - var etID, curLocType, curLocVal string + var etID, curLocType, curLocVal, curInviteDelivery string if err := h.db.QueryRowContext(r.Context(), - `SELECT id, location_type, COALESCE(location_value, '') FROM event_types WHERE slug = ? AND user_id = ?`, slug, user.ID). - Scan(&etID, &curLocType, &curLocVal); err != nil { + `SELECT id, location_type, COALESCE(location_value, ''), invite_delivery FROM event_types WHERE slug = ? AND user_id = ?`, slug, user.ID). + Scan(&etID, &curLocType, &curLocVal, &curInviteDelivery); err != nil { if err == sql.ErrNoRows { h.writeError(w, http.StatusNotFound, "event type not found") return @@ -714,6 +737,17 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { } } + // Same on-change rule for invite delivery: switching to Calnode-sent invites needs a + // working email sender (the invite IS an email), but an event type already set that + // way stays saveable if email is later removed - that is fixed in Settings → Email. + if req.InviteDelivery != nil && *req.InviteDelivery != curInviteDelivery { + if *req.InviteDelivery == booking.InviteByCalnode && !h.inviteSenderReady(r.Context()) { + h.writeError(w, http.StatusBadRequest, errInviteSenderMissing.Error()) + return + } + set("invite_delivery", *req.InviteDelivery) + } + // The slug is the public booking URL, so renaming one that is already in circulation // breaks every link to it: an invitation in somebody's inbox, a page embedding the // widget, a QR code on a card. It is allowed only while the event type has no diff --git a/internal/handler/event_type_duplicate.go b/internal/handler/event_type_duplicate.go index e24ed8dd..e56a5d97 100644 --- a/internal/handler/event_type_duplicate.go +++ b/internal/handler/event_type_duplicate.go @@ -141,7 +141,7 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { is_active, is_public, show_taken_slots, archived_at, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, msg_greeting, subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder, - price_cents, currency) + price_cents, currency, invite_delivery) SELECT ?, user_id, team_id, ?, name, description, duration_minutes, slot_interval_minutes, @@ -152,7 +152,7 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { 0, is_public, show_taken_slots, NULL, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, msg_greeting, subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder, - price_cents, currency + price_cents, currency, invite_delivery FROM event_types WHERE id = ?`, newID, newSlug, srcID); err != nil { h.logger.ErrorContext(r.Context(), "duplicate event type: copy row", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") diff --git a/internal/handler/event_type_duplicate_test.go b/internal/handler/event_type_duplicate_test.go index ecb7b465..44ae4bbb 100644 --- a/internal/handler/event_type_duplicate_test.go +++ b/internal/handler/event_type_duplicate_test.go @@ -604,6 +604,7 @@ func TestDuplicateEventType_handlesEveryEventTypeColumn(t *testing.T) { "subj_confirmation": true, "subj_cancellation": true, "subj_reschedule": true, "subj_reminder": true, "price_cents": true, "currency": true, + "invite_delivery": true, } // Deliberately not inherited, with the reason. notInherited := map[string]string{ diff --git a/internal/handler/invite_delivery.go b/internal/handler/invite_delivery.go new file mode 100644 index 00000000..479be451 --- /dev/null +++ b/internal/handler/invite_delivery.go @@ -0,0 +1,93 @@ +package handler + +import ( + "context" + "errors" + + "github.com/calnode/calnode/internal/booking" + "github.com/calnode/calnode/internal/mailer" +) + +// Invite delivery decides who sends the booker's calendar invite (migration 00068): +// +// - booking.InviteByCalendar: each host's connected calendar invites the booker, so +// Google/Microsoft email the invite from that host's own account. The default. +// - booking.InviteByCalnode: the hosts' events are still written (they block time and +// mint the Meet/Teams link) but with no guests, so the provider emails nobody. +// Calnode sends the invite itself on the confirmation email, organized by the +// instance's sender identity (Settings → Email). No host's address reaches the booker, +// and a team books under one name. +// +// The mode is copied onto the booking when it is created and read from there afterwards, +// so a booking's reschedule and cancel follow the channel its invite actually went out on. + +var errInviteSenderMissing = errors.New( + "set up email in Settings → Email before letting Calnode send invites: the invite is delivered by email, from that sender") + +func validInviteDelivery(v string) bool { + return v == booking.InviteByCalendar || v == booking.InviteByCalnode +} + +// bookingInviteDelivery returns the invite delivery a booking was created with. A lookup +// failure reads as InviteByCalendar, the behaviour every booking had before the setting +// existed. +func (h *Handler) bookingInviteDelivery(ctx context.Context, bookingID string) string { + var mode string + if err := h.db.QueryRowContext(ctx, + `SELECT invite_delivery FROM bookings WHERE id = ?`, bookingID).Scan(&mode); err != nil { + h.logger.ErrorContext(ctx, "load booking invite delivery", "error", err, "booking_id", bookingID) + return booking.InviteByCalendar + } + return mode +} + +// calendarInvitee is the guest to put on a host's calendar event: the booker when the +// hosts' calendars send the invite, nobody when Calnode does. An empty address is what +// every provider (Google, Microsoft, CalDAV) reads as "no attendee", so the provider has +// no one to email and the event stays private to the host. +func calendarInvitee(mode, bookerEmail string) string { + if mode == booking.InviteByCalnode { + return "" + } + return bookerEmail +} + +// inviteSender returns the instance's sender identity, the From name and address in +// Settings → Email. It organizes invites Calnode sends, which puts replies (RSVPs) where +// the operator already reads mail rather than in any one host's inbox. +func (h *Handler) inviteSender(ctx context.Context) (name, email string) { + if err := h.db.QueryRowContext(ctx, + `SELECT email_from_name, email_from FROM server_settings WHERE id = 1`).Scan(&name, &email); err != nil { + h.logger.ErrorContext(ctx, "load invite sender", "error", err) + return "", "" + } + return name, email +} + +// inviteSenderReady reports whether Calnode can deliver invites itself: a sender address +// and a transport (SMTP host or Resend API key) are configured. Checked when an event type +// switches to InviteByCalnode, since with no email there is no invite at all. +func (h *Handler) inviteSenderReady(ctx context.Context) bool { + var from, host, resendKey string + if err := h.db.QueryRowContext(ctx, + `SELECT email_from, smtp_host, resend_api_key_enc FROM server_settings WHERE id = 1`). + Scan(&from, &host, &resendKey); err != nil { + h.logger.ErrorContext(ctx, "check invite sender", "error", err) + return false + } + return from != "" && (host != "" || resendKey != "") +} + +// applyInviteDelivery prepares an attendee-facing email's .ics for the booking's invite +// mode. Calnode-sent: always attach, organized by the instance sender, never the host. +// Calendar-sent: attach only when the primary host's calendar will not invite the booker +// itself (noConnectedDestination), with the host as organizer, exactly as before. +func (h *Handler) applyInviteDelivery(ctx context.Context, d *mailer.BookingData, mode, primaryHostID string) { + if mode == booking.InviteByCalnode { + d.AttachICS = true + d.HideHostInInvite = true + d.InviteOrganizerName, d.InviteOrganizerEmail = h.inviteSender(ctx) + return + } + d.AttachICS = h.noConnectedDestination(ctx, primaryHostID) +} diff --git a/internal/handler/invite_delivery_internal_test.go b/internal/handler/invite_delivery_internal_test.go new file mode 100644 index 00000000..72b3edd4 --- /dev/null +++ b/internal/handler/invite_delivery_internal_test.go @@ -0,0 +1,320 @@ +package handler + +import ( + "context" + "encoding/json" + "fmt" + "log/slog" + "net/http" + "net/http/httptest" + "strings" + "sync" + "testing" + "time" + + "github.com/calnode/calnode/internal/booking" + "github.com/calnode/calnode/internal/calendar" + "github.com/calnode/calnode/internal/db" + "github.com/calnode/calnode/internal/mailer" + "github.com/calnode/calnode/internal/slots" +) + +// inviteProvider is a Google-like destination (it emails guests itself) that records the +// events Calnode asks it to create, so a test can see who would have been invited. +type inviteProvider struct { + mu sync.Mutex + created []calendar.CreateEventParams +} + +func (p *inviteProvider) Name() string { return "google" } +func (p *inviteProvider) InvitesGuests() bool { return true } +func (p *inviteProvider) AuthURL(string) string { return "" } +func (p *inviteProvider) EncryptState(string) (string, error) { return "", nil } +func (p *inviteProvider) DecryptState(string) (string, error) { return "", nil } +func (p *inviteProvider) Exchange(context.Context, string, string, string) error { return nil } +func (p *inviteProvider) Connected(context.Context, string) (bool, error) { return true, nil } +func (p *inviteProvider) Disconnect(context.Context, string) error { return nil } +func (p *inviteProvider) HasDestination(context.Context, string) (bool, error) { return true, nil } +func (p *inviteProvider) ListCalendars(context.Context, string, string) ([]calendar.CalendarInfo, error) { + return nil, nil +} +func (p *inviteProvider) FreeBusy(context.Context, string, time.Time, time.Time) ([]slots.Interval, error) { + return nil, nil +} +func (p *inviteProvider) CreateEvent(_ context.Context, _ string, params calendar.CreateEventParams) (string, string, string, error) { + p.mu.Lock() + defer p.mu.Unlock() + p.created = append(p.created, params) + return fmt.Sprintf("evt-%d", len(p.created)), "", "primary", nil +} +func (p *inviteProvider) UpdateEvent(context.Context, string, string, string, time.Time, time.Time) error { + return nil +} +func (p *inviteProvider) CancelEvent(context.Context, string, string, string) error { return nil } + +func (p *inviteProvider) events() []calendar.CreateEventParams { + p.mu.Lock() + defer p.mu.Unlock() + return append([]calendar.CreateEventParams(nil), p.created...) +} + +type inviteFixture struct { + h *Handler + mail *captureMailer + cal *inviteProvider + apiKey string +} + +const ( + inviteHostEmail = "jeroen@host.example" + inviteBookerEmail = "guest@booker.example" + inviteSenderEmail = "bookings@team.example" +) + +// newInviteFixture boots a workspace whose host has a Google-like destination calendar. +// withSender configures Settings → Email, which Calnode-sent invites require. +func newInviteFixture(t *testing.T, withSender bool) *inviteFixture { + t.Helper() + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatalf("db.Open: %v", err) + } + t.Cleanup(func() { database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatalf("db.Migrate: %v", err) + } + + h := New(database, slog.Default()) + f := &inviteFixture{h: h, mail: &captureMailer{}, cal: &inviteProvider{}} + h.SetMailer(f.mail, "https://book.team.example") + svc := calendar.NewService(database) + svc.Register(f.cal) + h.SetCalendar(svc) + + rec := httptest.NewRecorder() + h.Setup(rec, httptest.NewRequest(http.MethodPost, "/v1/setup", + strings.NewReader(`{"name":"Jeroen Host","email":"`+inviteHostEmail+`","timezone":"UTC"}`))) + if rec.Code != http.StatusCreated { + t.Fatalf("setup: %d — %s", rec.Code, rec.Body.String()) + } + var setup struct { + APIKey string `json:"api_key"` + UserID string `json:"user_id"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &setup); err != nil { + t.Fatalf("decode setup: %v", err) + } + f.apiKey = setup.APIKey + + if _, err := database.Exec(` + INSERT INTO calendar_connections + (id, user_id, provider, access_token_enc, calendar_id, check_conflicts, is_destination, created_at) + VALUES ('conn-1', ?, 'google', 'e', 'primary', 1, 1, '2026-01-01T00:00:00Z')`, setup.UserID); err != nil { + t.Fatalf("seed calendar connection: %v", err) + } + if withSender { + if _, err := database.Exec(`UPDATE server_settings + SET smtp_host = 'smtp.team.example', email_from = ?, email_from_name = 'Palamond Team' + WHERE id = 1`, inviteSenderEmail); err != nil { + t.Fatalf("seed email settings: %v", err) + } + } + for day := 0; day < 7; day++ { + rec := f.do(t, h.CreateAvailabilityRule, http.MethodPost, "/v1/availability-rules", + fmt.Sprintf(`{"day_of_week":%d,"start_time":"00:00","end_time":"23:59"}`, day)) + if rec.Code != http.StatusCreated { + t.Fatalf("seed availability: %d — %s", rec.Code, rec.Body.String()) + } + } + return f +} + +func (f *inviteFixture) do(t *testing.T, fn http.HandlerFunc, method, path, body string) *httptest.ResponseRecorder { + t.Helper() + req := httptest.NewRequest(method, path, strings.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + req.Header.Set("X-API-Key", f.apiKey) + if rest, ok := strings.CutPrefix(path, "/v1/event-types/"); ok { + req.SetPathValue("slug", rest) + } + rec := httptest.NewRecorder() + f.h.RequireAuth(fn)(rec, req) + return rec +} + +func (f *inviteFixture) createEventType(t *testing.T, slug, delivery string) *httptest.ResponseRecorder { + t.Helper() + return f.do(t, f.h.CreateEventType, http.MethodPost, "/v1/event-types", fmt.Sprintf( + `{"slug":%q,"name":"Intro","duration_minutes":30,"location_type":"phone","location_value":"+31 20 000 0000",`+ + `"max_active_bookings":0,"max_future_days":0,"invite_delivery":%q}`, slug, delivery)) +} + +// book creates a booking through the public endpoint and waits for the booker's +// confirmation, which the handler sends from a background goroutine. +func (f *inviteFixture) book(t *testing.T, slug string) (string, *mailer.Message) { + t.Helper() + start := time.Now().UTC().Add(72 * time.Hour).Truncate(24 * time.Hour).Add(10 * time.Hour) + req := httptest.NewRequest(http.MethodPost, "/v1/bookings", strings.NewReader(fmt.Sprintf( + `{"event_type_slug":%q,"start_at":%q,"name":"Guest","email":%q,"timezone":"UTC"}`, + slug, start.Format(time.RFC3339), inviteBookerEmail))) + req.Header.Set("Content-Type", "application/json") + rec := httptest.NewRecorder() + f.h.CreateBooking(rec, req) + if rec.Code != http.StatusCreated { + t.Fatalf("create booking: %d — %s", rec.Code, rec.Body.String()) + } + var b struct { + ID string `json:"id"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &b); err != nil { + t.Fatalf("decode booking: %v", err) + } + return b.ID, f.waitFor(t, inviteBookerEmail, 1) +} + +// waitFor returns the n-th message sent to addr, polling while background sends land. +func (f *inviteFixture) waitFor(t *testing.T, addr string, n int) *mailer.Message { + t.Helper() + deadline := time.Now().Add(3 * time.Second) + for time.Now().Before(deadline) { + f.mail.mu.Lock() + var seen []mailer.Message + for _, m := range f.mail.msgs { + if len(m.To) > 0 && m.To[0] == addr { + seen = append(seen, m) + } + } + f.mail.mu.Unlock() + if len(seen) >= n { + return &seen[n-1] + } + time.Sleep(5 * time.Millisecond) + } + t.Fatalf("message %d to %s never arrived; sent to: %v", n, addr, f.mail.recipients()) + return nil +} + +func icsOf(m *mailer.Message) string { + for _, a := range m.Attachments { + if strings.HasPrefix(a.ContentType, "text/calendar") { + return string(a.Content) + } + } + return "" +} + +// The point of Calnode-sent invites: nothing the booker receives, and nothing the host's +// calendar provider is asked to send, carries the host's own address. +func TestInviteDelivery_calnodeKeepsHostAddressFromBooker(t *testing.T) { + f := newInviteFixture(t, true) + if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + _, msg := f.book(t, "intro") + + events := f.cal.events() + if len(events) != 1 { + t.Fatalf("host calendar events: got %d; want 1 (the host still needs the meeting on their calendar)", len(events)) + } + if events[0].OrganizerEmail != "" { + t.Errorf("host event invites %q; want no guest, so the provider emails nobody from the host's account", + events[0].OrganizerEmail) + } + + ics := icsOf(msg) + if ics == "" { + t.Fatal("booker confirmation has no .ics: with the provider silenced, it is the only invite") + } + if !strings.Contains(ics, `ORGANIZER;CN="Palamond Team":mailto:`+inviteSenderEmail) { + t.Errorf("invite ORGANIZER is not the workspace sender:\n%s", ics) + } + if !strings.Contains(ics, "ATTENDEE") || !strings.Contains(ics, inviteBookerEmail) { + t.Errorf("invite does not list the booker as attendee:\n%s", ics) + } + for part, body := range map[string]string{"ics": ics, "text": msg.Text, "html": msg.HTML, "subject": msg.Subject} { + if strings.Contains(body, inviteHostEmail) { + t.Errorf("booker's %s contains the host's address %s", part, inviteHostEmail) + } + } + + // The host's own notification still names the host as organizer: it is their meeting. + hostMsg := f.waitFor(t, inviteHostEmail, 1) + if hostICS := icsOf(hostMsg); strings.Contains(hostICS, inviteSenderEmail) { + t.Errorf("host notification's invite is organized by the workspace sender:\n%s", hostICS) + } +} + +// The default stays exactly as before: the host's calendar invites the booker, and +// Calnode adds no second invite on top. +func TestInviteDelivery_calendarInvitesThroughHostCalendar(t *testing.T) { + f := newInviteFixture(t, true) + if rec := f.createEventType(t, "intro", booking.InviteByCalendar); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + _, msg := f.book(t, "intro") + + events := f.cal.events() + if len(events) != 1 || events[0].OrganizerEmail != inviteBookerEmail { + t.Fatalf("host calendar event guests = %+v; want the booker invited by the host's calendar", events) + } + if ics := icsOf(msg); ics != "" { + t.Errorf("booker got Calnode's .ics as well as the calendar's own invite (a duplicate):\n%s", ics) + } +} + +// A booking keeps the channel its invite went out on. Switching the event type back to +// calendar-sent must still cancel a Calnode-invited booking with Calnode's .ics, since the +// host's calendar never invited that booker and has no cancellation to send. +func TestInviteDelivery_cancelFollowsTheBookingNotTheEventType(t *testing.T) { + f := newInviteFixture(t, true) + if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + id, _ := f.book(t, "intro") + + if rec := f.do(t, f.h.PatchEventType, http.MethodPatch, "/v1/event-types/intro", + `{"invite_delivery":"calendar"}`); rec.Code != http.StatusOK { + t.Fatalf("switch back to calendar: %d — %s", rec.Code, rec.Body.String()) + } + + ctx := context.Background() + if err := f.h.bookingSvc.CancelByID(ctx, id, "changed plans"); err != nil { + t.Fatalf("cancel: %v", err) + } + b, err := f.h.bookingSvc.Get(ctx, id) + if err != nil { + t.Fatalf("get booking: %v", err) + } + f.h.cancelSideEffects(*b) + + ics := icsOf(f.waitFor(t, inviteBookerEmail, 2)) + if !strings.Contains(ics, "METHOD:CANCEL") { + t.Fatalf("cancellation carries no .ics CANCEL; the booker's calendar keeps a dead meeting:\n%s", ics) + } + if strings.Contains(ics, inviteHostEmail) || !strings.Contains(ics, inviteSenderEmail) { + t.Errorf("cancellation is not organized by the workspace sender:\n%s", ics) + } +} + +// Calnode-sent invites ARE email, so turning them on without a sender would silently +// leave bookers with no invite at all. +func TestInviteDelivery_requiresEmailSender(t *testing.T) { + f := newInviteFixture(t, false) + rec := f.createEventType(t, "intro", booking.InviteByCalnode) + if rec.Code != http.StatusBadRequest || !strings.Contains(rec.Body.String(), "Settings → Email") { + t.Errorf("create with calnode invites and no email: %d — %s; want 400 pointing at Settings → Email", + rec.Code, rec.Body.String()) + } + + if rec := f.createEventType(t, "intro", booking.InviteByCalendar); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + rec = f.do(t, f.h.PatchEventType, http.MethodPatch, "/v1/event-types/intro", `{"invite_delivery":"calnode"}`) + if rec.Code != http.StatusBadRequest { + t.Errorf("switch to calnode invites with no email: %d — %s; want 400", rec.Code, rec.Body.String()) + } + rec = f.do(t, f.h.PatchEventType, http.MethodPatch, "/v1/event-types/intro", `{"invite_delivery":"carrier-pigeon"}`) + if rec.Code != http.StatusBadRequest { + t.Errorf("unknown invite_delivery: %d; want 400", rec.Code) + } +} diff --git a/internal/handler/manage_handler.go b/internal/handler/manage_handler.go index 191ef1ad..a884de22 100644 --- a/internal/handler/manage_handler.go +++ b/internal/handler/manage_handler.go @@ -314,7 +314,7 @@ func (h *Handler) rescheduleSideEffects(bCopy booking.Booking, capturedEtID stri if tok, err := h.bookingSvc.RotateManageToken(ctx, bCopy.ID); err == nil { d.ManageURL = h.publicURL() + "/manage/" + tok } - d.AttachICS = h.noConnectedDestination(ctx, bCopy.HostID) + h.applyInviteDelivery(ctx, &d, h.bookingInviteDelivery(ctx, bCopy.ID), bCopy.HostID) d.ICSSequence = int(bCopy.UpdatedAt.Unix()) prefs := h.hostPrefsOrDefault(ctx, bCopy.ID, bCopy.HostID) @@ -333,7 +333,12 @@ func (h *Handler) rescheduleSideEffects(bCopy booking.Booking, capturedEtID stri } } if prefs.NotifyHostReschedule { - if err := mailer.SendRescheduleToHost(ctx, h.mailer, d); err != nil { + // The host's copy keeps the host as organizer and attaches only when the host has + // no calendar of their own holding the event, whoever invited the booker. + hd := d + hd.HideHostInInvite = false + hd.AttachICS = h.noConnectedDestination(ctx, bCopy.HostID) + if err := mailer.SendRescheduleToHost(ctx, h.mailer, hd); err != nil { h.logger.Error("reschedule email (host)", "error", err, "booking_id", bCopy.ID) } } diff --git a/internal/handler/reassign.go b/internal/handler/reassign.go index 27ad9bb8..8def7608 100644 --- a/internal/handler/reassign.go +++ b/internal/handler/reassign.go @@ -158,6 +158,7 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { // Move the Google Calendar event: remove from the old host, recreate on // the new host, and persist the new event ID (clearing it if recreation // produced nothing, e.g. the new host has no destination calendar). + inviteMode := h.bookingInviteDelivery(ctx, bCopy.ID) if gc := h.getCal(); gc != nil { if extEventID != "" { // Reassignment cancels on the OLD host's calendar. Their stamped provider @@ -174,7 +175,7 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { Start: bCopy.StartAt, End: bCopy.EndAt, OrganizerName: orgName, - OrganizerEmail: orgEmail, + OrganizerEmail: calendarInvitee(inviteMode, orgEmail), }) if err != nil { h.logger.Error("reassign: create new calendar event", "error", err, "booking_id", bCopy.ID) @@ -205,7 +206,13 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { if err := h.loadHostIntoData(ctx, newHostID, &d); err != nil { h.logger.Error("reassign: load new host", "error", err, "booking_id", bCopy.ID) } - + // A Calnode-sent invite is re-issued (same UID, newer SEQUENCE) so the booker's + // calendar entry follows the change. A calendar-sent one needs nothing here: the + // new host's calendar invited the booker when the event was recreated above. + if inviteMode == booking.InviteByCalnode { + h.applyInviteDelivery(ctx, &d, inviteMode, newHostID) + d.ICSSequence = int(time.Now().Unix()) + } prefs := h.hostPrefsOrDefault(ctx, bCopy.ID, newHostID) if prefs.NotifyConfirmation { if err := mailer.SendConfirmationToAttendee(ctx, h.mailer, d); err != nil { @@ -213,7 +220,10 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { } } if prefs.NotifyHostBooking { - if err := mailer.SendConfirmationToHost(ctx, h.mailer, d); err != nil { + hd := d + hd.HideHostInInvite = false + hd.AttachICS = false + if err := mailer.SendConfirmationToHost(ctx, h.mailer, hd); err != nil { h.logger.Error("reassign: email new host", "error", err, "booking_id", bCopy.ID) } } diff --git a/internal/mailer/booking.go b/internal/mailer/booking.go index c41c63ea..6f64df48 100644 --- a/internal/mailer/booking.go +++ b/internal/mailer/booking.go @@ -33,11 +33,20 @@ type BookingData struct { CustomNote string // optional host-configured note appended to the email body SubjectOverride string // optional per-event-type custom subject; falls back to the default when empty // AttachICS attaches an iCalendar invite to the attendee's email — set by the - // handler only when the host has no Google destination calendar (so Google - // isn't already inviting the attendee, which would duplicate). ICSSequence must - // be non-decreasing across a booking's confirm→reschedule→cancel lifecycle. + // handler when the host has no Google destination calendar (so Google isn't already + // inviting the attendee, which would duplicate), or when the booking's invites are + // sent by Calnode (see HideHostInInvite). ICSSequence must be non-decreasing across + // a booking's confirm→reschedule→cancel lifecycle. AttachICS bool ICSSequence int + // HideHostInInvite makes the instance's sender identity (InviteOrganizerName / + // InviteOrganizerEmail) the .ics ORGANIZER instead of the host, so the booker's + // calendar never carries a host's personal address. Set on attendee sends of bookings + // whose invites Calnode delivers; host copies clear it. With no organizer address the + // ORGANIZER line is omitted rather than falling back to the host. + HideHostInInvite bool + InviteOrganizerName string + InviteOrganizerEmail string // Branding — instance-wide, threaded in by the handler. BrandName is the // wordmark/footer name (falls back to "Calnode" when empty); LogoURL is an // optional absolute https image shown in the HTML email header. diff --git a/internal/mailer/ics.go b/internal/mailer/ics.go index df478ab8..6530ecc1 100644 --- a/internal/mailer/ics.go +++ b/internal/mailer/ics.go @@ -12,8 +12,10 @@ import ( // reschedule update, and the eventual CANCEL to the same event; d.ICSSequence must // not decrease across that lifecycle (the handlers feed it updated_at's unix time). // -// This is only used when the host has no Google destination calendar — otherwise -// Google already invites the attendee and a second invite would duplicate it. +// Attached when the host has no Google destination calendar (otherwise Google already +// invites the attendee and a second invite would duplicate it), and always when the +// booking's invites are sent by Calnode — then d.HideHostInInvite swaps the host out of +// ORGANIZER for the instance's sender identity. func BuildICS(d BookingData, method string) []byte { status := "CONFIRMED" if method == "CANCEL" { @@ -42,8 +44,12 @@ func BuildICS(d BookingData, method string) []byte { if d.LocationValue != "" { writeICSLine(&b, "LOCATION:"+escapeICSText(d.LocationValue)) } - if d.HostEmail != "" { - writeICSLine(&b, "ORGANIZER;CN="+escapeICSParam(d.HostName)+":mailto:"+d.HostEmail) + orgName, orgEmail := d.HostName, d.HostEmail + if d.HideHostInInvite { + orgName, orgEmail = d.InviteOrganizerName, d.InviteOrganizerEmail + } + if orgEmail != "" { + writeICSLine(&b, "ORGANIZER;CN="+escapeICSParam(orgName)+":mailto:"+orgEmail) } if d.OrganizerEmail != "" { writeICSLine(&b, "ATTENDEE;CN="+escapeICSParam(d.OrganizerName)+";RSVP=TRUE:mailto:"+d.OrganizerEmail) diff --git a/internal/mailer/ics_test.go b/internal/mailer/ics_test.go index c0faa023..0d90d002 100644 --- a/internal/mailer/ics_test.go +++ b/internal/mailer/ics_test.go @@ -40,6 +40,24 @@ func TestBuildICS_cancel(t *testing.T) { } } +// A Calnode-sent invite exists to keep the host's address off the booker's calendar, so a +// missing sender identity must drop ORGANIZER, never quietly fall back to the host. +func TestBuildICS_hideHostNeverFallsBackToHost(t *testing.T) { + d := testBookingData() + d.HideHostInInvite = true + d.InviteOrganizerName, d.InviteOrganizerEmail = "Team", "bookings@team.example" + got := string(BuildICS(d, "REQUEST")) + if !strings.Contains(got, `ORGANIZER;CN="Team":mailto:bookings@team.example`) { + t.Errorf("ORGANIZER is not the instance sender:\n%s", got) + } + + d.InviteOrganizerName, d.InviteOrganizerEmail = "", "" + got = string(BuildICS(d, "REQUEST")) + if strings.Contains(got, "ORGANIZER") || strings.Contains(got, d.HostEmail) { + t.Errorf("with no sender identity the invite fell back to the host:\n%s", got) + } +} + func TestBuildICS_escapesText(t *testing.T) { d := testBookingData() d.EventTypeName = "Strategy, Planning; Q3" From 60574faffbc3ef8667492de822e96030080e7af6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Sep 2026 21:19:20 +0000 Subject: [PATCH 093/250] @jeroenrinzema has signed the CLA in Calnode/calnode#110 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index f0a06fc7..259a49c4 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -47,6 +47,14 @@ "created_at": "2026-09-25T09:44:52Z", "repoId": 1277491008, "pullRequestNo": 100 + }, + { + "name": "jeroenrinzema", + "id": 3440116, + "comment_id": 5899127144, + "created_at": "2026-09-29T21:19:11Z", + "repoId": 1277491008, + "pullRequestNo": 110 } ] } \ No newline at end of file From 4cc5c06295ade2d22caea0977980aa847851ba91 Mon Sep 17 00:00:00 2001 From: Jeroen Rinzema Date: Wed, 30 Sep 2026 00:05:32 +0200 Subject: [PATCH 094/250] fix(invites): address review on Calnode-sent invites - Host copies of a Calnode-invited booking no longer list the booker and go out as METHOD:PUBLISH, so no host calendar holds them as a re-invitable guest. - The invite mode travels on booking.Booking instead of a per-call lookup that failed open to 'calendar'. - inviteSenderReady defers the transport decision to the live mailer. - The API treats an empty invite_delivery as 'calendar', like the service. - The event type editor warns when Calnode mode is on but email is not. - Regression tests for reschedule, reassign and the reconciler. --- docs/ARCHITECTURE.md | 4 +- frontend/src/lib/api.ts | 3 + .../routes/event-types/[slug]/+page.svelte | 6 + internal/booking/booking.go | 3 + internal/booking/service.go | 25 ++-- internal/handler/booking_handler.go | 23 ++-- internal/handler/event_type.go | 30 +++-- internal/handler/invite_delivery.go | 67 ++++++----- .../handler/invite_delivery_internal_test.go | 113 +++++++++++++++++- internal/handler/manage_handler.go | 7 +- internal/handler/reassign.go | 6 +- internal/mailer/booking.go | 5 + internal/mailer/ics.go | 15 ++- internal/mailer/ics_test.go | 20 ++++ 14 files changed, 246 insertions(+), 81 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index fb11c298..8f7133b3 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -554,7 +554,9 @@ every provider reads as "no attendee", so nobody is emailed from a host's accoun always attaches Calnode's `.ics` to the booker's emails, with `ORGANIZER` set to the instance sender from Settings → Email (`applyInviteDelivery`, `BookingData.HideHostInInvite`). No sender address means no `ORGANIZER` line, never a fallback to the host. Host copies keep -the host as organizer. Reschedule, cancel, reassign and the reconciler read the mode from +the host as organizer and, for a `calnode` booking, leave the booker out entirely and go out as +`METHOD:PUBLISH` (`applyHostInvite`, `ICSWithoutAttendee`), so no host calendar holds them as +a guest it could re-invite. Reschedule, cancel, reassign and the reconciler read the mode from the **booking**, not the event type, so a booking is always updated through the channel its invite went out on. Switching an event type to `calnode` requires email to be set up (validated on change). diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index ad9d128e..03e94520 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -41,6 +41,9 @@ export type EventType = { * from the host's own address. 'calnode': Calnode's own invite, from the email sender * in Settings → Email, so no host's personal address reaches the booker. */ invite_delivery: 'calendar' | 'calnode'; + /** Whether Calnode can currently send invites (a sender and working email). Only + * returned on the single event type GET. */ + invite_sender_ready?: boolean; location_type: string; location_value?: string; buffer_before_minutes: number; diff --git a/frontend/src/routes/event-types/[slug]/+page.svelte b/frontend/src/routes/event-types/[slug]/+page.svelte index 595501dc..8243ff7c 100644 --- a/frontend/src/routes/event-types/[slug]/+page.svelte +++ b/frontend/src/routes/event-types/[slug]/+page.svelte @@ -743,6 +743,12 @@ {/if}

    + {#if form.invite_delivery === 'calnode' && et?.invite_sender_ready === false} +

    + Email isn't set up, so bookers won't receive an invite. Add a sender in + Settings → Email. +

    + {/if} diff --git a/internal/booking/booking.go b/internal/booking/booking.go index bcdc46b2..380fe499 100644 --- a/internal/booking/booking.go +++ b/internal/booking/booking.go @@ -44,6 +44,9 @@ type Booking struct { // ConfirmFailed reports whether the initial confirmation email failed (after // retry). Operator-visible via the booking JSON; see migration 00064. ConfirmFailed bool + // InviteDelivery is who sent this booking's invite (InviteByCalendar/InviteByCalnode), + // fixed at creation; reschedule, cancel and reassign follow it. + InviteDelivery string } // Attendee is a participant in a booking (the person who made the booking). diff --git a/internal/booking/service.go b/internal/booking/service.go index 60945577..29e7aa43 100644 --- a/internal/booking/service.go +++ b/internal/booking/service.go @@ -217,16 +217,17 @@ func (s *Service) Create(ctx context.Context, p CreateParams) (*Booking, error) nowT, _ := time.Parse(time.RFC3339Nano, now) return &Booking{ - ID: bookingID, - EventTypeID: p.EventTypeID, - HostID: chosenHost, - StartAt: p.StartAt.UTC(), - EndAt: p.EndAt.UTC(), - Status: "confirmed", - LocationValue: p.LocationValue, - LocationType: p.LocationType, - CreatedAt: nowT, - UpdatedAt: nowT, + ID: bookingID, + EventTypeID: p.EventTypeID, + HostID: chosenHost, + StartAt: p.StartAt.UTC(), + EndAt: p.EndAt.UTC(), + Status: "confirmed", + LocationValue: p.LocationValue, + LocationType: p.LocationType, + InviteDelivery: inviteDelivery, + CreatedAt: nowT, + UpdatedAt: nowT, }, nil } @@ -306,7 +307,7 @@ const bookingColumns = `id, event_type_id, host_id, start_at, end_at, status, COALESCE(cancellation_reason, ''), COALESCE(location_value, ''), created_at, updated_at, payment_status, amount_paid_cents, amount_paid_currency, location_type, - confirm_failed` + confirm_failed, invite_delivery` // hostBusy reports whether hostID has any non-cancelled booking overlapping // [start, end) — the double-booking invariant every write path (Create, Reschedule, @@ -675,7 +676,7 @@ func scanBooking(s scanner) (*Booking, error) { &b.CancellationReason, &b.LocationValue, &createdStr, &updatedStr, &b.PaymentStatus, &b.AmountPaidCents, &b.AmountPaidCurrency, &b.LocationType, - &confirmFailed, + &confirmFailed, &b.InviteDelivery, ) if err == sql.ErrNoRows { return nil, ErrNotFound diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 3253edf3..1c5ec351 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -1019,9 +1019,6 @@ type bookingConfirmationInput struct { // OrganizerLocale is the attendee's resolved locale code (e.g. "es") — same value // stored on booking_attendees.locale, threaded into the confirmation email. OrganizerLocale string - // InviteDelivery is the booking's stored invite mode; dispatchBookingConfirmation - // fills it from the booking row, so callers need not. - InviteDelivery string } // hostPrefsOrDefault loads a host's notification prefs, defaulting to allOnPrefs and @@ -1040,15 +1037,12 @@ func (h *Handler) hostPrefsOrDefault(ctx context.Context, bookingID, userID stri // hostBookingData returns a per-host copy of base with the fields every host // notification email needs filled in: the host's own name/email (so "with " -// reads correctly), whether to attach an ICS (only when that host has no connected -// destination calendar of their own), and the ICS sequence number. -func (h *Handler) hostBookingData(ctx context.Context, base mailer.BookingData, host assignedHost, updatedAt time.Time) mailer.BookingData { +// reads correctly), the host's own invite (applyHostInvite), and the ICS sequence number. +func (h *Handler) hostBookingData(ctx context.Context, base mailer.BookingData, host assignedHost, inviteMode string, updatedAt time.Time) mailer.BookingData { hd := base hd.HostName, hd.HostEmail = host.Name, host.Email - hd.AttachICS = h.noConnectedDestination(ctx, host.UserID) + h.applyHostInvite(ctx, &hd, inviteMode, host.UserID) hd.ICSSequence = int(updatedAt.Unix()) - // The host's own copy is organized by the host, whichever way the booker was invited. - hd.HideHostInInvite = false return hd } @@ -1204,7 +1198,7 @@ func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Book Start: b.StartAt, End: b.EndAt, OrganizerName: in.OrganizerName, - OrganizerEmail: calendarInvitee(in.InviteDelivery, in.OrganizerEmail), + OrganizerEmail: calendarInvitee(b.InviteDelivery, in.OrganizerEmail), AddMeet: autoGenMeet && host.IsPrimary, }) if err != nil { @@ -1246,7 +1240,7 @@ func (h *Handler) createHostEventsAndNotify(ctx context.Context, b *booking.Book primaryPrefs = prefs } if prefs.NotifyHostBooking { - hd := h.hostBookingData(ctx, *bData, host, b.UpdatedAt) + hd := h.hostBookingData(ctx, *bData, host, b.InviteDelivery, b.UpdatedAt) if livekitHostURL != "" { hd.LocationValue = livekitHostURL // host email gets the controls-enabled link } @@ -1292,7 +1286,6 @@ func sendWithRetry(ctx context.Context, logger *slog.Logger, bookingID, who stri func (h *Handler) dispatchBookingConfirmation(b *booking.Booking, in bookingConfirmationInput) { ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) defer cancel() - in.InviteDelivery = h.bookingInviteDelivery(ctx, b.ID) bData := mailer.BookingData{ BookingID: b.ID, EventTypeName: in.EventTypeName, @@ -1338,7 +1331,7 @@ func (h *Handler) dispatchBookingConfirmation(b *booking.Booking, in bookingConf // Attendee confirmation, once. "With:" names the primary host; gated on the // primary host's notification preference (matches prior behaviour). bData.HostName, bData.HostEmail = primaryHost(hosts).Name, primaryHost(hosts).Email - h.applyInviteDelivery(ctx, &bData, in.InviteDelivery, b.HostID) + h.applyInviteDelivery(ctx, &bData, b.InviteDelivery, b.HostID) bData.ICSSequence = int(b.UpdatedAt.Unix()) confirmFailed := hostFailed if primaryPrefs.NotifyConfirmation { @@ -1777,13 +1770,13 @@ func (h *Handler) cancelSideEffects(b booking.Booking) { d.HostName, d.HostEmail = host.Name, host.Email // attendee "With:" = primary host, not owner } if prefs.NotifyHostCancel { - hd := h.hostBookingData(ctx, d, host, b.UpdatedAt) + hd := h.hostBookingData(ctx, d, host, b.InviteDelivery, b.UpdatedAt) if err := mailer.SendCancellationToHost(ctx, h.mailer, hd); err != nil { h.logger.Error("booking cancellation email (host)", "error", err, "booking_id", b.ID, "host", host.UserID) } } } - h.applyInviteDelivery(ctx, &d, h.bookingInviteDelivery(ctx, b.ID), b.HostID) + h.applyInviteDelivery(ctx, &d, b.InviteDelivery, b.HostID) d.ICSSequence = int(b.UpdatedAt.Unix()) if primaryPrefs.NotifyCancellation { if err := mailer.SendCancellationToAttendee(ctx, h.mailer, d); err != nil { diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index 0f7e63cd..c0bf93ba 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -72,6 +72,11 @@ type eventTypeJSON struct { // contact for changes. Populated only for the host (read-only) GET case. OwnerName string `json:"owner_name,omitempty"` OwnerEmail string `json:"owner_email,omitempty"` + // InviteSenderReady reports, on the single-event-type GET, whether Calnode can + // currently deliver the invites it is set to send. False means email was removed + // after the event type switched to Calnode-sent invites: bookers get no invite until + // Settings → Email is fixed, so the editor warns. + InviteSenderReady bool `json:"invite_sender_ready"` } type rowScanner interface { @@ -303,15 +308,16 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { } inviteDelivery := booking.InviteByCalendar if req.InviteDelivery != nil { - if !validInviteDelivery(*req.InviteDelivery) { + mode, ok := normalizeInviteDelivery(*req.InviteDelivery) + if !ok { h.writeError(w, http.StatusBadRequest, "invite_delivery must be 'calendar' or 'calnode'") return } - if *req.InviteDelivery == booking.InviteByCalnode && !h.inviteSenderReady(r.Context()) { + if mode == booking.InviteByCalnode && !h.inviteSenderReady(r.Context()) { h.writeError(w, http.StatusBadRequest, errInviteSenderMissing.Error()) return } - inviteDelivery = *req.InviteDelivery + inviteDelivery = mode } id := uid.New() @@ -433,6 +439,7 @@ func (h *Handler) GetEventType(w http.ResponseWriter, r *http.Request) { et.OwnerName = ownerName et.OwnerEmail = ownerEmail } + et.InviteSenderReady = h.inviteSenderReady(r.Context()) if err := h.loadReminders(r.Context(), et.ID, et); err != nil { h.logger.ErrorContext(r.Context(), "get event type: load reminders", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") @@ -621,9 +628,14 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { } set("show_taken_slots", v) } - if req.InviteDelivery != nil && !validInviteDelivery(*req.InviteDelivery) { - h.writeError(w, http.StatusBadRequest, "invite_delivery must be 'calendar' or 'calnode'") - return + var newInviteDelivery string + if req.InviteDelivery != nil { + mode, ok := normalizeInviteDelivery(*req.InviteDelivery) + if !ok { + h.writeError(w, http.StatusBadRequest, "invite_delivery must be 'calendar' or 'calnode'") + return + } + newInviteDelivery = mode } if req.Archived != nil { if *req.Archived { @@ -740,12 +752,12 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { // Same on-change rule for invite delivery: switching to Calnode-sent invites needs a // working email sender (the invite IS an email), but an event type already set that // way stays saveable if email is later removed - that is fixed in Settings → Email. - if req.InviteDelivery != nil && *req.InviteDelivery != curInviteDelivery { - if *req.InviteDelivery == booking.InviteByCalnode && !h.inviteSenderReady(r.Context()) { + if newInviteDelivery != "" && newInviteDelivery != curInviteDelivery { + if newInviteDelivery == booking.InviteByCalnode && !h.inviteSenderReady(r.Context()) { h.writeError(w, http.StatusBadRequest, errInviteSenderMissing.Error()) return } - set("invite_delivery", *req.InviteDelivery) + set("invite_delivery", newInviteDelivery) } // The slug is the public booking URL, so renaming one that is already in circulation diff --git a/internal/handler/invite_delivery.go b/internal/handler/invite_delivery.go index 479be451..8b1cb77f 100644 --- a/internal/handler/invite_delivery.go +++ b/internal/handler/invite_delivery.go @@ -18,33 +18,30 @@ import ( // instance's sender identity (Settings → Email). No host's address reaches the booker, // and a team books under one name. // -// The mode is copied onto the booking when it is created and read from there afterwards, -// so a booking's reschedule and cancel follow the channel its invite actually went out on. +// The mode is copied onto the booking when it is created (booking.Booking.InviteDelivery) +// and read from there afterwards, so a booking's reschedule and cancel follow the channel +// its invite actually went out on. var errInviteSenderMissing = errors.New( "set up email in Settings → Email before letting Calnode send invites: the invite is delivered by email, from that sender") -func validInviteDelivery(v string) bool { - return v == booking.InviteByCalendar || v == booking.InviteByCalnode -} - -// bookingInviteDelivery returns the invite delivery a booking was created with. A lookup -// failure reads as InviteByCalendar, the behaviour every booking had before the setting -// existed. -func (h *Handler) bookingInviteDelivery(ctx context.Context, bookingID string) string { - var mode string - if err := h.db.QueryRowContext(ctx, - `SELECT invite_delivery FROM bookings WHERE id = ?`, bookingID).Scan(&mode); err != nil { - h.logger.ErrorContext(ctx, "load booking invite delivery", "error", err, "booking_id", bookingID) - return booking.InviteByCalendar +// normalizeInviteDelivery maps the API value to a stored mode. Empty means the default, +// matching booking.CreateParams; anything else unknown is rejected. +func normalizeInviteDelivery(v string) (string, bool) { + switch v { + case "", booking.InviteByCalendar: + return booking.InviteByCalendar, true + case booking.InviteByCalnode: + return booking.InviteByCalnode, true } - return mode + return "", false } -// calendarInvitee is the guest to put on a host's calendar event: the booker when the -// hosts' calendars send the invite, nobody when Calnode does. An empty address is what -// every provider (Google, Microsoft, CalDAV) reads as "no attendee", so the provider has -// no one to email and the event stays private to the host. +// calendarInvitee is the address passed as CreateEventParams.OrganizerEmail for a host's +// calendar event: the booker when the hosts' calendars send the invite, "" when Calnode +// does. Google and Microsoft add that address as the event's attendee, so "" leaves them +// no one to email and the event private to the host. CalDAV never sends invites; there it +// only decides whether the stored event names the booker at all. func calendarInvitee(mode, bookerEmail string) string { if mode == booking.InviteByCalnode { return "" @@ -64,22 +61,17 @@ func (h *Handler) inviteSender(ctx context.Context) (name, email string) { return name, email } -// inviteSenderReady reports whether Calnode can deliver invites itself: a sender address -// and a transport (SMTP host or Resend API key) are configured. Checked when an event type -// switches to InviteByCalnode, since with no email there is no invite at all. +// inviteSenderReady reports whether Calnode can deliver invites itself: a sender address, +// and a mailer that actually sends (the transport choice stays BuildMailer's alone). +// Checked when an event type switches to InviteByCalnode, since with no email there is +// no invite at all. func (h *Handler) inviteSenderReady(ctx context.Context) bool { - var from, host, resendKey string - if err := h.db.QueryRowContext(ctx, - `SELECT email_from, smtp_host, resend_api_key_enc FROM server_settings WHERE id = 1`). - Scan(&from, &host, &resendKey); err != nil { - h.logger.ErrorContext(ctx, "check invite sender", "error", err) - return false - } - return from != "" && (host != "" || resendKey != "") + _, from := h.inviteSender(ctx) + return from != "" && h.isEmailEnabled() } -// applyInviteDelivery prepares an attendee-facing email's .ics for the booking's invite -// mode. Calnode-sent: always attach, organized by the instance sender, never the host. +// applyInviteDelivery prepares the booker's email .ics for the booking's invite mode. +// Calnode-sent: always attach, organized by the instance sender, never the host. // Calendar-sent: attach only when the primary host's calendar will not invite the booker // itself (noConnectedDestination), with the host as organizer, exactly as before. func (h *Handler) applyInviteDelivery(ctx context.Context, d *mailer.BookingData, mode, primaryHostID string) { @@ -91,3 +83,12 @@ func (h *Handler) applyInviteDelivery(ctx context.Context, d *mailer.BookingData } d.AttachICS = h.noConnectedDestination(ctx, primaryHostID) } + +// applyHostInvite turns booking email data into one host's own copy: organized by that +// host, attached only when their calendar does not already hold the event, and - for a +// Calnode-invited booking - without the booker as a guest (see ICSWithoutAttendee). +func (h *Handler) applyHostInvite(ctx context.Context, d *mailer.BookingData, mode, hostID string) { + d.HideHostInInvite = false + d.ICSWithoutAttendee = mode == booking.InviteByCalnode + d.AttachICS = h.noConnectedDestination(ctx, hostID) +} diff --git a/internal/handler/invite_delivery_internal_test.go b/internal/handler/invite_delivery_internal_test.go index 72b3edd4..f5ecc4e8 100644 --- a/internal/handler/invite_delivery_internal_test.go +++ b/internal/handler/invite_delivery_internal_test.go @@ -197,7 +197,8 @@ func (f *inviteFixture) waitFor(t *testing.T, addr string, n int) *mailer.Messag func icsOf(m *mailer.Message) string { for _, a := range m.Attachments { if strings.HasPrefix(a.ContentType, "text/calendar") { - return string(a.Content) + // Unfold RFC 5545 continuation lines so assertions see whole properties. + return strings.ReplaceAll(string(a.Content), "\r\n ", "") } } return "" @@ -318,3 +319,113 @@ func TestInviteDelivery_requiresEmailSender(t *testing.T) { t.Errorf("unknown invite_delivery: %d; want 400", rec.Code) } } + +// assertWorkspaceInvite fails unless ics is a Calnode-organized invite of the given method +// that carries none of the listed host addresses. +func assertWorkspaceInvite(t *testing.T, what, ics, method string, hostAddrs ...string) { + t.Helper() + if !strings.Contains(ics, "METHOD:"+method) { + t.Fatalf("%s: no %s invite; with the host's calendar silenced it is the booker's only update:\n%s", what, method, ics) + } + if !strings.Contains(ics, "mailto:"+inviteSenderEmail) { + t.Errorf("%s: invite not organized by the workspace sender:\n%s", what, ics) + } + for _, a := range hostAddrs { + if strings.Contains(ics, a) { + t.Errorf("%s: invite carries host address %s:\n%s", what, a, ics) + } + } +} + +func (f *inviteFixture) calnodeBooking(t *testing.T) (*booking.Booking, string) { + t.Helper() + if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + id, _ := f.book(t, "intro") + b, err := f.h.bookingSvc.Get(context.Background(), id) + if err != nil { + t.Fatalf("get booking: %v", err) + } + if b.InviteDelivery != booking.InviteByCalnode { + t.Fatalf("booking invite_delivery = %q; want calnode copied from the event type", b.InviteDelivery) + } + return b, b.EventTypeID +} + +// A reschedule must reach the booker as Calnode's updated invite, since the host's +// calendar event (moved silently) never listed them. +func TestInviteDelivery_rescheduleSendsWorkspaceInvite(t *testing.T) { + f := newInviteFixture(t, true) + b, etID := f.calnodeBooking(t) + + newStart := b.StartAt.Add(24 * time.Hour) + updated, err := f.h.bookingSvc.Reschedule(context.Background(), b.ID, newStart, newStart.Add(30*time.Minute)) + if err != nil { + t.Fatalf("reschedule: %v", err) + } + f.h.rescheduleSideEffects(*updated, etID, b.StartAt, b.EndAt) + + ics := icsOf(f.waitFor(t, inviteBookerEmail, 2)) + assertWorkspaceInvite(t, "reschedule", ics, "REQUEST", inviteHostEmail) + if !strings.Contains(ics, "DTSTART:"+newStart.UTC().Format("20060102T150405Z")) { + t.Errorf("reschedule invite does not carry the new time:\n%s", ics) + } +} + +// Reassigning moves the event to the new host's calendar without inviting the booker +// there, and re-issues Calnode's invite: neither host's address reaches the booker. +func TestInviteDelivery_reassignKeepsBothHostsPrivate(t *testing.T) { + f := newInviteFixture(t, true) + b, _ := f.calnodeBooking(t) + + const newHostEmail = "colleague@host.example" + if _, err := f.h.db.Exec(`INSERT INTO users (id, email, name, iana_timezone, is_admin, created_at) + VALUES ('host-2', ?, 'Colleague', 'UTC', 0, '2026-01-01T00:00:00Z')`, newHostEmail); err != nil { + t.Fatalf("seed second host: %v", err) + } + if _, err := f.h.db.Exec(`INSERT INTO calendar_connections + (id, user_id, provider, access_token_enc, calendar_id, check_conflicts, is_destination, created_at) + VALUES ('conn-2', 'host-2', 'google', 'e', 'primary', 1, 1, '2026-01-01T00:00:00Z')`); err != nil { + t.Fatalf("seed second host calendar: %v", err) + } + req := httptest.NewRequest(http.MethodPost, "/v1/bookings/"+b.ID+"/reassign", strings.NewReader(`{"host_id":"host-2"}`)) + req.SetPathValue("id", b.ID) + req.Header.Set("X-API-Key", f.apiKey) + rec := httptest.NewRecorder() + f.h.RequireAuth(f.h.ReassignBooking)(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("reassign: %d — %s", rec.Code, rec.Body.String()) + } + + assertWorkspaceInvite(t, "reassign", icsOf(f.waitFor(t, inviteBookerEmail, 2)), "REQUEST", + inviteHostEmail, newHostEmail) + events := f.cal.events() + if len(events) != 2 || events[1].OrganizerEmail != "" { + t.Errorf("new host's calendar events = %+v; want the moved event created without the booker", events) + } +} + +// The reconciler re-creates a host event whose inline create failed; for a Calnode +// booking it must not add the booker, or the provider would invite them after all. +func TestInviteDelivery_reconcilerHealsWithoutInvitingBooker(t *testing.T) { + f := newInviteFixture(t, true) + b, _ := f.calnodeBooking(t) + + if _, err := f.h.db.Exec(`UPDATE booking_hosts SET external_event_id = NULL WHERE booking_id = ?`, b.ID); err != nil { + t.Fatal(err) + } + if _, err := f.h.db.Exec(`UPDATE bookings SET created_at = ? WHERE id = ?`, + time.Now().UTC().Add(-time.Hour).Format(time.RFC3339), b.ID); err != nil { + t.Fatal(err) + } + f.h.reconcileCreations(context.Background(), f.h.getCal()) + + events := f.cal.events() + if len(events) != 2 { + t.Fatalf("host calendar events = %d; want the missing one re-created", len(events)) + } + if events[1].OrganizerEmail != "" { + t.Errorf("healed event invites %q; want no guest", events[1].OrganizerEmail) + } +} diff --git a/internal/handler/manage_handler.go b/internal/handler/manage_handler.go index a884de22..c6adaabe 100644 --- a/internal/handler/manage_handler.go +++ b/internal/handler/manage_handler.go @@ -314,7 +314,7 @@ func (h *Handler) rescheduleSideEffects(bCopy booking.Booking, capturedEtID stri if tok, err := h.bookingSvc.RotateManageToken(ctx, bCopy.ID); err == nil { d.ManageURL = h.publicURL() + "/manage/" + tok } - h.applyInviteDelivery(ctx, &d, h.bookingInviteDelivery(ctx, bCopy.ID), bCopy.HostID) + h.applyInviteDelivery(ctx, &d, bCopy.InviteDelivery, bCopy.HostID) d.ICSSequence = int(bCopy.UpdatedAt.Unix()) prefs := h.hostPrefsOrDefault(ctx, bCopy.ID, bCopy.HostID) @@ -333,11 +333,8 @@ func (h *Handler) rescheduleSideEffects(bCopy booking.Booking, capturedEtID stri } } if prefs.NotifyHostReschedule { - // The host's copy keeps the host as organizer and attaches only when the host has - // no calendar of their own holding the event, whoever invited the booker. hd := d - hd.HideHostInInvite = false - hd.AttachICS = h.noConnectedDestination(ctx, bCopy.HostID) + h.applyHostInvite(ctx, &hd, bCopy.InviteDelivery, bCopy.HostID) if err := mailer.SendRescheduleToHost(ctx, h.mailer, hd); err != nil { h.logger.Error("reschedule email (host)", "error", err, "booking_id", bCopy.ID) } diff --git a/internal/handler/reassign.go b/internal/handler/reassign.go index 8def7608..2a7b893b 100644 --- a/internal/handler/reassign.go +++ b/internal/handler/reassign.go @@ -158,7 +158,7 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { // Move the Google Calendar event: remove from the old host, recreate on // the new host, and persist the new event ID (clearing it if recreation // produced nothing, e.g. the new host has no destination calendar). - inviteMode := h.bookingInviteDelivery(ctx, bCopy.ID) + inviteMode := bCopy.InviteDelivery if gc := h.getCal(); gc != nil { if extEventID != "" { // Reassignment cancels on the OLD host's calendar. Their stamped provider @@ -221,8 +221,8 @@ func (h *Handler) ReassignBooking(w http.ResponseWriter, r *http.Request) { } if prefs.NotifyHostBooking { hd := d - hd.HideHostInInvite = false - hd.AttachICS = false + h.applyHostInvite(ctx, &hd, inviteMode, newHostID) + hd.ICSSequence = int(time.Now().Unix()) if err := mailer.SendConfirmationToHost(ctx, h.mailer, hd); err != nil { h.logger.Error("reassign: email new host", "error", err, "booking_id", bCopy.ID) } diff --git a/internal/mailer/booking.go b/internal/mailer/booking.go index 6f64df48..7791b310 100644 --- a/internal/mailer/booking.go +++ b/internal/mailer/booking.go @@ -47,6 +47,11 @@ type BookingData struct { HideHostInInvite bool InviteOrganizerName string InviteOrganizerEmail string + // ICSWithoutAttendee leaves the booker out of the .ics and sends it as PUBLISH: a + // host's own copy of a Calnode-invited booking. The host's calendar client must never + // hold the booker as a guest, or editing the entry there could re-invite them from the + // host's personal account - the very thing Calnode-sent invites avoid. + ICSWithoutAttendee bool // Branding — instance-wide, threaded in by the handler. BrandName is the // wordmark/footer name (falls back to "Calnode" when empty); LogoURL is an // optional absolute https image shown in the HTML email header. diff --git a/internal/mailer/ics.go b/internal/mailer/ics.go index 6530ecc1..c788405f 100644 --- a/internal/mailer/ics.go +++ b/internal/mailer/ics.go @@ -21,6 +21,7 @@ func BuildICS(d BookingData, method string) []byte { if method == "CANCEL" { status = "CANCELLED" } + method = d.icsMethod(method) stamp := time.Now().UTC().Format(icsTimeLayout) var b strings.Builder @@ -51,7 +52,7 @@ func BuildICS(d BookingData, method string) []byte { if orgEmail != "" { writeICSLine(&b, "ORGANIZER;CN="+escapeICSParam(orgName)+":mailto:"+orgEmail) } - if d.OrganizerEmail != "" { + if d.OrganizerEmail != "" && !d.ICSWithoutAttendee { writeICSLine(&b, "ATTENDEE;CN="+escapeICSParam(d.OrganizerName)+";RSVP=TRUE:mailto:"+d.OrganizerEmail) } writeICSLine(&b, "STATUS:"+status) @@ -67,11 +68,21 @@ const icsTimeLayout = "20060102T150405Z" func icsAttachment(d BookingData, method string) Attachment { return Attachment{ Filename: "invite.ics", - ContentType: "text/calendar; charset=utf-8; method=" + method, + ContentType: "text/calendar; charset=utf-8; method=" + d.icsMethod(method), Content: BuildICS(d, method), } } +// icsMethod is the iTIP method actually sent. A copy without the attendee is a plain +// calendar entry, which is PUBLISH (RFC 5546 §3.2.1): REQUEST and CANCEL are addressed to +// attendees, and a client handed a REQUEST with none may try to invite them itself. +func (d BookingData) icsMethod(method string) string { + if d.ICSWithoutAttendee { + return "PUBLISH" + } + return method +} + // escapeICSText escapes a value for an iCalendar TEXT field (RFC 5545 §3.3.11). func escapeICSText(s string) string { s = strings.ReplaceAll(s, `\`, `\\`) diff --git a/internal/mailer/ics_test.go b/internal/mailer/ics_test.go index 0d90d002..bc863325 100644 --- a/internal/mailer/ics_test.go +++ b/internal/mailer/ics_test.go @@ -58,6 +58,26 @@ func TestBuildICS_hideHostNeverFallsBackToHost(t *testing.T) { } } +// A host's own copy of a Calnode-invited booking must never list the booker: a calendar +// client holding them as a guest could re-invite them from the host's own account. +func TestICSAttachment_withoutAttendeeIsPublish(t *testing.T) { + d := testBookingData() + d.ICSWithoutAttendee = true + for _, method := range []string{"REQUEST", "CANCEL"} { + a := icsAttachment(d, method) + got := string(a.Content) + if strings.Contains(got, "ATTENDEE") || strings.Contains(got, d.OrganizerEmail) { + t.Errorf("%s: host copy lists the booker:\n%s", method, got) + } + if !strings.Contains(got, "METHOD:PUBLISH") || !strings.HasSuffix(a.ContentType, "method=PUBLISH") { + t.Errorf("%s: attendee-less copy not sent as PUBLISH (content type %q):\n%s", method, a.ContentType, got) + } + } + if got := string(BuildICS(d, "CANCEL")); !strings.Contains(got, "STATUS:CANCELLED") { + t.Errorf("a cancelled host copy lost STATUS:CANCELLED:\n%s", got) + } +} + func TestBuildICS_escapesText(t *testing.T) { d := testBookingData() d.EventTypeName = "Strategy, Planning; Q3" From dd014f69962b9cf70906c13bf94f16a0786118fe Mon Sep 17 00:00:00 2001 From: Jeroen Rinzema Date: Tue, 29 Sep 2026 23:23:02 +0200 Subject: [PATCH 095/250] feat(invites): record bookers' RSVPs through Resend inbound email For event types whose invite Calnode sends: each invite is organized by a private per-booking reply address (rsvp+@). The booker's Yes/No/Maybe reply reaches Resend, which posts email.received to POST /v1/email/inbound/resend. Calnode verifies the Svix signature, fetches the message, reads the iTIP REPLY and records the answer on the booking, firing a booking.rsvp webhook when it changes. An answer counts only when the signature, the booking's UID and the booker's address all match. The organizer is fixed per booking at its first send so later updates keep matching, and existing Calnode-invited bookings are backfilled with the sender they went out with. --- CHANGELOG.md | 4 + DEPLOY.md | 16 ++ docs/ARCHITECTURE.md | 16 ++ frontend/src/lib/api.ts | 8 + frontend/src/routes/bookings/+page.svelte | 7 + .../src/routes/settings/email/+page.svelte | 64 +++++ frontend/src/routes/webhooks/+page.svelte | 2 + internal/db/migrations/00069_invite_rsvp.sql | 40 +++ internal/handler/booking_handler.go | 21 +- internal/handler/email_settings.go | 56 +++- internal/handler/invite_delivery.go | 48 +++- internal/handler/rsvp_inbound.go | 255 ++++++++++++++++++ .../handler/rsvp_inbound_internal_test.go | 192 +++++++++++++ internal/handler/webhook_handler.go | 2 +- internal/mailer/itip.go | 210 +++++++++++++++ internal/mailer/resend_inbound.go | 138 ++++++++++ internal/mailer/resend_inbound_test.go | 129 +++++++++ internal/server/server.go | 3 + internal/webhook/webhook.go | 9 +- 19 files changed, 1206 insertions(+), 14 deletions(-) create mode 100644 internal/db/migrations/00069_invite_rsvp.sql create mode 100644 internal/handler/rsvp_inbound.go create mode 100644 internal/handler/rsvp_inbound_internal_test.go create mode 100644 internal/mailer/itip.go create mode 100644 internal/mailer/resend_inbound.go create mode 100644 internal/mailer/resend_inbound_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a7c2a02..39d45e84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad so no host's personal address reaches them, and a team can book under one name. Hosts still get the meeting, with its Meet/Teams link, on their own calendar. Needs email set up. Existing bookings keep the way they were invited. +- **RSVP tracking for invites Calnode sends.** With Resend receiving set up (Settings → + Email → RSVP tracking), a booker's Yes / No / Maybe is read from their calendar reply, + shown on the booking, and sent as a new `booking.rsvp` webhook event. Each invite gets a + private reply address, and an answer only counts when it comes from that booking's booker. ## [0.10.1] - 2026-09-29 diff --git a/DEPLOY.md b/DEPLOY.md index 9956f710..6d59f380 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -127,6 +127,22 @@ API key takes precedence over the SMTP fields; clearing it ("Remove key") switch > Email settings are stored **per instance** in that instance's DB — staging/prod/local each need their own. +### RSVP tracking (optional, Resend only) + +For event types whose calendar invite is **sent by Calnode** (event type → Calendar invite), +Calnode can record whether the booker accepted, declined or said maybe. The answer shows on +the booking and fires a `booking.rsvp` webhook. + +1. In Resend, set up **receiving** on a subdomain, e.g. `reply.yourdomain` (one MX record). + Use a subdomain: the MX record would take over your main domain's mail. +2. In Resend → Webhooks, add `https:///v1/email/inbound/resend` for the + `email.received` event and copy its signing secret (`whsec_…`). +3. Settings → Email → RSVP tracking: enter an address on that subdomain (e.g. + `rsvp@reply.yourdomain`) and the signing secret. It also needs the Resend API key above. + +Each invite is organized by its own private variant of that address, so no mailbox has to +exist. Bookings made before you switch it on keep the organizer they were invited with. + --- ## 5. Google OAuth (sign-in + calendar) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 8f7133b3..31f306c7 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -561,6 +561,22 @@ the **booking**, not the event type, so a booking is always updated through the its invite went out on. Switching an event type to `calnode` requires email to be set up (validated on change). +**RSVPs to Calnode-sent invites (migration 00069, `rsvp_inbound.go`).** A booker's +Yes/No/Maybe is an iTIP `REPLY` their mail client emails to the invite's `ORGANIZER`. Each +booking's organizer address is fixed at its first send (`bookings.invite_organizer`, +`bookingInviteOrganizer`), because clients match later updates by UID *and* organizer. With +RSVP tracking set up (Settings → Email: an address on a Resend receiving domain, the +webhook signing secret, and a Resend API key) that address is private per booking, +`rsvp+<128-bit token>@domain`. Resend posts `email.received` to +`POST /v1/email/inbound/resend`; the handler verifies the Svix signature +(`mailer.VerifyResendWebhook`), routes by recipient to the booking, downloads the raw +message (`mailer.FetchReceivedRaw`), parses the `REPLY` (`mailer.ParseICSReply`), and +records the answer on `booking_attendees.rsvp_status` only if the UID is that booking's +and the answering attendee is its booker. A changed answer fires `booking.rsvp`. It +answers 200 to anything it will not act on and 5xx only when the fetch failed, so Resend +retries exactly what a retry can fix. Hosts' calendar events are not updated with the +answer: no provider has an "edit event" write op yet. + **Adding another provider (Apple/iCloud, CalDAV):** implement `calendar.Provider`, register it in `internal/server`, set `InvitesGuests()` correctly (drives the `.ics` gate above), and extend `providerMintsPlatform`/`CanAutoGenerate` if it offers a diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 03e94520..962fc57a 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -110,6 +110,8 @@ export type Booking = { payment_status?: 'pending' | 'paid' | 'refunded'; amount_paid_cents?: number; amount_paid_currency?: string; + /** The booker's RSVP to a Calnode-sent invite; absent until an answer arrives. */ + rsvp_status?: 'accepted' | 'declined' | 'tentative'; }; export type APIKey = { @@ -188,6 +190,12 @@ export type EmailSettings = { // being delivered over SMTP" can differ, so the server reports the live answer. transport: 'none' | 'smtp' | 'resend_api'; enabled: boolean; + /** RSVP tracking for invites Calnode sends: the Resend inbound address RSVPs are routed + * through (e.g. rsvp@reply.example.com). */ + rsvp_address: string; + resend_webhook_secret_set: boolean; // never returned directly + /** True when address, webhook secret and Resend API key are all present. */ + rsvp_tracking: boolean; }; export type GoogleSettings = { diff --git a/frontend/src/routes/bookings/+page.svelte b/frontend/src/routes/bookings/+page.svelte index 099b3785..35debba5 100644 --- a/frontend/src/routes/bookings/+page.svelte +++ b/frontend/src/routes/bookings/+page.svelte @@ -443,6 +443,13 @@ {:else if b.payment_status === 'pending'} unpaid {/if} + {#if b.status === 'confirmed' && b.rsvp_status === 'accepted'} + guest accepted + {:else if b.status === 'confirmed' && b.rsvp_status === 'tentative'} + guest maybe + {:else if b.status === 'confirmed' && b.rsvp_status === 'declined'} + guest declined + {/if} diff --git a/frontend/src/routes/settings/email/+page.svelte b/frontend/src/routes/settings/email/+page.svelte index f5fc2ea4..0a66b4cb 100644 --- a/frontend/src/routes/settings/email/+page.svelte +++ b/frontend/src/routes/settings/email/+page.svelte @@ -27,6 +27,10 @@ // Distinct from "the field is blank": blank means keep the stored key, this means // deliberately remove it and go back to SMTP. let clearResendKey = $state(false); + // RSVP tracking (Resend inbound) for invites Calnode sends itself. + let rsvpAddress = $state(''); + let webhookSecret = $state(''); + let webhookUrl = $state(''); let userEmail = $state(''); @@ -53,6 +57,8 @@ smtpStartTLS = email.smtp_starttls; emailFrom = email.email_from; emailFromName = email.email_from_name || 'Calnode'; + rsvpAddress = email.rsvp_address ?? ''; + webhookUrl = `${window.location.origin}/v1/email/inbound/resend`; }, 'Could not load email settings')); async function save() { @@ -66,9 +72,13 @@ // Omit the key entirely to keep the stored one; send "" only to clear it. if (resendApiKey) body.resend_api_key = resendApiKey; else if (clearResendKey) body.resend_api_key = ''; + body.rsvp_address = rsvpAddress.trim(); + // Like the API key: omit to keep the stored secret. + if (webhookSecret) body.resend_webhook_secret = webhookSecret.trim(); emailSettings = await api.patch('/v1/settings/email', body); smtpPass = ''; resendApiKey = ''; + webhookSecret = ''; clearResendKey = false; toast.success('Email settings saved'); }, 'Could not save email settings'); @@ -224,6 +234,60 @@ + +
    +
    +
    +

    RSVP tracking

    +

    + For event types whose invites Calnode sends. Bookers' Yes / No / Maybe comes back + through Resend and shows on the booking. +

    +
    + {#if emailSettings !== null} + + + {emailSettings.rsvp_tracking ? 'On' : 'Off'} + + {/if} +
    + + {#if !emailSettings?.resend_api_key_set} +

    + Needs a Resend API key above: Calnode uses it to read the replies. +

    + {/if} + +
    +
    + + +

    + An address on a domain Resend receives email for. Each invite gets its own private + variant of it, so answers find their booking. +

    +
    +
    + + +

    + Add this in Resend → Webhooks for the email.received event. +

    +
    +
    + + +
    +
    + +
    + +
    +
    {/if} diff --git a/frontend/src/routes/webhooks/+page.svelte b/frontend/src/routes/webhooks/+page.svelte index ed4eb83b..1dc67e78 100644 --- a/frontend/src/routes/webhooks/+page.svelte +++ b/frontend/src/routes/webhooks/+page.svelte @@ -18,6 +18,7 @@ 'booking.created', 'booking.cancelled', 'booking.rescheduled', + 'booking.rsvp', 'recording.completed', 'transcript.ready', 'notes.ready' @@ -37,6 +38,7 @@ { key: 'cancellation_reason', label: 'Cancellation reason' }, { key: 'previous_start_at', label: 'Previous start (reschedule)' }, { key: 'previous_end_at', label: 'Previous end (reschedule)' }, + { key: 'rsvp_status', label: 'RSVP answer (booking.rsvp)' }, ] }, { group: 'Payment', fields: [ { key: 'payment_status', label: 'Payment status' }, diff --git a/internal/db/migrations/00069_invite_rsvp.sql b/internal/db/migrations/00069_invite_rsvp.sql new file mode 100644 index 00000000..b4f599df --- /dev/null +++ b/internal/db/migrations/00069_invite_rsvp.sql @@ -0,0 +1,40 @@ +-- +goose Up +-- RSVPs for invites Calnode sends itself (invite_delivery = 'calnode', migration 00068). +-- +-- A booker's Yes/No/Maybe is an iTIP REPLY that their mail client emails to the invite's +-- ORGANIZER. With Resend's inbound email configured, that organizer is a per-booking reply +-- address (rsvp+@); Resend receives the reply, calls +-- POST /v1/email/inbound/resend, and Calnode records the answer on the booking. + +-- The inbound address RSVPs are routed through (e.g. rsvp@reply.example.com). Empty = RSVP +-- tracking off: Calnode-sent invites are organized by the plain email sender, as before. +ALTER TABLE server_settings ADD COLUMN rsvp_address TEXT NOT NULL DEFAULT ''; +-- Signing secret of the Resend webhook ("whsec_..."), encrypted like the other email secrets. +ALTER TABLE server_settings ADD COLUMN resend_webhook_secret_enc TEXT NOT NULL DEFAULT ''; + +-- The ORGANIZER address a booking's invite went out with, fixed at the first send. Calendar +-- clients match a later reschedule or cancellation by UID and organizer, so it must never +-- change mid-lifecycle - not when the sender address is edited, and not when RSVP tracking +-- is switched on after the booking was made. A per-booking reply address is also how an +-- incoming RSVP finds its booking. Empty for bookings whose invite Calnode never sent. +ALTER TABLE bookings ADD COLUMN invite_organizer TEXT NOT NULL DEFAULT ''; +CREATE INDEX IF NOT EXISTS idx_bookings_invite_organizer ON bookings (invite_organizer) + WHERE invite_organizer != ''; +-- Calnode-invited bookings made before this migration already went out organized by the +-- sender address, so that is their fixed organizer. Without this their next update would +-- mint a reply address and arrive from an organizer the booker's calendar has never seen. +UPDATE bookings SET invite_organizer = (SELECT email_from FROM server_settings WHERE id = 1) +WHERE invite_delivery = 'calnode'; + +-- The booker's latest answer, iCalendar PARTSTAT values in lower case. +ALTER TABLE booking_attendees ADD COLUMN rsvp_status TEXT NOT NULL DEFAULT 'needs-action' + CHECK (rsvp_status IN ('needs-action', 'accepted', 'declined', 'tentative')); +ALTER TABLE booking_attendees ADD COLUMN rsvp_at TEXT; + +-- +goose Down +DROP INDEX IF EXISTS idx_bookings_invite_organizer; +ALTER TABLE booking_attendees DROP COLUMN rsvp_at; +ALTER TABLE booking_attendees DROP COLUMN rsvp_status; +ALTER TABLE bookings DROP COLUMN invite_organizer; +ALTER TABLE server_settings DROP COLUMN resend_webhook_secret_enc; +ALTER TABLE server_settings DROP COLUMN rsvp_address; diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 1c5ec351..02a7ef99 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -616,9 +616,12 @@ type bookingJSON struct { AmountPaidCurrency string `json:"amount_paid_currency,omitempty" jsonschema:"ISO 4217 currency of the charge (lowercase)"` // ConfirmFailed flags a booking whose initial confirmation email failed after // retry — operator-visible so a lost confirmation can be followed up manually. - ConfirmFailed bool `json:"confirm_failed,omitempty"` - Attendees []attendeeJSON `json:"attendees,omitempty"` - Hosts []hostBrief `json:"hosts,omitempty"` // assigned host(s) for display; set on the public create response + ConfirmFailed bool `json:"confirm_failed,omitempty"` + // RSVPStatus is the booker's answer to a Calnode-sent invite ("accepted", "declined", + // "tentative"), absent until one arrives. Admin list views only. + RSVPStatus string `json:"rsvp_status,omitempty"` + Attendees []attendeeJSON `json:"attendees,omitempty"` + Hosts []hostBrief `json:"hosts,omitempty"` // assigned host(s) for display; set on the public create response } // hostBrief is an assigned host's identity for the booking-confirmation screen. @@ -1579,6 +1582,15 @@ func (h *Handler) enrichBookings(ctx context.Context, bookings []booking.Booking } } + // The booker's RSVP to a Calnode-sent invite, once one has arrived. + if err := h.scanPairs(ctx, bookingRSVPQuery, ids, func(bid, val string) { + if i, ok := idxByID[bid]; ok { + items[i].RSVPStatus = val + } + }); err != nil { + return nil, err + } + // Organizer attendee. Three columns, so it doesn't fit scanPairs; ph is a generated // run of "?" and every id is bound. rows, err := h.db.QueryContext(ctx, // #nosec G701 -- ph is placeholders(), a generated run of "?"; every value is bound via ids..., never concatenated into the SQL text @@ -1618,6 +1630,9 @@ const ( bookingHostNamesQuery pairQuery = `SELECT b.id, COALESCE(u.name, '') FROM bookings b LEFT JOIN users u ON u.id = b.host_id WHERE b.id IN (%s)` + + bookingRSVPQuery pairQuery = `SELECT a.booking_id, a.rsvp_status FROM booking_attendees a + WHERE a.is_organizer = 1 AND a.rsvp_status != 'needs-action' AND a.booking_id IN (%s)` ) // placeholders returns "?,?,?" for n, for an IN clause. n must be positive. diff --git a/internal/handler/email_settings.go b/internal/handler/email_settings.go index 80a13bc7..08f407db 100644 --- a/internal/handler/email_settings.go +++ b/internal/handler/email_settings.go @@ -9,6 +9,7 @@ import ( "net" "net/http" "strconv" + "strings" "time" "github.com/calnode/calnode/internal/mailer" @@ -139,14 +140,15 @@ func (h *Handler) GetEmailSettings(w http.ResponseWriter, r *http.Request) { if _, ok := h.requireAdmin(w, r); !ok { return } - var host, port, user, passEnc, from, fromName, resendEnc string + var host, port, user, passEnc, from, fromName, resendEnc, rsvpAddr, webhookSecretEnc string var smtpTLS, startTLS int err := h.db.QueryRowContext(r.Context(), ` SELECT smtp_host, smtp_port, smtp_user, smtp_pass_enc, smtp_tls, smtp_starttls, email_from, email_from_name, - resend_api_key_enc + resend_api_key_enc, rsvp_address, resend_webhook_secret_enc FROM server_settings WHERE id = 1`). - Scan(&host, &port, &user, &passEnc, &smtpTLS, &startTLS, &from, &fromName, &resendEnc) + Scan(&host, &port, &user, &passEnc, &smtpTLS, &startTLS, &from, &fromName, &resendEnc, + &rsvpAddr, &webhookSecretEnc) if err != nil && err != sql.ErrNoRows { h.logger.ErrorContext(r.Context(), "email settings: query", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") @@ -167,6 +169,11 @@ func (h *Handler) GetEmailSettings(w http.ResponseWriter, r *http.Request) { "resend_api_key_set": resendEnc != "", "transport": string(transport), "enabled": h.isEmailEnabled(), + // RSVP tracking for Calnode-sent invites (Resend inbound). Active only with all + // three of the address, the webhook secret and a Resend API key. + "rsvp_address": rsvpAddr, + "resend_webhook_secret_set": webhookSecretEnc != "", + "rsvp_tracking": rsvpAddr != "" && webhookSecretEnc != "" && resendEnc != "", }) } @@ -179,11 +186,15 @@ type emailSecret int const ( secretSMTPPass emailSecret = iota secretResendAPIKey + secretResendWebhook ) func (s emailSecret) String() string { - if s == secretResendAPIKey { + switch s { + case secretResendAPIKey: return "resend_api_key_enc" + case secretResendWebhook: + return "resend_webhook_secret_enc" } return "smtp_pass_enc" } @@ -211,6 +222,8 @@ func (h *Handler) storeEmailSecret(ctx context.Context, db execer, which emailSe switch which { case secretResendAPIKey: q = `UPDATE server_settings SET resend_api_key_enc = ?, updated_at = datetime('now') WHERE id = 1` + case secretResendWebhook: + q = `UPDATE server_settings SET resend_webhook_secret_enc = ?, updated_at = datetime('now') WHERE id = 1` case secretSMTPPass: q = `UPDATE server_settings SET smtp_pass_enc = ?, updated_at = datetime('now') WHERE id = 1` default: @@ -248,6 +261,9 @@ func (h *Handler) PatchEmailSettings(w http.ResponseWriter, r *http.Request) { // Optional; omit to keep the existing key, send "" explicitly to clear it and // fall back to SMTP. ResendAPIKey *string `json:"resend_api_key"` + // RSVP tracking (Resend inbound). Pointers for the same keep/clear distinction. + RSVPAddress *string `json:"rsvp_address"` + ResendWebhookSecret *string `json:"resend_webhook_secret"` } if err := json.NewDecoder(r.Body).Decode(&req); err != nil { h.writeError(w, http.StatusBadRequest, "invalid JSON") @@ -265,6 +281,22 @@ func (h *Handler) PatchEmailSettings(w http.ResponseWriter, r *http.Request) { if req.EmailFromName == "" { req.EmailFromName = "Calnode" } + if req.RSVPAddress != nil { + *req.RSVPAddress = strings.TrimSpace(*req.RSVPAddress) + if *req.RSVPAddress != "" && !validRSVPAddress(*req.RSVPAddress) { + h.writeError(w, http.StatusBadRequest, + "rsvp_address must be a plain address like rsvp@reply.example.com, without a +tag") + return + } + } + if req.ResendWebhookSecret != nil { + *req.ResendWebhookSecret = strings.TrimSpace(*req.ResendWebhookSecret) + if *req.ResendWebhookSecret != "" && !strings.HasPrefix(*req.ResendWebhookSecret, "whsec_") { + h.writeError(w, http.StatusBadRequest, + "resend_webhook_secret must be the webhook's signing secret, starting with whsec_") + return + } + } boolToInt := func(b bool) int { if b { @@ -316,6 +348,22 @@ func (h *Handler) PatchEmailSettings(w http.ResponseWriter, r *http.Request) { return } } + if req.RSVPAddress != nil { + if _, err := tx.ExecContext(r.Context(), + `UPDATE server_settings SET rsvp_address = ?, updated_at = datetime('now') WHERE id = 1`, + *req.RSVPAddress); err != nil { + h.logger.ErrorContext(r.Context(), "email settings: rsvp address", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + } + if req.ResendWebhookSecret != nil { + if err := h.storeEmailSecret(r.Context(), tx, secretResendWebhook, *req.ResendWebhookSecret); err != nil { + h.logger.ErrorContext(r.Context(), "email settings: resend webhook secret", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + } if err := tx.Commit(); err != nil { h.logger.ErrorContext(r.Context(), "email settings: commit", "error", err) diff --git a/internal/handler/invite_delivery.go b/internal/handler/invite_delivery.go index 8b1cb77f..81164fd0 100644 --- a/internal/handler/invite_delivery.go +++ b/internal/handler/invite_delivery.go @@ -71,14 +71,14 @@ func (h *Handler) inviteSenderReady(ctx context.Context) bool { } // applyInviteDelivery prepares the booker's email .ics for the booking's invite mode. -// Calnode-sent: always attach, organized by the instance sender, never the host. -// Calendar-sent: attach only when the primary host's calendar will not invite the booker -// itself (noConnectedDestination), with the host as organizer, exactly as before. +// Calnode-sent: always attach, organized by the booking's fixed invite organizer, never +// the host. Calendar-sent: attach only when the primary host's calendar will not invite +// the booker itself (noConnectedDestination), with the host as organizer, exactly as before. func (h *Handler) applyInviteDelivery(ctx context.Context, d *mailer.BookingData, mode, primaryHostID string) { if mode == booking.InviteByCalnode { d.AttachICS = true d.HideHostInInvite = true - d.InviteOrganizerName, d.InviteOrganizerEmail = h.inviteSender(ctx) + d.InviteOrganizerName, d.InviteOrganizerEmail = h.bookingInviteOrganizer(ctx, d.BookingID) return } d.AttachICS = h.noConnectedDestination(ctx, primaryHostID) @@ -92,3 +92,43 @@ func (h *Handler) applyHostInvite(ctx context.Context, d *mailer.BookingData, mo d.ICSWithoutAttendee = mode == booking.InviteByCalnode d.AttachICS = h.noConnectedDestination(ctx, hostID) } + +// bookingInviteOrganizer returns the name and address a Calnode-sent invite is organized +// by. The address is fixed on the booking at its first send (bookings.invite_organizer): +// calendar clients match a reschedule or cancellation by UID and organizer, so editing the +// sender or switching RSVP tracking on later must not change it for invites already out. +// New bookings get a private reply address when RSVP tracking is on, else the sender. +func (h *Handler) bookingInviteOrganizer(ctx context.Context, bookingID string) (name, email string) { + name, sender := h.inviteSender(ctx) + var stored string + if err := h.db.QueryRowContext(ctx, + `SELECT invite_organizer FROM bookings WHERE id = ?`, bookingID).Scan(&stored); err != nil { + h.logger.ErrorContext(ctx, "load invite organizer", "error", err, "booking_id", bookingID) + return name, sender + } + if stored != "" { + return name, stored + } + addr := sender + if base := h.rsvpAddress(ctx); base != "" { + if reply, err := newReplyAddress(base); err == nil { + addr = reply + } else { + h.logger.ErrorContext(ctx, "mint rsvp reply address", "error", err, "booking_id", bookingID) + } + } + if addr == "" { + return name, "" + } + // Only the first send writes; a concurrent first send reads the winner back. + if _, err := h.db.ExecContext(ctx, + `UPDATE bookings SET invite_organizer = ? WHERE id = ? AND invite_organizer = ''`, addr, bookingID); err != nil { + h.logger.ErrorContext(ctx, "fix invite organizer", "error", err, "booking_id", bookingID) + return name, addr + } + if err := h.db.QueryRowContext(ctx, + `SELECT invite_organizer FROM bookings WHERE id = ?`, bookingID).Scan(&stored); err != nil || stored == "" { + return name, addr + } + return name, stored +} diff --git a/internal/handler/rsvp_inbound.go b/internal/handler/rsvp_inbound.go new file mode 100644 index 00000000..fb61a9f1 --- /dev/null +++ b/internal/handler/rsvp_inbound.go @@ -0,0 +1,255 @@ +package handler + +import ( + "context" + "crypto/rand" + "encoding/base32" + "encoding/json" + "errors" + "io" + "net/http" + "net/mail" + "strings" + "time" + + "github.com/calnode/calnode/internal/mailer" + "github.com/calnode/calnode/internal/secret" + "github.com/calnode/calnode/internal/webhook" +) + +// RSVP tracking for Calnode-sent invites (migration 00069). +// +// A booker's Yes/No/Maybe is an iTIP REPLY their mail client emails to the invite's +// ORGANIZER. When RSVP tracking is set up, that organizer is a private per-booking address +// on a domain Resend receives for (rsvp+@reply.example.com). Resend calls +// POST /v1/email/inbound/resend with the message's metadata; Calnode checks the signature, +// fetches the message, reads the REPLY and records the answer on the booking. +// +// Three checks stand between a stranger and a forged RSVP: the Resend signature, the +// unguessable per-booking address, and the REPLY's attendee having to be that booking's +// booker. A forwarded invite answered by someone else is therefore ignored. + +// fetchReceivedRaw downloads a received message from Resend; a var so tests can stand in +// for Resend. +var fetchReceivedRaw = mailer.FetchReceivedRaw + +// rsvpStatuses are the PARTSTAT answers recorded; anything else in a REPLY is ignored. +var rsvpStatuses = map[string]bool{"accepted": true, "declined": true, "tentative": true} + +// rsvpAddress returns the configured RSVP inbox (e.g. rsvp@reply.example.com) when RSVP +// tracking can actually work end to end: an address, the Resend webhook secret to trust +// deliveries, and a Resend API key to fetch them. "" otherwise, and invites fall back to +// the plain sender, which is what they would get anyway. +func (h *Handler) rsvpAddress(ctx context.Context) string { + var addr, secretEnc, apiKeyEnc string + if err := h.db.QueryRowContext(ctx, + `SELECT rsvp_address, resend_webhook_secret_enc, resend_api_key_enc FROM server_settings WHERE id = 1`). + Scan(&addr, &secretEnc, &apiKeyEnc); err != nil { + h.logger.ErrorContext(ctx, "load rsvp settings", "error", err) + return "" + } + if addr == "" || secretEnc == "" || apiKeyEnc == "" { + return "" + } + return addr +} + +// replyToken is 128 bits of randomness, lower-case base32 so it survives case-folding +// mail systems and stays well inside a 64-octet local part. +var replyToken = base32.StdEncoding.WithPadding(base32.NoPadding) + +// newReplyAddress derives a private per-booking address from the RSVP inbox: +// rsvp@reply.example.com → rsvp+@reply.example.com. Resend receives every local +// part at its domain, so no mailbox has to exist for it. +func newReplyAddress(base string) (string, error) { + local, domain, ok := strings.Cut(base, "@") + if !ok || local == "" || domain == "" { + return "", errors.New("rsvp address is not local@domain") + } + b := make([]byte, 16) + if _, err := rand.Read(b); err != nil { + return "", err + } + return local + "+" + strings.ToLower(replyToken.EncodeToString(b)) + "@" + domain, nil +} + +// isReplyAddressFor reports whether addr is a per-booking address minted from base. Only +// those can route to a booking: a plain email to the sender or the inbox itself never does. +func isReplyAddressFor(addr, base string) bool { + local, domain, ok := strings.Cut(strings.ToLower(addr), "@") + baseLocal, baseDomain, bok := strings.Cut(strings.ToLower(base), "@") + if !ok || !bok || domain != baseDomain { + return false + } + token, found := strings.CutPrefix(local, baseLocal+"+") + return found && token != "" +} + +// validRSVPAddress accepts a bare local@domain with no plus tag of its own (the per-booking +// tag is appended to it) and no display name. +func validRSVPAddress(v string) bool { + a, err := mail.ParseAddress(v) + if err != nil || a.Name != "" || a.Address != v { + return false + } + local, _, _ := strings.Cut(v, "@") + return !strings.Contains(local, "+") +} + +// InboundEmailResend handles POST /v1/email/inbound/resend, Resend's email.received webhook. +// Public, authenticated by the webhook signature. Answers 200 for anything that is not an +// RSVP to act on, so Resend does not retry it, and 5xx only when fetching the message +// failed and a retry could succeed. +func (h *Handler) InboundEmailResend(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + body, err := io.ReadAll(http.MaxBytesReader(w, r.Body, 64<<10)) + if err != nil { + h.writeError(w, http.StatusRequestEntityTooLarge, "payload too large") + return + } + + var addr, secretEnc, apiKeyEnc string + if err := h.db.QueryRowContext(ctx, + `SELECT rsvp_address, resend_webhook_secret_enc, resend_api_key_enc FROM server_settings WHERE id = 1`). + Scan(&addr, &secretEnc, &apiKeyEnc); err != nil || secretEnc == "" { + h.writeError(w, http.StatusNotFound, "inbound email is not configured") + return + } + whSecret, err := secret.Decrypt(h.encKey, secretEnc) + if err != nil { + h.logger.ErrorContext(ctx, "inbound email: decrypt webhook secret", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + if err := mailer.VerifyResendWebhook(whSecret, r.Header, body, time.Now()); err != nil { + h.logger.WarnContext(ctx, "inbound email: rejected webhook", "error", err) + h.writeError(w, http.StatusUnauthorized, "invalid signature") + return + } + + var ev mailer.ResendInboundEvent + if err := json.Unmarshal(body, &ev); err != nil { + h.writeError(w, http.StatusBadRequest, "invalid JSON") + return + } + ignore := func(reason string) { + h.writeJSON(w, http.StatusOK, map[string]string{"ignored": reason}) + } + if ev.Type != "email.received" { + ignore("not an email.received event") + return + } + bookingID, bookerEmail := h.bookingForReplyAddress(ctx, ev.Recipients(), addr) + if bookingID == "" { + ignore("not addressed to a booking's reply address") + return + } + + apiKey, err := secret.Decrypt(h.encKey, apiKeyEnc) + if err != nil || apiKey == "" { + h.logger.ErrorContext(ctx, "inbound email: resend api key unavailable", "error", err) + h.writeError(w, http.StatusServiceUnavailable, "resend api key not configured") + return + } + raw, err := fetchReceivedRaw(ctx, apiKey, ev.Data.EmailID) + if err != nil { + h.logger.ErrorContext(ctx, "inbound email: fetch message", "error", err, "booking_id", bookingID) + h.writeError(w, http.StatusBadGateway, "could not fetch the received email") + return + } + reply, err := mailer.ParseICSReply(raw) + if err != nil { + ignore("no calendar reply in message") + return + } + if !strings.EqualFold(reply.UID, bookingID+"@calnode") { + ignore("reply is for a different event") + return + } + status := "" + for _, a := range reply.Attendees { + if strings.EqualFold(a.Email, bookerEmail) { + status = a.PartStat + break + } + } + if !rsvpStatuses[status] { + ignore("no answer from this booking's booker") + return + } + + changed, err := h.recordRSVP(ctx, bookingID, status) + if err != nil { + h.logger.ErrorContext(ctx, "inbound email: record rsvp", "error", err, "booking_id", bookingID) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + h.writeJSON(w, http.StatusOK, map[string]string{"rsvp_status": status}) + if changed { + h.enqueueRSVPWebhook(ctx, bookingID, status) + } +} + +// bookingForReplyAddress finds the booking one of the recipients was minted for, and that +// booking's booker address. +func (h *Handler) bookingForReplyAddress(ctx context.Context, recipients []string, base string) (bookingID, bookerEmail string) { + if base == "" { + return "", "" + } + for _, rcpt := range recipients { + a, err := mail.ParseAddress(rcpt) + if err != nil || !isReplyAddressFor(a.Address, base) { + continue + } + err = h.db.QueryRowContext(ctx, ` + SELECT b.id, COALESCE(o.email, '') + FROM bookings b + LEFT JOIN booking_attendees o ON o.booking_id = b.id AND o.is_organizer = 1 + WHERE b.invite_organizer = ? COLLATE NOCASE`, a.Address).Scan(&bookingID, &bookerEmail) + if err == nil { + return bookingID, bookerEmail + } + } + return "", "" +} + +// recordRSVP stores the booker's answer, reporting whether it changed. Resend retries and +// clients re-send the same answer, so an unchanged answer is a no-op, not a new event. +func (h *Handler) recordRSVP(ctx context.Context, bookingID, status string) (bool, error) { + res, err := h.db.ExecContext(ctx, ` + UPDATE booking_attendees SET rsvp_status = ?, rsvp_at = ? + WHERE booking_id = ? AND is_organizer = 1 AND rsvp_status != ?`, + status, time.Now().UTC().Format(time.RFC3339), bookingID, status) + if err != nil { + return false, err + } + n, err := res.RowsAffected() + return n > 0, err +} + +// enqueueRSVPWebhook fires booking.rsvp for the booking's hosts' subscribed webhooks. +func (h *Handler) enqueueRSVPWebhook(ctx context.Context, bookingID, status string) { + if h.webhookSvc == nil { + return + } + b, err := h.bookingSvc.Get(ctx, bookingID) + if err != nil { + h.logger.ErrorContext(ctx, "rsvp webhook: load booking", "error", err, "booking_id", bookingID) + return + } + var slug string + _ = h.db.QueryRowContext(ctx, `SELECT slug FROM event_types WHERE id = ?`, b.EventTypeID).Scan(&slug) + if err := h.webhookSvc.Enqueue(ctx, "booking.rsvp", webhook.BookingPayload{ + ID: b.ID, + EventTypeSlug: slug, + HostID: b.HostID, + StartAt: b.StartAt.UTC().Format(time.RFC3339), + EndAt: b.EndAt.UTC().Format(time.RFC3339), + Status: b.Status, + LocationValue: b.LocationValue, + CreatedAt: b.CreatedAt.UTC().Format(time.RFC3339), + RSVPStatus: status, + }); err != nil { + h.logger.ErrorContext(ctx, "enqueue booking.rsvp webhook", "error", err, "booking_id", bookingID) + } +} diff --git a/internal/handler/rsvp_inbound_internal_test.go b/internal/handler/rsvp_inbound_internal_test.go new file mode 100644 index 00000000..e6f8db9e --- /dev/null +++ b/internal/handler/rsvp_inbound_internal_test.go @@ -0,0 +1,192 @@ +package handler + +import ( + "context" + "crypto/hmac" + "crypto/sha256" + "encoding/base64" + "encoding/json" + "errors" + "net/http" + "net/http/httptest" + "regexp" + "strconv" + "strings" + "testing" + "time" + + "github.com/calnode/calnode/internal/booking" + "github.com/calnode/calnode/internal/secret" +) + +const ( + rsvpInbox = "rsvp@reply.team.example" + rsvpSecretRaw = "calnode-test-webhook-signing-key" +) + +var rsvpSecret = "whsec_" + base64.StdEncoding.EncodeToString([]byte(rsvpSecretRaw)) + +// newRSVPFixture is an invite fixture with RSVP tracking fully configured. +func newRSVPFixture(t *testing.T) *inviteFixture { + t.Helper() + f := newInviteFixture(t, true) + whEnc, err := secret.Encrypt(f.h.encKey, rsvpSecret) + if err != nil { + t.Fatal(err) + } + keyEnc, err := secret.Encrypt(f.h.encKey, "re_test_key") + if err != nil { + t.Fatal(err) + } + if _, err := f.h.db.Exec(`UPDATE server_settings + SET rsvp_address = ?, resend_webhook_secret_enc = ?, resend_api_key_enc = ? WHERE id = 1`, + rsvpInbox, whEnc, keyEnc); err != nil { + t.Fatalf("seed rsvp settings: %v", err) + } + return f +} + +// stubResend stands in for Resend's Received emails API, serving raw for any email id. +func stubResend(t *testing.T, raw []byte) { + t.Helper() + prev := fetchReceivedRaw + fetchReceivedRaw = func(_ context.Context, apiKey, _ string) ([]byte, error) { + if apiKey != "re_test_key" { + return nil, errors.New("wrong api key") + } + return raw, nil + } + t.Cleanup(func() { fetchReceivedRaw = prev }) +} + +func replyMessage(uid, attendee, partstat string) []byte { + return []byte("From: " + attendee + "\r\nSubject: Accepted\r\n" + + "Content-Type: text/calendar; charset=UTF-8; method=REPLY\r\n\r\n" + + "BEGIN:VCALENDAR\r\nMETHOD:REPLY\r\nBEGIN:VEVENT\r\nUID:" + uid + "\r\n" + + "ATTENDEE;PARTSTAT=" + partstat + ":mailto:" + attendee + "\r\n" + + "END:VEVENT\r\nEND:VCALENDAR\r\n") +} + +// postInbound delivers an email.received webhook for a message to `to`, signed with sign. +func (f *inviteFixture) postInbound(t *testing.T, to, sign string) *httptest.ResponseRecorder { + t.Helper() + body, _ := json.Marshal(map[string]any{ + "type": "email.received", + "data": map[string]any{"email_id": "em_1", "from": inviteBookerEmail, "to": []string{to}}, + }) + ts := strconv.FormatInt(time.Now().Unix(), 10) + key, _ := base64.StdEncoding.DecodeString(strings.TrimPrefix(sign, "whsec_")) + mac := hmac.New(sha256.New, key) + mac.Write([]byte("msg_1." + ts + ".")) + mac.Write(body) + req := httptest.NewRequest(http.MethodPost, "/v1/email/inbound/resend", strings.NewReader(string(body))) + req.Header.Set("svix-id", "msg_1") + req.Header.Set("svix-timestamp", ts) + req.Header.Set("svix-signature", "v1,"+base64.StdEncoding.EncodeToString(mac.Sum(nil))) + rec := httptest.NewRecorder() + f.h.InboundEmailResend(rec, req) + return rec +} + +func (f *inviteFixture) rsvpStatus(t *testing.T, bookingID string) string { + t.Helper() + var s string + if err := f.h.db.QueryRow(`SELECT rsvp_status FROM booking_attendees WHERE booking_id = ? AND is_organizer = 1`, + bookingID).Scan(&s); err != nil { + t.Fatalf("read rsvp: %v", err) + } + return s +} + +var organizerLine = regexp.MustCompile(`ORGANIZER;CN="[^"]*":mailto:(\S+)`) + +// The whole loop: the booker's invite is organized by a private reply address, their +// "Yes" comes back through Resend, and Calnode records it on the booking. +func TestRSVP_bookerAnswerIsRecorded(t *testing.T) { + f := newRSVPFixture(t) + if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + id, msg := f.book(t, "intro") + + m := organizerLine.FindStringSubmatch(icsOf(msg)) + if m == nil || !isReplyAddressFor(m[1], rsvpInbox) { + t.Fatalf("invite is not organized by a per-booking reply address:\n%s", icsOf(msg)) + } + replyAddr := m[1] + stubResend(t, replyMessage(id+"@calnode", inviteBookerEmail, "ACCEPTED")) + + rec := f.postInbound(t, replyAddr, rsvpSecret) + if rec.Code != http.StatusOK || !strings.Contains(rec.Body.String(), "accepted") { + t.Fatalf("inbound RSVP: %d — %s", rec.Code, rec.Body.String()) + } + if got := f.rsvpStatus(t, id); got != "accepted" { + t.Errorf("rsvp_status = %q; want accepted", got) + } +} + +// The signature, the event UID and the booker check must each, on their own, stop an +// answer from being recorded. +func TestRSVP_rejectsWhatIsNotTheBookersAnswer(t *testing.T) { + f := newRSVPFixture(t) + if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + id, msg := f.book(t, "intro") + replyAddr := organizerLine.FindStringSubmatch(icsOf(msg))[1] + if !isReplyAddressFor(replyAddr, rsvpInbox) { + t.Fatalf("invite organizer %q is not a reply address; the checks below would pass vacuously", replyAddr) + } + + t.Run("forged webhook", func(t *testing.T) { + stubResend(t, replyMessage(id+"@calnode", inviteBookerEmail, "DECLINED")) + other := "whsec_" + base64.StdEncoding.EncodeToString([]byte("not-the-secret")) + if rec := f.postInbound(t, replyAddr, other); rec.Code != http.StatusUnauthorized { + t.Errorf("unsigned-by-Resend webhook: %d; want 401", rec.Code) + } + }) + t.Run("forwarded invite answered by someone else", func(t *testing.T) { + stubResend(t, replyMessage(id+"@calnode", "colleague@elsewhere.example", "DECLINED")) + f.postInbound(t, replyAddr, rsvpSecret) + }) + t.Run("reply for another event", func(t *testing.T) { + stubResend(t, replyMessage("someone-else@calnode", inviteBookerEmail, "DECLINED")) + f.postInbound(t, replyAddr, rsvpSecret) + }) + if got := f.rsvpStatus(t, id); got != "needs-action" { + t.Errorf("rsvp_status = %q after only invalid answers; want needs-action", got) + } +} + +// Calendar clients match a cancellation to the invite by UID and organizer. Changing the +// RSVP inbox after a booking was made must not change the organizer its cancellation uses. +func TestRSVP_organizerStaysFixedForTheBookingsLifetime(t *testing.T) { + f := newRSVPFixture(t) + if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + id, msg := f.book(t, "intro") + first := organizerLine.FindStringSubmatch(icsOf(msg))[1] + if !isReplyAddressFor(first, rsvpInbox) { + t.Fatalf("invite organizer %q is not a reply address", first) + } + + if _, err := f.h.db.Exec(`UPDATE server_settings SET rsvp_address = 'answers@other.example', email_from = 'new@team.example' WHERE id = 1`); err != nil { + t.Fatal(err) + } + ctx := context.Background() + if err := f.h.bookingSvc.CancelByID(ctx, id, ""); err != nil { + t.Fatal(err) + } + b, err := f.h.bookingSvc.Get(ctx, id) + if err != nil { + t.Fatal(err) + } + f.h.cancelSideEffects(*b) + + cancelICS := icsOf(f.waitFor(t, inviteBookerEmail, 2)) + m := organizerLine.FindStringSubmatch(cancelICS) + if m == nil || m[1] != first { + t.Errorf("cancellation organizer = %v; want the invite's original %s:\n%s", m, first, cancelICS) + } +} diff --git a/internal/handler/webhook_handler.go b/internal/handler/webhook_handler.go index 2691c4d1..829cbaeb 100644 --- a/internal/handler/webhook_handler.go +++ b/internal/handler/webhook_handler.go @@ -15,7 +15,7 @@ import ( ) var validWebhookEvents = []string{ - "booking.created", "booking.cancelled", "booking.rescheduled", + "booking.created", "booking.cancelled", "booking.rescheduled", "booking.rsvp", "recording.completed", "transcript.ready", "notes.ready", } diff --git a/internal/mailer/itip.go b/internal/mailer/itip.go new file mode 100644 index 00000000..0c63a3d7 --- /dev/null +++ b/internal/mailer/itip.go @@ -0,0 +1,210 @@ +package mailer + +import ( + "bufio" + "bytes" + "encoding/base64" + "errors" + "fmt" + "io" + "mime" + "mime/multipart" + "mime/quotedprintable" + "net/mail" + "strings" +) + +// ErrNoReply means a received email carries no iCalendar REPLY: an ordinary reply typed by +// a person, an auto-responder, or a forwarded invite. Not an error to retry. +var ErrNoReply = errors.New("itip: no calendar REPLY in message") + +// ICSReply is the part of an iTIP REPLY (RFC 5546 §3.2.3) that says who answered what. +type ICSReply struct { + UID string + Attendees []ICSReplyAttendee +} + +// ICSReplyAttendee is one ATTENDEE line of a REPLY. PartStat is lower-cased +// ("accepted", "declined", "tentative", "needs-action", ...). +type ICSReplyAttendee struct { + Email string + PartStat string +} + +// maxICSPart bounds how much of one calendar part is read; a REPLY is a few hundred bytes. +const maxICSPart = 256 << 10 + +// ParseICSReply finds the METHOD:REPLY calendar object in a raw RFC 5322 message. Mail +// clients put it in a text/calendar body part (Gmail, Outlook, Apple Mail), often with a +// second copy as an .ics attachment; the first REPLY found wins. +func ParseICSReply(raw []byte) (ICSReply, error) { + msg, err := mail.ReadMessage(bytes.NewReader(raw)) + if err != nil { + return ICSReply{}, fmt.Errorf("itip: read message: %w", err) + } + var found ICSReply + done, walkErr := walkParts(msg.Header, msg.Body, 0, func(body []byte) bool { + r, ok := parseReplyCalendar(body) + if ok { + found = r + } + return ok + }) + if done { + return found, nil + } + if walkErr != nil { + return ICSReply{}, walkErr + } + return ICSReply{}, ErrNoReply +} + +type partHeader interface{ Get(string) string } + +// walkParts visits every calendar-looking leaf part, depth-first, and stops as soon as +// visit reports it found what it wanted (done). +func walkParts(h partHeader, body io.Reader, depth int, visit func([]byte) bool) (done bool, err error) { + if depth > 8 { + return false, errors.New("itip: MIME nesting too deep") + } + mediaType, params, err := mime.ParseMediaType(h.Get("Content-Type")) + if err != nil { + mediaType = "text/plain" + } + if strings.HasPrefix(mediaType, "multipart/") { + mr := multipart.NewReader(body, params["boundary"]) + for { + p, err := mr.NextRawPart() + if err == io.EOF { + return false, nil + } + if err != nil { + return false, fmt.Errorf("itip: read part: %w", err) + } + if done, err := walkParts(p.Header, p, depth+1, visit); done || err != nil { + return done, err + } + } + } + if !isCalendarPart(mediaType, h) { + return false, nil + } + data, err := io.ReadAll(io.LimitReader(decodeTransfer(h.Get("Content-Transfer-Encoding"), body), maxICSPart)) + if err != nil { + return false, nil // a malformed part is skipped; another copy may still be readable + } + return visit(data), nil +} + +func isCalendarPart(mediaType string, h partHeader) bool { + if mediaType == "text/calendar" || mediaType == "application/ics" { + return true + } + if _, params, err := mime.ParseMediaType(h.Get("Content-Disposition")); err == nil { + return strings.HasSuffix(strings.ToLower(params["filename"]), ".ics") + } + return false +} + +// decodeTransfer undoes a part's Content-Transfer-Encoding. The base64 decoder already +// skips the CR/LF that MIME wraps bodies with. +func decodeTransfer(enc string, r io.Reader) io.Reader { + switch strings.ToLower(strings.TrimSpace(enc)) { + case "base64": + return base64.NewDecoder(base64.StdEncoding, r) + case "quoted-printable": + return quotedprintable.NewReader(r) + default: + return r + } +} + +// parseReplyCalendar extracts the REPLY from one iCalendar object; ok is false when the +// object is not a REPLY (an echoed REQUEST, a CANCEL) or has no VEVENT UID. +func parseReplyCalendar(data []byte) (ICSReply, bool) { + var ( + reply ICSReply + isReply bool + inEvent bool + ) + for _, line := range unfoldICS(data) { + name, params, value := splitICSLine(line) + switch { + case name == "METHOD": + isReply = strings.EqualFold(value, "REPLY") + case name == "BEGIN" && strings.EqualFold(value, "VEVENT"): + inEvent = true + case name == "END" && strings.EqualFold(value, "VEVENT"): + inEvent = false + case inEvent && name == "UID" && reply.UID == "": + reply.UID = value + case inEvent && name == "ATTENDEE": + addr := value + if len(addr) > 7 && strings.EqualFold(addr[:7], "mailto:") { + addr = addr[7:] + } + stat := strings.ToLower(params["PARTSTAT"]) + if stat == "" { + stat = "needs-action" + } + reply.Attendees = append(reply.Attendees, ICSReplyAttendee{Email: strings.TrimSpace(addr), PartStat: stat}) + } + } + return reply, isReply && reply.UID != "" && len(reply.Attendees) > 0 +} + +// unfoldICS splits content lines and joins RFC 5545 §3.1 continuations (a line starting +// with a space or tab continues the previous one). +func unfoldICS(data []byte) []string { + var lines []string + sc := bufio.NewScanner(bytes.NewReader(data)) + sc.Buffer(make([]byte, 0, 4096), maxICSPart) + for sc.Scan() { + l := strings.TrimRight(sc.Text(), "\r") + if (strings.HasPrefix(l, " ") || strings.HasPrefix(l, "\t")) && len(lines) > 0 { + lines[len(lines)-1] += l[1:] + continue + } + lines = append(lines, l) + } + return lines +} + +// splitICSLine splits `NAME;P1=V1;P2="V;2":value` into the upper-cased name, its +// parameters (names upper-cased, quotes removed) and the value. Colons and semicolons +// inside quoted parameter values do not split. +func splitICSLine(line string) (string, map[string]string, string) { + inQuote := false + colon := -1 + for i, c := range line { + if c == '"' { + inQuote = !inQuote + } else if c == ':' && !inQuote { + colon = i + break + } + } + if colon < 0 { + return "", nil, "" + } + head, value := line[:colon], line[colon+1:] + var segs []string + inQuote = false + start := 0 + for i, c := range head { + if c == '"' { + inQuote = !inQuote + } else if c == ';' && !inQuote { + segs = append(segs, head[start:i]) + start = i + 1 + } + } + segs = append(segs, head[start:]) + params := make(map[string]string, len(segs)-1) + for _, s := range segs[1:] { + if k, v, ok := strings.Cut(s, "="); ok { + params[strings.ToUpper(k)] = strings.Trim(v, `"`) + } + } + return strings.ToUpper(segs[0]), params, value +} diff --git a/internal/mailer/resend_inbound.go b/internal/mailer/resend_inbound.go new file mode 100644 index 00000000..ba95717e --- /dev/null +++ b/internal/mailer/resend_inbound.go @@ -0,0 +1,138 @@ +package mailer + +import ( + "context" + "crypto/hmac" + "crypto/sha256" + "encoding/base64" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "net/url" + "strconv" + "strings" + "time" +) + +// Resend delivers received email ("inbound") as an email.received webhook, signed the Svix +// way. The webhook carries metadata only; the message itself is fetched from the +// Received emails API, whose raw.download_url serves the original RFC 5322 bytes. + +// ErrWebhookSignature means a webhook request is not provably from Resend: a missing or +// wrong signature, or a timestamp outside the replay window. +var ErrWebhookSignature = errors.New("resend webhook: signature verification failed") + +// webhookTolerance is the replay window Svix itself uses. +const webhookTolerance = 5 * time.Minute + +// VerifyResendWebhook checks a Resend (Svix) webhook signature against the endpoint's +// signing secret ("whsec_"). body must be the raw request body, unparsed. +func VerifyResendWebhook(secret string, header http.Header, body []byte, now time.Time) error { + key, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(secret, "whsec_")) + if err != nil || len(key) == 0 { + return fmt.Errorf("%w: unusable signing secret", ErrWebhookSignature) + } + id, ts, sigs := header.Get("svix-id"), header.Get("svix-timestamp"), header.Get("svix-signature") + if id == "" || ts == "" || sigs == "" { + return fmt.Errorf("%w: missing svix headers", ErrWebhookSignature) + } + sec, err := strconv.ParseInt(ts, 10, 64) + if err != nil { + return fmt.Errorf("%w: bad timestamp", ErrWebhookSignature) + } + if d := now.Sub(time.Unix(sec, 0)); d > webhookTolerance || d < -webhookTolerance { + return fmt.Errorf("%w: timestamp outside tolerance", ErrWebhookSignature) + } + + mac := hmac.New(sha256.New, key) + mac.Write([]byte(id + "." + ts + ".")) + mac.Write(body) + want := mac.Sum(nil) + // The header lists one or more "v1," signatures (several during secret rotation). + for _, s := range strings.Fields(sigs) { + version, sig, ok := strings.Cut(s, ",") + if !ok || version != "v1" { + continue + } + got, err := base64.StdEncoding.DecodeString(sig) + if err == nil && hmac.Equal(got, want) { + return nil + } + } + return ErrWebhookSignature +} + +// ResendInboundEvent is the part of an email.received webhook Calnode reads. +type ResendInboundEvent struct { + Type string `json:"type"` + Data struct { + EmailID string `json:"email_id"` + From string `json:"from"` + To []string `json:"to"` + CC []string `json:"cc"` + ReceivedFor []string `json:"received_for"` + } `json:"data"` +} + +// Recipients returns every address the message was delivered to. +func (e ResendInboundEvent) Recipients() []string { + out := make([]string, 0, len(e.Data.To)+len(e.Data.CC)+len(e.Data.ReceivedFor)) + out = append(out, e.Data.To...) + out = append(out, e.Data.CC...) + return append(out, e.Data.ReceivedFor...) +} + +// resendReceivingEndpoint is the Received emails API. A var so tests can stub it. +var resendReceivingEndpoint = "https://api.resend.com/emails/receiving/" + +// maxRawEmail bounds a downloaded message. An RSVP is a few KB; this only stops a +// pathological message from being read into memory whole. +const maxRawEmail = 5 << 20 + +// FetchReceivedRaw downloads the original bytes of a received email: one API call for the +// short-lived signed URL, one GET for the message. +func FetchReceivedRaw(ctx context.Context, apiKey, emailID string) ([]byte, error) { + if apiKey == "" { + return nil, errors.New("resend inbound: api key not configured") + } + client := &http.Client{Timeout: resendTimeout} + + req, err := http.NewRequestWithContext(ctx, http.MethodGet, resendReceivingEndpoint+url.PathEscape(emailID), nil) + if err != nil { + return nil, err + } + req.Header.Set("Authorization", "Bearer "+apiKey) + resp, err := client.Do(req) + if err != nil { + return nil, fmt.Errorf("resend inbound: retrieve email: %w", err) + } + var meta struct { + Raw *struct { + DownloadURL string `json:"download_url"` + } `json:"raw"` + } + decodeErr := json.NewDecoder(io.LimitReader(resp.Body, 1<<20)).Decode(&meta) + resp.Body.Close() // #nosec G104 -- body fully consumed above; a close error changes nothing + if resp.StatusCode != http.StatusOK { + return nil, fmt.Errorf("resend inbound: retrieve email: status %d", resp.StatusCode) + } + if decodeErr != nil || meta.Raw == nil || meta.Raw.DownloadURL == "" { + return nil, errors.New("resend inbound: retrieve email: no raw download url") + } + + req, err = http.NewRequestWithContext(ctx, http.MethodGet, meta.Raw.DownloadURL, nil) + if err != nil { + return nil, err + } + resp, err = client.Do(req) + if err != nil { + return nil, fmt.Errorf("resend inbound: download raw email: %w", err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + return nil, fmt.Errorf("resend inbound: download raw email: status %d", resp.StatusCode) + } + return io.ReadAll(io.LimitReader(resp.Body, maxRawEmail)) +} diff --git a/internal/mailer/resend_inbound_test.go b/internal/mailer/resend_inbound_test.go new file mode 100644 index 00000000..b6da8cb0 --- /dev/null +++ b/internal/mailer/resend_inbound_test.go @@ -0,0 +1,129 @@ +package mailer + +import ( + "encoding/base64" + "errors" + "net/http" + "strings" + "testing" + "time" +) + +// Svix's published verification example (docs.svix.com, "Verifying payloads manually"), +// the scheme Resend signs webhooks with. Matching it proves wire compatibility rather than +// agreement with our own signer. +func svixExample() (string, http.Header, []byte, time.Time) { + h := http.Header{} + h.Set("svix-id", "msg_p5jXN8AQM9LWM0D4loKWxJek") + h.Set("svix-timestamp", "1614265330") + h.Set("svix-signature", "v1,g0hM9SsE+OTPJTGt/tmIKtSyZlE3uFJELVlNIOLJ1OE=") + return "whsec_MfKQ9r8GKYqrTwjUPD8ILPZIo2LaLaSw", h, []byte(`{"test": 2432232314}`), time.Unix(1614265330, 0) +} + +func TestVerifyResendWebhook_acceptsSvixExample(t *testing.T) { + secret, h, body, now := svixExample() + if err := VerifyResendWebhook(secret, h, body, now); err != nil { + t.Fatalf("valid Svix signature rejected: %v", err) + } + // Secret rotation sends several signatures; any one matching is enough. + h.Set("svix-signature", "v1,bm90LXRoZS1zaWduYXR1cmU= "+h.Get("svix-signature")) + if err := VerifyResendWebhook(secret, h, body, now); err != nil { + t.Errorf("valid signature among several rejected: %v", err) + } +} + +func TestVerifyResendWebhook_rejectsForgeries(t *testing.T) { + secret, h, body, now := svixExample() + cases := map[string]func() (string, http.Header, []byte, time.Time){ + "tampered body": func() (string, http.Header, []byte, time.Time) { + return secret, h, []byte(`{"test": 1}`), now + }, + "other secret": func() (string, http.Header, []byte, time.Time) { + return "whsec_" + base64.StdEncoding.EncodeToString([]byte("another-secret")), h, body, now + }, + "replayed later": func() (string, http.Header, []byte, time.Time) { + return secret, h, body, now.Add(6 * time.Minute) + }, + "unsigned": func() (string, http.Header, []byte, time.Time) { + return secret, http.Header{}, body, now + }, + } + for name, c := range cases { + s, hdr, b, at := c() + if err := VerifyResendWebhook(s, hdr, b, at); !errors.Is(err, ErrWebhookSignature) { + t.Errorf("%s: got %v; want ErrWebhookSignature", name, err) + } + } +} + +// gmailStyleReply mirrors how Gmail answers an invite: multipart/mixed holding a +// multipart/alternative whose text/calendar part is the REPLY (base64), plus the same +// calendar again as an invite.ics attachment. +func gmailStyleReply(uid, attendee, partstat string) []byte { + ics := "BEGIN:VCALENDAR\r\nMETHOD:REPLY\r\nBEGIN:VEVENT\r\n" + + "ATTENDEE;PARTSTAT=" + partstat + ";CN=\"Guest; the: one\":mailto:" + attendee + "\r\n" + + "UID:" + uid + "\r\nSEQUENCE:0\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n" + b64 := base64.StdEncoding.EncodeToString([]byte(ics)) + var wrapped strings.Builder + for len(b64) > 76 { + wrapped.WriteString(b64[:76] + "\r\n") + b64 = b64[76:] + } + wrapped.WriteString(b64 + "\r\n") + return []byte("From: Guest <" + attendee + ">\r\n" + + "To: rsvp+tok@reply.example.com\r\n" + + "Subject: Accepted: Intro\r\n" + + "MIME-Version: 1.0\r\n" + + "Content-Type: multipart/mixed; boundary=\"outer\"\r\n\r\n" + + "--outer\r\n" + + "Content-Type: multipart/alternative; boundary=\"inner\"\r\n\r\n" + + "--inner\r\nContent-Type: text/plain; charset=UTF-8\r\n\r\nGuest has accepted.\r\n" + + "--inner\r\nContent-Type: text/calendar; charset=UTF-8; method=REPLY\r\n" + + "Content-Transfer-Encoding: base64\r\n\r\n" + wrapped.String() + + "--inner--\r\n" + + "--outer\r\nContent-Type: application/ics; name=\"invite.ics\"\r\n" + + "Content-Disposition: attachment; filename=\"invite.ics\"\r\n" + + "Content-Transfer-Encoding: base64\r\n\r\n" + wrapped.String() + + "--outer--\r\n") +} + +func TestParseICSReply_gmailStyle(t *testing.T) { + got, err := ParseICSReply(gmailStyleReply("b-1@calnode", "guest@booker.example", "ACCEPTED")) + if err != nil { + t.Fatalf("ParseICSReply: %v", err) + } + if got.UID != "b-1@calnode" { + t.Errorf("UID = %q", got.UID) + } + if len(got.Attendees) != 1 || got.Attendees[0].Email != "guest@booker.example" || got.Attendees[0].PartStat != "accepted" { + t.Errorf("attendees = %+v; want guest@booker.example accepted (a quoted CN with ; and : must not split)", got.Attendees) + } +} + +func TestParseICSReply_foldedQuotedPrintable(t *testing.T) { + raw := "From: g@x.example\r\nContent-Type: text/calendar; method=REPLY\r\n" + + "Content-Transfer-Encoding: quoted-printable\r\n\r\n" + + "BEGIN:VCALENDAR\r\nMETHOD:REPLY\r\nBEGIN:VEVENT\r\nUID:b-2@calnode\r\n" + + "ATTENDEE;CN=3DGuest;PARTSTAT=3DDECLINED:MAILTO:guest@booker.exa\r\n mple\r\n" + + "END:VEVENT\r\nEND:VCALENDAR\r\n" + got, err := ParseICSReply([]byte(raw)) + if err != nil { + t.Fatalf("ParseICSReply: %v", err) + } + if len(got.Attendees) != 1 || got.Attendees[0].Email != "guest@booker.example" || got.Attendees[0].PartStat != "declined" { + t.Errorf("attendees = %+v; want the folded MAILTO unfolded and declined", got.Attendees) + } +} + +// Only a REPLY is an answer: an echoed invite or a typed reply must not read as one. +func TestParseICSReply_ignoresNonReplies(t *testing.T) { + request := "From: g@x.example\r\nContent-Type: text/calendar; method=REQUEST\r\n\r\n" + + "BEGIN:VCALENDAR\r\nMETHOD:REQUEST\r\nBEGIN:VEVENT\r\nUID:b-3@calnode\r\n" + + "ATTENDEE;PARTSTAT=ACCEPTED:mailto:g@x.example\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n" + typed := "From: g@x.example\r\nContent-Type: text/plain\r\n\r\nSee you then!\r\n" + for name, raw := range map[string]string{"request": request, "typed reply": typed} { + if _, err := ParseICSReply([]byte(raw)); !errors.Is(err, ErrNoReply) { + t.Errorf("%s: got %v; want ErrNoReply", name, err) + } + } +} diff --git a/internal/server/server.go b/internal/server/server.go index 871667f9..b7810a78 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -517,6 +517,9 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge // Stripe payment webhook — public, authenticated by the signing secret (no session // cookie, so the CSRF check doesn't apply). Must receive the raw body. mux.HandleFunc("POST /v1/stripe/webhook", h.StripeWebhook) + // Resend inbound email (email.received): RSVPs to Calnode-sent invites. Public, + // authenticated by the webhook signature. + mux.HandleFunc("POST /v1/email/inbound/resend", h.InboundEmailResend) // API keys mux.HandleFunc("GET /v1/api-keys", h.RequireAuth(h.ListAPIKeys)) diff --git a/internal/webhook/webhook.go b/internal/webhook/webhook.go index d266df8e..0e0948ab 100644 --- a/internal/webhook/webhook.go +++ b/internal/webhook/webhook.go @@ -55,6 +55,7 @@ const ( FieldPaymentStatus = "payment_status" FieldAmountPaid = "amount_paid_cents" FieldCurrency = "amount_paid_currency" + FieldRSVPStatus = "rsvp_status" ) // AllFields is every selectable field, in payload order. Used to validate config @@ -65,7 +66,7 @@ var AllFields = []string{ FieldEventTypeSlug, FieldEventTypeName, FieldHostID, FieldHostName, FieldHostEmail, FieldAttendeeName, FieldAttendeeEmail, FieldAttendeeTZ, FieldAnswers, - FieldPaymentStatus, FieldAmountPaid, FieldCurrency, + FieldPaymentStatus, FieldAmountPaid, FieldCurrency, FieldRSVPStatus, } // defaultFields reproduces the original payload (no PII, no answers) so a webhook with no @@ -75,7 +76,7 @@ var defaultFields = []string{ FieldID, FieldEventTypeSlug, FieldHostID, FieldStartAt, FieldEndAt, FieldStatus, FieldLocation, FieldCancelReason, FieldCreatedAt, FieldPreviousStartAt, FieldPreviousEndAt, - FieldPaymentStatus, FieldAmountPaid, FieldCurrency, + FieldPaymentStatus, FieldAmountPaid, FieldCurrency, FieldRSVPStatus, } var validField = func() map[string]bool { @@ -125,6 +126,9 @@ type BookingPayload struct { PaymentStatus string `json:"payment_status,omitempty"` AmountPaidCents int `json:"amount_paid_cents,omitempty"` AmountPaidCurrency string `json:"amount_paid_currency,omitempty"` + // RSVPStatus is the booker's answer to a Calnode-sent invite (accepted, declined, + // tentative); set on booking.rsvp only. + RSVPStatus string `json:"rsvp_status,omitempty"` } type Service struct { @@ -346,6 +350,7 @@ func buildData(bd enrichedBooking, fields []string) map[string]any { FieldPreviousEndAt: bd.core.PreviousEndAt, FieldPaymentStatus: bd.core.PaymentStatus, FieldCurrency: bd.core.AmountPaidCurrency, + FieldRSVPStatus: bd.core.RSVPStatus, } out := make(map[string]any, len(fields)) for _, f := range fields { From 7572ebbd60d3a9f0939583ea1c9c12599f96de93 Mon Sep 17 00:00:00 2001 From: Jeroen Rinzema Date: Wed, 30 Sep 2026 00:16:43 +0200 Subject: [PATCH 096/250] fix(rsvp): trust only verified senders; set up the Resend webhook automatically - An RSVP is recorded only when Resend verified the From domain (DKIM or DMARC pass) and that From is the booker. The REPLY body is sender-written, so a forged ATTENDEE line from any other mailbox no longer counts. - Only confirmed, upcoming bookings take answers. - The inbound endpoint answers 401 whether unconfigured or wrongly signed. - Settings -> Email -> RSVP tracking creates (or reuses) the email.received webhook in Resend and stores its signing secret. When it cannot - an http instance, a sending-only key - it says why and shows the manual steps. - RSVP tracking needs a full-access Resend key; the page, DEPLOY.md and the errors now say so. The webhook secret can be removed from the UI. --- CHANGELOG.md | 6 +- DEPLOY.md | 24 ++- docs/ARCHITECTURE.md | 24 +-- frontend/src/lib/api.ts | 2 + .../src/routes/settings/email/+page.svelte | 125 +++++++++++--- internal/handler/email_settings.go | 1 + internal/handler/rsvp_inbound.go | 108 +++++++++++-- .../handler/rsvp_inbound_internal_test.go | 128 +++++++++++++-- internal/mailer/resend_inbound.go | 77 +++++---- internal/mailer/resend_webhooks.go | 129 +++++++++++++++ internal/mailer/resend_webhooks_test.go | 152 ++++++++++++++++++ internal/server/server.go | 1 + 12 files changed, 681 insertions(+), 96 deletions(-) create mode 100644 internal/mailer/resend_webhooks.go create mode 100644 internal/mailer/resend_webhooks_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 39d45e84..df6061e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,8 +21,10 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad up. Existing bookings keep the way they were invited. - **RSVP tracking for invites Calnode sends.** With Resend receiving set up (Settings → Email → RSVP tracking), a booker's Yes / No / Maybe is read from their calendar reply, - shown on the booking, and sent as a new `booking.rsvp` webhook event. Each invite gets a - private reply address, and an answer only counts when it comes from that booking's booker. + shown on the booking, and sent as a new `booking.rsvp` webhook event. Calnode sets up the + Resend webhook itself (manual steps as a fallback) and needs a full-access Resend API + key. Each invite gets a private reply address, and an answer only counts when Resend + verified it came from that booking's booker. ## [0.10.1] - 2026-09-29 diff --git a/DEPLOY.md b/DEPLOY.md index 6d59f380..0cddc97a 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -133,15 +133,25 @@ For event types whose calendar invite is **sent by Calnode** (event type → Cal Calnode can record whether the booker accepted, declined or said maybe. The answer shows on the booking and fires a `booking.rsvp` webhook. -1. In Resend, set up **receiving** on a subdomain, e.g. `reply.yourdomain` (one MX record). - Use a subdomain: the MX record would take over your main domain's mail. -2. In Resend → Webhooks, add `https:///v1/email/inbound/resend` for the - `email.received` event and copy its signing secret (`whsec_…`). -3. Settings → Email → RSVP tracking: enter an address on that subdomain (e.g. - `rsvp@reply.yourdomain`) and the signing secret. It also needs the Resend API key above. +It needs a **Full access** Resend API key (Settings → Email): Calnode uses it to set up the +webhook and to read the replies. A sending-only key can do neither. + +1. In Resend → Domains, enable **receiving** on a subdomain, e.g. `reply.yourdomain` (one MX + record). Use a subdomain: the MX record would take over your main domain's mail. +2. Settings → Email → RSVP tracking: enter an address on that subdomain (e.g. + `rsvp@reply.yourdomain`) and save. +3. Calnode then creates the `email.received` webhook in your Resend account and stores its + signing secret (or reuses the webhook if one already points at this instance). It needs + the instance to be reachable at a public `https://` `BASE_URL`. + +If automatic setup fails, the page says why and shows the manual steps: in Resend → Webhooks, +add `https:///v1/email/inbound/resend` for `email.received`, then paste its +signing secret (`whsec_…`) into the RSVP tracking section. Each invite is organized by its own private variant of that address, so no mailbox has to -exist. Bookings made before you switch it on keep the organizer they were invited with. +exist. An answer only counts when Resend verified the sender (DKIM or DMARC pass) and the +sender is that booking's booker. Bookings made before you switch it on keep the organizer +they were invited with. --- diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 31f306c7..8baf33cc 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -566,16 +566,20 @@ Yes/No/Maybe is an iTIP `REPLY` their mail client emails to the invite's `ORGANI booking's organizer address is fixed at its first send (`bookings.invite_organizer`, `bookingInviteOrganizer`), because clients match later updates by UID *and* organizer. With RSVP tracking set up (Settings → Email: an address on a Resend receiving domain, the -webhook signing secret, and a Resend API key) that address is private per booking, -`rsvp+<128-bit token>@domain`. Resend posts `email.received` to -`POST /v1/email/inbound/resend`; the handler verifies the Svix signature -(`mailer.VerifyResendWebhook`), routes by recipient to the booking, downloads the raw -message (`mailer.FetchReceivedRaw`), parses the `REPLY` (`mailer.ParseICSReply`), and -records the answer on `booking_attendees.rsvp_status` only if the UID is that booking's -and the answering attendee is its booker. A changed answer fires `booking.rsvp`. It -answers 200 to anything it will not act on and 5xx only when the fetch failed, so Resend -retries exactly what a retry can fix. Hosts' calendar events are not updated with the -answer: no provider has an "edit event" write op yet. +webhook signing secret, and a **full-access** Resend API key) that address is private per +booking, `rsvp+<128-bit token>@domain`. `POST /v1/settings/email/rsvp-webhook` +(`mailer.EnsureResendInboundWebhook`) creates or reuses the Resend webhook and stores its +secret; the page falls back to manual steps when it cannot. Resend posts `email.received` +to `POST /v1/email/inbound/resend`; the handler verifies the Svix signature +(`mailer.VerifyResendWebhook`), routes by recipient to a confirmed, upcoming booking, +fetches the message with Resend's own SPF/DKIM/DMARC verdicts (`mailer.FetchReceived`), +and records the answer on `booking_attendees.rsvp_status` only if Resend verified the From +domain (DKIM or DMARC pass), the From is the booker, the UID is the booking's, and the +`REPLY` answers for the booker. The body is sender-written, so its `ATTENDEE` line is never +trusted on its own. A changed answer fires `booking.rsvp`. It answers 200 to anything it +will not act on and 5xx only when the fetch failed, so Resend retries exactly what a retry +can fix. Hosts' calendar events are not updated with the answer: no provider has an "edit +event" write op yet. **Adding another provider (Apple/iCloud, CalDAV):** implement `calendar.Provider`, register it in `internal/server`, set `InvitesGuests()` correctly (drives the `.ics` diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 962fc57a..4f2172c3 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -196,6 +196,8 @@ export type EmailSettings = { resend_webhook_secret_set: boolean; // never returned directly /** True when address, webhook secret and Resend API key are all present. */ rsvp_tracking: boolean; + /** Where Resend must deliver email.received: this instance's BASE_URL + the inbound path. */ + rsvp_webhook_url: string; }; export type GoogleSettings = { diff --git a/frontend/src/routes/settings/email/+page.svelte b/frontend/src/routes/settings/email/+page.svelte index 0a66b4cb..6a5ff3fe 100644 --- a/frontend/src/routes/settings/email/+page.svelte +++ b/frontend/src/routes/settings/email/+page.svelte @@ -30,7 +30,11 @@ // RSVP tracking (Resend inbound) for invites Calnode sends itself. let rsvpAddress = $state(''); let webhookSecret = $state(''); - let webhookUrl = $state(''); + let clearWebhookSecret = $state(false); + // Automatic webhook setup in Resend; its error, when it fails, opens the manual steps. + let settingUpWebhook = $state(false); + let webhookSetupError = $state(''); + let showManualWebhook = $state(false); let userEmail = $state(''); @@ -58,10 +62,12 @@ emailFrom = email.email_from; emailFromName = email.email_from_name || 'Calnode'; rsvpAddress = email.rsvp_address ?? ''; - webhookUrl = `${window.location.origin}/v1/email/inbound/resend`; }, 'Could not load email settings')); async function save() { + // A save that removes the secret is the admin turning RSVP tracking off; it must not + // immediately set the webhook back up below. + const removingSecret = clearWebhookSecret; await savingFlag.run(async () => { const body: Record = { smtp_host: smtpHost, smtp_port: smtpPort, smtp_user: smtpUser, @@ -75,13 +81,41 @@ body.rsvp_address = rsvpAddress.trim(); // Like the API key: omit to keep the stored secret. if (webhookSecret) body.resend_webhook_secret = webhookSecret.trim(); + else if (clearWebhookSecret) body.resend_webhook_secret = ''; emailSettings = await api.patch('/v1/settings/email', body); smtpPass = ''; resendApiKey = ''; webhookSecret = ''; clearResendKey = false; + clearWebhookSecret = false; + if (emailSettings.resend_webhook_secret_set) { + webhookSetupError = ''; + showManualWebhook = false; + } toast.success('Email settings saved'); }, 'Could not save email settings'); + // First time RSVP tracking has everything but the webhook: try to set that up too, + // so the admin only falls back to the manual steps when Resend says no. + const s = emailSettings; + if (!removingSecret && s?.rsvp_address && s.resend_api_key_set && !s.resend_webhook_secret_set) { + await setupWebhook(); + } + } + + async function setupWebhook() { + settingUpWebhook = true; + webhookSetupError = ''; + try { + const res = await api.post<{ created: boolean }>('/v1/settings/email/rsvp-webhook'); + emailSettings = await api.get('/v1/settings/email'); + showManualWebhook = false; + toast.success(res.created ? 'Webhook created in Resend' : 'Connected to your existing Resend webhook'); + } catch (e: any) { + webhookSetupError = e.message || 'Could not set up the webhook in Resend.'; + showManualWebhook = true; + } finally { + settingUpWebhook = false; + } } async function test() { @@ -252,33 +286,82 @@ {/if} - {#if !emailSettings?.resend_api_key_set} -

    - Needs a Resend API key above: Calnode uses it to read the replies. -

    - {/if} +

    + Needs a Full access Resend API key above: Calnode uses it to set up the + webhook and to read replies. A sending-only key can't do either. +

    - An address on a domain Resend receives email for. Each invite gets its own private - variant of it, so answers find their booking. + An address on a subdomain you receive email on in Resend (Resend → Domains → enable + receiving, then add its MX record). Each invite gets its own private variant of it, + so answers find their booking.

    -
    - - -

    - Add this in Resend → Webhooks for the email.received event. -

    -
    -
    - - + +
    +

    Resend webhook

    + {#if emailSettings?.resend_webhook_secret_set && !clearWebhookSecret} +

    + Connected: Resend delivers replies to {emailSettings.rsvp_webhook_url}. +

    +
    + + +
    + {:else} + {#if clearWebhookSecret} +
    +

    The stored secret will be removed on save; RSVP tracking turns off.

    + +
    + {:else} +

    + Calnode can create the webhook in your Resend account and store its signing secret. +

    +
    + + +
    + {/if} + {/if} + + {#if webhookSetupError} +

    + {webhookSetupError} +

    + {/if} + + {#if showManualWebhook && !clearWebhookSecret} +
      +
    1. In Resend, open Webhooks and choose Add webhook.
    2. +
    3. + Endpoint URL: + +
    4. +
    5. Event: email.received.
    6. +
    7. + Copy the webhook's signing secret, paste it here and save: + +
    8. +
    + {/if}
    diff --git a/internal/handler/email_settings.go b/internal/handler/email_settings.go index 08f407db..0b75e026 100644 --- a/internal/handler/email_settings.go +++ b/internal/handler/email_settings.go @@ -174,6 +174,7 @@ func (h *Handler) GetEmailSettings(w http.ResponseWriter, r *http.Request) { "rsvp_address": rsvpAddr, "resend_webhook_secret_set": webhookSecretEnc != "", "rsvp_tracking": rsvpAddr != "" && webhookSecretEnc != "" && resendEnc != "", + "rsvp_webhook_url": h.rsvpWebhookURL(), }) } diff --git a/internal/handler/rsvp_inbound.go b/internal/handler/rsvp_inbound.go index fb61a9f1..9f5cc594 100644 --- a/internal/handler/rsvp_inbound.go +++ b/internal/handler/rsvp_inbound.go @@ -25,13 +25,18 @@ import ( // POST /v1/email/inbound/resend with the message's metadata; Calnode checks the signature, // fetches the message, reads the REPLY and records the answer on the booking. // -// Three checks stand between a stranger and a forged RSVP: the Resend signature, the -// unguessable per-booking address, and the REPLY's attendee having to be that booking's -// booker. A forwarded invite answered by someone else is therefore ignored. +// An answer is recorded only when all of these hold: +// - the webhook carries a valid Resend signature; +// - it is addressed to the unguessable per-booking reply address of a booking that is +// still confirmed and upcoming; +// - Resend authenticated the message's From domain (DMARC or DKIM pass) and that From is +// the booking's booker. The REPLY body itself is sender-controlled, so its ATTENDEE +// line alone proves nothing: anyone holding a forwarded invite could write one; +// - the REPLY is for this booking's event, and answers for the booker. -// fetchReceivedRaw downloads a received message from Resend; a var so tests can stand in +// fetchReceived retrieves a received message from Resend; a var so tests can stand in // for Resend. -var fetchReceivedRaw = mailer.FetchReceivedRaw +var fetchReceived = mailer.FetchReceived // rsvpStatuses are the PARTSTAT answers recorded; anything else in a REPLY is ignored. var rsvpStatuses = map[string]bool{"accepted": true, "declined": true, "tentative": true} @@ -108,11 +113,13 @@ func (h *Handler) InboundEmailResend(w http.ResponseWriter, r *http.Request) { return } + // Unconfigured and wrongly signed answer the same, so the endpoint does not reveal + // whether RSVP tracking is set up to someone probing it. var addr, secretEnc, apiKeyEnc string if err := h.db.QueryRowContext(ctx, `SELECT rsvp_address, resend_webhook_secret_enc, resend_api_key_enc FROM server_settings WHERE id = 1`). Scan(&addr, &secretEnc, &apiKeyEnc); err != nil || secretEnc == "" { - h.writeError(w, http.StatusNotFound, "inbound email is not configured") + h.writeError(w, http.StatusUnauthorized, "invalid signature") return } whSecret, err := secret.Decrypt(h.encKey, secretEnc) @@ -151,13 +158,24 @@ func (h *Handler) InboundEmailResend(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusServiceUnavailable, "resend api key not configured") return } - raw, err := fetchReceivedRaw(ctx, apiKey, ev.Data.EmailID) + msg, err := fetchReceived(ctx, apiKey, ev.Data.EmailID) if err != nil { - h.logger.ErrorContext(ctx, "inbound email: fetch message", "error", err, "booking_id", bookingID) + if errors.Is(err, mailer.ErrResendRestrictedKey) { + h.logger.ErrorContext(ctx, "inbound email: the Resend API key is sending-only; RSVP tracking needs a full-access key (Settings → Email)", + "booking_id", bookingID) + } else { + h.logger.ErrorContext(ctx, "inbound email: fetch message", "error", err, "booking_id", bookingID) + } + // 5xx so Resend retries: once the key or network is fixed, the answer still lands. h.writeError(w, http.StatusBadGateway, "could not fetch the received email") return } - reply, err := mailer.ParseICSReply(raw) + from, err := mail.ParseAddress(msg.From) + if err != nil || !strings.EqualFold(from.Address, bookerEmail) || !msg.SenderAuthenticated() { + ignore("not sent, verifiably, by this booking's booker") + return + } + reply, err := mailer.ParseICSReply(msg.Raw) if err != nil { ignore("no calendar reply in message") return @@ -191,11 +209,14 @@ func (h *Handler) InboundEmailResend(w http.ResponseWriter, r *http.Request) { } // bookingForReplyAddress finds the booking one of the recipients was minted for, and that -// booking's booker address. +// booking's booker address. Only confirmed bookings that have not ended take answers: a +// reply to a cancelled or past meeting says nothing anyone can act on, and it bounds how +// long a leaked reply address is worth anything. func (h *Handler) bookingForReplyAddress(ctx context.Context, recipients []string, base string) (bookingID, bookerEmail string) { if base == "" { return "", "" } + now := time.Now().UTC().Format(time.RFC3339) for _, rcpt := range recipients { a, err := mail.ParseAddress(rcpt) if err != nil || !isReplyAddressFor(a.Address, base) { @@ -205,7 +226,8 @@ func (h *Handler) bookingForReplyAddress(ctx context.Context, recipients []strin SELECT b.id, COALESCE(o.email, '') FROM bookings b LEFT JOIN booking_attendees o ON o.booking_id = b.id AND o.is_organizer = 1 - WHERE b.invite_organizer = ? COLLATE NOCASE`, a.Address).Scan(&bookingID, &bookerEmail) + WHERE b.invite_organizer = ? COLLATE NOCASE + AND b.status = 'confirmed' AND b.end_at > ?`, a.Address, now).Scan(&bookingID, &bookerEmail) if err == nil { return bookingID, bookerEmail } @@ -253,3 +275,67 @@ func (h *Handler) enqueueRSVPWebhook(ctx context.Context, bookingID, status stri h.logger.ErrorContext(ctx, "enqueue booking.rsvp webhook", "error", err, "booking_id", bookingID) } } + +// ensureInboundWebhook creates or reuses the Resend webhook; a var so tests can stand in +// for Resend. +var ensureInboundWebhook = mailer.EnsureResendInboundWebhook + +// rsvpWebhookURL is where Resend has to deliver email.received for this instance. +func (h *Handler) rsvpWebhookURL() string { + return strings.TrimRight(h.baseURL, "/") + "/v1/email/inbound/resend" +} + +// SetupRSVPWebhook handles POST /v1/settings/email/rsvp-webhook (admin). It points a +// Resend webhook for email.received at this instance - reusing one that already targets +// it - and stores its signing secret, so the operator never copies a secret by hand. +// When that cannot work (no public https address, a sending-only key) the error says +// why, and the settings page falls back to the manual steps. +func (h *Handler) SetupRSVPWebhook(w http.ResponseWriter, r *http.Request) { + if _, ok := h.requireAdmin(w, r); !ok { + return + } + if h.demoMode { + h.writeError(w, http.StatusServiceUnavailable, "not available in the demo") + return + } + ctx := r.Context() + endpoint := h.rsvpWebhookURL() + if !strings.HasPrefix(endpoint, "https://") { + h.writeError(w, http.StatusUnprocessableEntity, + "Resend can only deliver to a public https address, and this instance is at "+h.baseURL+ + ". Set the webhook up by hand once it is reachable over https.") + return + } + var keyEnc string + if err := h.db.QueryRowContext(ctx, + `SELECT resend_api_key_enc FROM server_settings WHERE id = 1`).Scan(&keyEnc); err != nil || keyEnc == "" { + h.writeError(w, http.StatusUnprocessableEntity, "Add a Resend API key above first.") + return + } + apiKey, err := secret.Decrypt(h.encKey, keyEnc) + if err != nil { + h.logger.ErrorContext(ctx, "rsvp webhook setup: decrypt resend key", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + + whSecret, created, err := ensureInboundWebhook(ctx, apiKey, endpoint) + switch { + case errors.Is(err, mailer.ErrResendRestrictedKey): + h.writeError(w, http.StatusUnprocessableEntity, + "Your Resend API key can only send email. RSVP tracking needs a Full access key "+ + "(Resend → API Keys) to set up the webhook and read replies. Replace the key above, "+ + "or set the webhook up by hand.") + return + case err != nil: + h.logger.ErrorContext(ctx, "rsvp webhook setup", "error", err) + h.writeError(w, http.StatusBadGateway, "Resend could not set up the webhook: "+err.Error()) + return + } + if err := h.storeEmailSecret(ctx, h.db, secretResendWebhook, whSecret); err != nil { + h.logger.ErrorContext(ctx, "rsvp webhook setup: store secret", "error", err) + h.writeError(w, http.StatusInternalServerError, "internal error") + return + } + h.writeJSON(w, http.StatusOK, map[string]any{"created": created, "webhook_url": endpoint}) +} diff --git a/internal/handler/rsvp_inbound_internal_test.go b/internal/handler/rsvp_inbound_internal_test.go index e6f8db9e..a102c93c 100644 --- a/internal/handler/rsvp_inbound_internal_test.go +++ b/internal/handler/rsvp_inbound_internal_test.go @@ -16,6 +16,7 @@ import ( "time" "github.com/calnode/calnode/internal/booking" + "github.com/calnode/calnode/internal/mailer" "github.com/calnode/calnode/internal/secret" ) @@ -46,17 +47,22 @@ func newRSVPFixture(t *testing.T) *inviteFixture { return f } -// stubResend stands in for Resend's Received emails API, serving raw for any email id. -func stubResend(t *testing.T, raw []byte) { +// stubResend stands in for Resend's Received emails API, serving msg for any email id. +func stubResend(t *testing.T, msg mailer.ReceivedEmail) { t.Helper() - prev := fetchReceivedRaw - fetchReceivedRaw = func(_ context.Context, apiKey, _ string) ([]byte, error) { + prev := fetchReceived + fetchReceived = func(_ context.Context, apiKey, _ string) (mailer.ReceivedEmail, error) { if apiKey != "re_test_key" { - return nil, errors.New("wrong api key") + return mailer.ReceivedEmail{}, errors.New("wrong api key") } - return raw, nil + return msg, nil } - t.Cleanup(func() { fetchReceivedRaw = prev }) + t.Cleanup(func() { fetchReceived = prev }) +} + +// sentBy is a received message whose From Resend verified (DKIM and DMARC pass). +func sentBy(from string, raw []byte) mailer.ReceivedEmail { + return mailer.ReceivedEmail{Raw: raw, From: "Someone <" + from + ">", DKIM: "pass", DMARC: "pass"} } func replyMessage(uid, attendee, partstat string) []byte { @@ -114,7 +120,7 @@ func TestRSVP_bookerAnswerIsRecorded(t *testing.T) { t.Fatalf("invite is not organized by a per-booking reply address:\n%s", icsOf(msg)) } replyAddr := m[1] - stubResend(t, replyMessage(id+"@calnode", inviteBookerEmail, "ACCEPTED")) + stubResend(t, sentBy(inviteBookerEmail, replyMessage(id+"@calnode", inviteBookerEmail, "ACCEPTED"))) rec := f.postInbound(t, replyAddr, rsvpSecret) if rec.Code != http.StatusOK || !strings.Contains(rec.Body.String(), "accepted") { @@ -125,8 +131,9 @@ func TestRSVP_bookerAnswerIsRecorded(t *testing.T) { } } -// The signature, the event UID and the booker check must each, on their own, stop an -// answer from being recorded. +// Each check must, on its own, stop an answer from being recorded: the Resend signature, +// a From that Resend verified and that is the booker, and the event UID. The REPLY body is +// written by whoever sends it, so its ATTENDEE line alone is never trusted. func TestRSVP_rejectsWhatIsNotTheBookersAnswer(t *testing.T) { f := newRSVPFixture(t) if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { @@ -137,20 +144,32 @@ func TestRSVP_rejectsWhatIsNotTheBookersAnswer(t *testing.T) { if !isReplyAddressFor(replyAddr, rsvpInbox) { t.Fatalf("invite organizer %q is not a reply address; the checks below would pass vacuously", replyAddr) } + bookersDecline := replyMessage(id+"@calnode", inviteBookerEmail, "DECLINED") t.Run("forged webhook", func(t *testing.T) { - stubResend(t, replyMessage(id+"@calnode", inviteBookerEmail, "DECLINED")) + stubResend(t, sentBy(inviteBookerEmail, bookersDecline)) other := "whsec_" + base64.StdEncoding.EncodeToString([]byte("not-the-secret")) if rec := f.postInbound(t, replyAddr, other); rec.Code != http.StatusUnauthorized { t.Errorf("unsigned-by-Resend webhook: %d; want 401", rec.Code) } }) t.Run("forwarded invite answered by someone else", func(t *testing.T) { - stubResend(t, replyMessage(id+"@calnode", "colleague@elsewhere.example", "DECLINED")) + stubResend(t, sentBy("colleague@elsewhere.example", + replyMessage(id+"@calnode", "colleague@elsewhere.example", "DECLINED"))) + f.postInbound(t, replyAddr, rsvpSecret) + }) + t.Run("booker's answer forged from another mailbox", func(t *testing.T) { + stubResend(t, sentBy("attacker@evil.example", bookersDecline)) + f.postInbound(t, replyAddr, rsvpSecret) + }) + t.Run("booker's address typed into an unverified From", func(t *testing.T) { + spoofed := sentBy(inviteBookerEmail, bookersDecline) + spoofed.DKIM, spoofed.DMARC = "fail", "fail" + stubResend(t, spoofed) f.postInbound(t, replyAddr, rsvpSecret) }) t.Run("reply for another event", func(t *testing.T) { - stubResend(t, replyMessage("someone-else@calnode", inviteBookerEmail, "DECLINED")) + stubResend(t, sentBy(inviteBookerEmail, replyMessage("someone-else@calnode", inviteBookerEmail, "DECLINED"))) f.postInbound(t, replyAddr, rsvpSecret) }) if got := f.rsvpStatus(t, id); got != "needs-action" { @@ -158,6 +177,25 @@ func TestRSVP_rejectsWhatIsNotTheBookersAnswer(t *testing.T) { } } +// A cancelled booking takes no answers: nothing can act on them, and it ends the reply +// address's usefulness. +func TestRSVP_cancelledBookingTakesNoAnswer(t *testing.T) { + f := newRSVPFixture(t) + if rec := f.createEventType(t, "intro", booking.InviteByCalnode); rec.Code != http.StatusCreated { + t.Fatalf("create event type: %d — %s", rec.Code, rec.Body.String()) + } + id, msg := f.book(t, "intro") + replyAddr := organizerLine.FindStringSubmatch(icsOf(msg))[1] + if err := f.h.bookingSvc.CancelByID(context.Background(), id, ""); err != nil { + t.Fatal(err) + } + stubResend(t, sentBy(inviteBookerEmail, replyMessage(id+"@calnode", inviteBookerEmail, "ACCEPTED"))) + f.postInbound(t, replyAddr, rsvpSecret) + if got := f.rsvpStatus(t, id); got != "needs-action" { + t.Errorf("rsvp_status = %q on a cancelled booking; want needs-action", got) + } +} + // Calendar clients match a cancellation to the invite by UID and organizer. Changing the // RSVP inbox after a booking was made must not change the organizer its cancellation uses. func TestRSVP_organizerStaysFixedForTheBookingsLifetime(t *testing.T) { @@ -190,3 +228,67 @@ func TestRSVP_organizerStaysFixedForTheBookingsLifetime(t *testing.T) { t.Errorf("cancellation organizer = %v; want the invite's original %s:\n%s", m, first, cancelICS) } } + +func (f *inviteFixture) setupWebhook(t *testing.T) *httptest.ResponseRecorder { + t.Helper() + return f.do(t, f.h.SetupRSVPWebhook, http.MethodPost, "/v1/settings/email/rsvp-webhook", "") +} + +func stubEnsureWebhook(t *testing.T, fn func(ctx context.Context, apiKey, endpoint string) (string, bool, error)) { + t.Helper() + prev := ensureInboundWebhook + ensureInboundWebhook = fn + t.Cleanup(func() { ensureInboundWebhook = prev }) +} + +// The one-click path: Calnode points Resend at itself and stores the secret, and RSVP +// tracking is on without the admin ever handling the secret. +func TestRSVPWebhookSetup_storesSecretFromResend(t *testing.T) { + f := newRSVPFixture(t) + if _, err := f.h.db.Exec(`UPDATE server_settings SET resend_webhook_secret_enc = '' WHERE id = 1`); err != nil { + t.Fatal(err) + } + var gotEndpoint string + stubEnsureWebhook(t, func(_ context.Context, apiKey, endpoint string) (string, bool, error) { + gotEndpoint = endpoint + return rsvpSecret, true, nil + }) + + if rec := f.setupWebhook(t); rec.Code != http.StatusOK { + t.Fatalf("setup: %d — %s", rec.Code, rec.Body.String()) + } + if gotEndpoint != "https://book.team.example/v1/email/inbound/resend" { + t.Errorf("webhook endpoint = %q; want this instance's inbound URL", gotEndpoint) + } + if f.h.rsvpAddress(context.Background()) != rsvpInbox { + t.Error("RSVP tracking is still off after the webhook secret was stored") + } + // The stored secret is the one Resend signs with: a signed delivery now verifies. + if rec := f.postInbound(t, rsvpInbox, rsvpSecret); rec.Code != http.StatusOK { + t.Errorf("delivery signed with the stored secret: %d — %s", rec.Code, rec.Body.String()) + } +} + +// When automatic setup cannot work, the admin is told why in words they can act on. +func TestRSVPWebhookSetup_explainsWhyItCannot(t *testing.T) { + f := newRSVPFixture(t) + stubEnsureWebhook(t, func(context.Context, string, string) (string, bool, error) { + return "", false, mailer.ErrResendRestrictedKey + }) + rec := f.setupWebhook(t) + if rec.Code != http.StatusUnprocessableEntity || !strings.Contains(rec.Body.String(), "Full access") { + t.Errorf("sending-only key: %d — %s; want 422 asking for a Full access key", rec.Code, rec.Body.String()) + } + + called := false + stubEnsureWebhook(t, func(context.Context, string, string) (string, bool, error) { + called = true + return "", false, nil + }) + f.h.SetMailer(f.mail, "http://localhost:3000") + rec = f.setupWebhook(t) + if rec.Code != http.StatusUnprocessableEntity || !strings.Contains(rec.Body.String(), "https") || called { + t.Errorf("non-https instance: %d — %s (Resend called: %v); want 422 before calling Resend", + rec.Code, rec.Body.String(), called) + } +} diff --git a/internal/mailer/resend_inbound.go b/internal/mailer/resend_inbound.go index ba95717e..3c4cef99 100644 --- a/internal/mailer/resend_inbound.go +++ b/internal/mailer/resend_inbound.go @@ -5,7 +5,6 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" - "encoding/json" "errors" "fmt" "io" @@ -84,55 +83,69 @@ func (e ResendInboundEvent) Recipients() []string { return append(out, e.Data.ReceivedFor...) } -// resendReceivingEndpoint is the Received emails API. A var so tests can stub it. -var resendReceivingEndpoint = "https://api.resend.com/emails/receiving/" - // maxRawEmail bounds a downloaded message. An RSVP is a few KB; this only stops a // pathological message from being read into memory whole. const maxRawEmail = 5 << 20 -// FetchReceivedRaw downloads the original bytes of a received email: one API call for the -// short-lived signed URL, one GET for the message. -func FetchReceivedRaw(ctx context.Context, apiKey, emailID string) ([]byte, error) { - if apiKey == "" { - return nil, errors.New("resend inbound: api key not configured") - } - client := &http.Client{Timeout: resendTimeout} +// ReceivedEmail is a message Resend received: its original bytes plus what Resend itself +// established about the sender. From is the header From address; the authentication +// results are computed by Resend's receiving server, so the sender cannot forge them. +type ReceivedEmail struct { + Raw []byte + From string + SPF string // "pass", "fail", "gray", ...; "" when Resend reported none + DKIM string + // DMARC "pass" means SPF or DKIM passed aligned with the From domain. + DMARC string +} - req, err := http.NewRequestWithContext(ctx, http.MethodGet, resendReceivingEndpoint+url.PathEscape(emailID), nil) - if err != nil { - return nil, err - } - req.Header.Set("Authorization", "Bearer "+apiKey) - resp, err := client.Do(req) - if err != nil { - return nil, fmt.Errorf("resend inbound: retrieve email: %w", err) - } +// SenderAuthenticated reports whether Resend verified the From domain: DMARC passed, or +// DKIM passed (Resend's DKIM pass requires the signing domain to match From). A header +// From that nothing vouches for is just text anyone can type. +func (e ReceivedEmail) SenderAuthenticated() bool { + return e.DMARC == "pass" || e.DKIM == "pass" +} + +// FetchReceived retrieves a received email: one API call for its metadata and the +// short-lived raw download URL, one GET for the message. Needs a full-access API key; +// a sending-only key fails with ErrResendRestrictedKey. +func FetchReceived(ctx context.Context, apiKey, emailID string) (ReceivedEmail, error) { var meta struct { + From string `json:"from"` + Authentication *struct { + SPF string `json:"spf"` + DKIM string `json:"dkim"` + DMARC string `json:"dmarc"` + } `json:"authentication"` Raw *struct { DownloadURL string `json:"download_url"` } `json:"raw"` } - decodeErr := json.NewDecoder(io.LimitReader(resp.Body, 1<<20)).Decode(&meta) - resp.Body.Close() // #nosec G104 -- body fully consumed above; a close error changes nothing - if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("resend inbound: retrieve email: status %d", resp.StatusCode) + if err := resendAPI(ctx, apiKey, http.MethodGet, "/emails/receiving/"+url.PathEscape(emailID), nil, &meta); err != nil { + return ReceivedEmail{}, fmt.Errorf("resend inbound: retrieve email: %w", err) + } + if meta.Raw == nil || meta.Raw.DownloadURL == "" { + return ReceivedEmail{}, errors.New("resend inbound: retrieve email: no raw download url") } - if decodeErr != nil || meta.Raw == nil || meta.Raw.DownloadURL == "" { - return nil, errors.New("resend inbound: retrieve email: no raw download url") + got := ReceivedEmail{From: meta.From} + if a := meta.Authentication; a != nil { + got.SPF, got.DKIM, got.DMARC = a.SPF, a.DKIM, a.DMARC } - req, err = http.NewRequestWithContext(ctx, http.MethodGet, meta.Raw.DownloadURL, nil) + req, err := http.NewRequestWithContext(ctx, http.MethodGet, meta.Raw.DownloadURL, nil) if err != nil { - return nil, err + return ReceivedEmail{}, err } - resp, err = client.Do(req) + resp, err := (&http.Client{Timeout: resendTimeout}).Do(req) if err != nil { - return nil, fmt.Errorf("resend inbound: download raw email: %w", err) + return ReceivedEmail{}, fmt.Errorf("resend inbound: download raw email: %w", err) } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("resend inbound: download raw email: status %d", resp.StatusCode) + return ReceivedEmail{}, fmt.Errorf("resend inbound: download raw email: status %d", resp.StatusCode) + } + if got.Raw, err = io.ReadAll(io.LimitReader(resp.Body, maxRawEmail)); err != nil { + return ReceivedEmail{}, fmt.Errorf("resend inbound: download raw email: %w", err) } - return io.ReadAll(io.LimitReader(resp.Body, maxRawEmail)) + return got, nil } diff --git a/internal/mailer/resend_webhooks.go b/internal/mailer/resend_webhooks.go new file mode 100644 index 00000000..4e96598f --- /dev/null +++ b/internal/mailer/resend_webhooks.go @@ -0,0 +1,129 @@ +package mailer + +import ( + "bytes" + "context" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "net/url" + "slices" +) + +// resendAPIBase is Resend's REST API. A var so tests can point it at a stub. +var resendAPIBase = "https://api.resend.com" + +// ErrResendRestrictedKey means the API key is a sending-only key. RSVP tracking reads +// received emails and manages webhooks, which Resend reserves for full-access keys. +var ErrResendRestrictedKey = errors.New("resend: this API key can only send email; RSVP tracking needs a full-access key") + +// resendAPI makes one authenticated JSON call to the Resend API, decoding the response +// into out (when non-nil). Non-2xx answers become errors carrying Resend's own message; +// a sending-only key is reported as ErrResendRestrictedKey so callers can explain it. +func resendAPI(ctx context.Context, apiKey, method, path string, body, out any) error { + if apiKey == "" { + return errors.New("resend: api key not configured") + } + var reqBody io.Reader + if body != nil { + b, err := json.Marshal(body) + if err != nil { + return err + } + reqBody = bytes.NewReader(b) + } + req, err := http.NewRequestWithContext(ctx, method, resendAPIBase+path, reqBody) + if err != nil { + return err + } + req.Header.Set("Authorization", "Bearer "+apiKey) + if body != nil { + req.Header.Set("Content-Type", "application/json") + } + resp, err := (&http.Client{Timeout: resendTimeout}).Do(req) + if err != nil { + return fmt.Errorf("%w: %v", ErrUnreachable, err) + } + defer resp.Body.Close() + data, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20)) + if err != nil { + return err + } + if resp.StatusCode < 200 || resp.StatusCode > 299 { + var apiErr struct { + Name string `json:"name"` + Message string `json:"message"` + } + _ = json.Unmarshal(data, &apiErr) + if apiErr.Name == "restricted_api_key" && resp.StatusCode == http.StatusUnauthorized { + return ErrResendRestrictedKey + } + if apiErr.Message != "" { + return fmt.Errorf("resend api %d: %s", resp.StatusCode, apiErr.Message) + } + return fmt.Errorf("resend api %d", resp.StatusCode) + } + if out == nil { + return nil + } + return json.Unmarshal(data, out) +} + +// inboundWebhookEvent is the only event RSVP tracking subscribes to. +const inboundWebhookEvent = "email.received" + +// EnsureResendInboundWebhook makes sure Resend delivers email.received events to endpoint +// and returns that webhook's signing secret. An existing webhook for the same endpoint is +// reused (subscribed to email.received and enabled if it was not), so running this again +// never piles up duplicates or rotates a secret that is already stored. +func EnsureResendInboundWebhook(ctx context.Context, apiKey, endpoint string) (secret string, created bool, err error) { + var list struct { + Data []struct { + ID string `json:"id"` + Endpoint string `json:"endpoint"` + Status string `json:"status"` + Events []string `json:"events"` + } `json:"data"` + } + if err := resendAPI(ctx, apiKey, http.MethodGet, "/webhooks", nil, &list); err != nil { + return "", false, fmt.Errorf("list webhooks: %w", err) + } + + var got struct { + ID string `json:"id"` + SigningSecret string `json:"signing_secret"` + } + for _, wh := range list.Data { + if wh.Endpoint != endpoint { + continue + } + if !slices.Contains(wh.Events, inboundWebhookEvent) || wh.Status != "enabled" { + events := wh.Events + if !slices.Contains(events, inboundWebhookEvent) { + events = append(slices.Clone(events), inboundWebhookEvent) + } + update := map[string]any{"events": events, "status": "enabled"} + if err := resendAPI(ctx, apiKey, http.MethodPatch, "/webhooks/"+url.PathEscape(wh.ID), update, nil); err != nil { + return "", false, fmt.Errorf("update webhook: %w", err) + } + } + if err := resendAPI(ctx, apiKey, http.MethodGet, "/webhooks/"+url.PathEscape(wh.ID), nil, &got); err != nil { + return "", false, fmt.Errorf("retrieve webhook: %w", err) + } + if got.SigningSecret == "" { + return "", false, errors.New("retrieve webhook: no signing secret in response") + } + return got.SigningSecret, false, nil + } + + create := map[string]any{"endpoint": endpoint, "events": []string{inboundWebhookEvent}} + if err := resendAPI(ctx, apiKey, http.MethodPost, "/webhooks", create, &got); err != nil { + return "", false, fmt.Errorf("create webhook: %w", err) + } + if got.SigningSecret == "" { + return "", false, errors.New("create webhook: no signing secret in response") + } + return got.SigningSecret, true, nil +} diff --git a/internal/mailer/resend_webhooks_test.go b/internal/mailer/resend_webhooks_test.go new file mode 100644 index 00000000..e89bf314 --- /dev/null +++ b/internal/mailer/resend_webhooks_test.go @@ -0,0 +1,152 @@ +package mailer + +import ( + "context" + "encoding/json" + "errors" + "net/http" + "net/http/httptest" + "slices" + "sync" + "testing" +) + +// fakeResend is a stand-in for the parts of Resend's API that RSVP tracking uses. It +// records every call as "METHOD /path". +type fakeResend struct { + mu sync.Mutex + calls []string + webhooks []map[string]any + patched map[string]any + created map[string]any +} + +func (f *fakeResend) start(t *testing.T, apiKey string) { + t.Helper() + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + f.mu.Lock() + defer f.mu.Unlock() + f.calls = append(f.calls, r.Method+" "+r.URL.Path) + w.Header().Set("Content-Type", "application/json") + if r.URL.Path == "/raw/em_1" { // the signed download URL carries no API key + _, _ = w.Write([]byte("From: guest@booker.example\r\n\r\nhello")) + return + } + if r.Header.Get("Authorization") != "Bearer "+apiKey { + w.WriteHeader(http.StatusUnauthorized) + _, _ = w.Write([]byte(`{"statusCode":401,"name":"restricted_api_key","message":"This API key is restricted to only send emails."}`)) + return + } + switch { + case r.Method == http.MethodGet && r.URL.Path == "/webhooks": + _ = json.NewEncoder(w).Encode(map[string]any{"object": "list", "data": f.webhooks}) + case r.Method == http.MethodPost && r.URL.Path == "/webhooks": + _ = json.NewDecoder(r.Body).Decode(&f.created) + _, _ = w.Write([]byte(`{"object":"webhook","id":"wh_new","signing_secret":"whsec_new"}`)) + case r.Method == http.MethodPatch && r.URL.Path == "/webhooks/wh_old": + _ = json.NewDecoder(r.Body).Decode(&f.patched) + _, _ = w.Write([]byte(`{"object":"webhook","id":"wh_old"}`)) + case r.Method == http.MethodGet && r.URL.Path == "/webhooks/wh_old": + _, _ = w.Write([]byte(`{"object":"webhook","id":"wh_old","signing_secret":"whsec_old"}`)) + case r.Method == http.MethodGet && r.URL.Path == "/emails/receiving/em_1": + _ = json.NewEncoder(w).Encode(map[string]any{ + "object": "email", "id": "em_1", "from": "Guest ", + "authentication": map[string]string{"spf": "pass", "dkim": "pass", "dmarc": "gray"}, + "raw": map[string]string{"download_url": "http://" + r.Host + "/raw/em_1"}, + }) + default: + w.WriteHeader(http.StatusNotFound) + } + })) + t.Cleanup(srv.Close) + prev := resendAPIBase + resendAPIBase = srv.URL + t.Cleanup(func() { resendAPIBase = prev }) +} + +const inboundURL = "https://book.example.com/v1/email/inbound/resend" + +func TestEnsureResendInboundWebhook_createsWhenMissing(t *testing.T) { + f := &fakeResend{webhooks: []map[string]any{ + {"id": "wh_other", "endpoint": "https://other.example.com/hook", "status": "enabled", "events": []string{"email.sent"}}, + }} + f.start(t, "re_full") + + secret, created, err := EnsureResendInboundWebhook(context.Background(), "re_full", inboundURL) + if err != nil { + t.Fatalf("ensure: %v", err) + } + if secret != "whsec_new" || !created { + t.Errorf("got secret %q created %v; want the new webhook's secret", secret, created) + } + if f.created["endpoint"] != inboundURL || !slices.Equal(toStrings(f.created["events"]), []string{"email.received"}) { + t.Errorf("created webhook = %v; want our endpoint subscribed to email.received", f.created) + } +} + +// Running setup again, or after someone added the webhook by hand, must reuse it: a +// second webhook would deliver every reply twice. +func TestEnsureResendInboundWebhook_reusesAndRepairsExisting(t *testing.T) { + f := &fakeResend{webhooks: []map[string]any{ + {"id": "wh_old", "endpoint": inboundURL, "status": "disabled", "events": []string{"email.bounced"}}, + }} + f.start(t, "re_full") + + secret, created, err := EnsureResendInboundWebhook(context.Background(), "re_full", inboundURL) + if err != nil { + t.Fatalf("ensure: %v", err) + } + if secret != "whsec_old" || created { + t.Errorf("got secret %q created %v; want the existing webhook's secret, nothing created", secret, created) + } + if slices.Contains(f.calls, "POST /webhooks") { + t.Errorf("created a duplicate webhook: calls %v", f.calls) + } + events := toStrings(f.patched["events"]) + if f.patched["status"] != "enabled" || !slices.Contains(events, "email.received") || !slices.Contains(events, "email.bounced") { + t.Errorf("patch = %v; want it enabled with email.received added and existing events kept", f.patched) + } +} + +// A sending-only key is the common mistake: it must come back as the error the settings +// page can explain, not as a generic 401. +func TestEnsureResendInboundWebhook_sendingOnlyKey(t *testing.T) { + f := &fakeResend{} + f.start(t, "re_full") + _, _, err := EnsureResendInboundWebhook(context.Background(), "re_sending_only", inboundURL) + if !errors.Is(err, ErrResendRestrictedKey) { + t.Errorf("got %v; want ErrResendRestrictedKey", err) + } +} + +// The sender check that guards RSVPs reads Resend's authentication results; misreading +// them would silently drop every answer (or, worse, trust unverified ones). +func TestFetchReceived_returnsSenderAndAuthentication(t *testing.T) { + f := &fakeResend{} + f.start(t, "re_full") + got, err := FetchReceived(context.Background(), "re_full", "em_1") + if err != nil { + t.Fatalf("FetchReceived: %v", err) + } + if got.From != "Guest " || string(got.Raw) != "From: guest@booker.example\r\n\r\nhello" { + t.Errorf("got From %q raw %q", got.From, got.Raw) + } + if got.DKIM != "pass" || got.DMARC != "gray" || !got.SenderAuthenticated() { + t.Errorf("authentication = %+v; want DKIM pass to authenticate the sender", got) + } + if _, err := FetchReceived(context.Background(), "re_sending_only", "em_1"); !errors.Is(err, ErrResendRestrictedKey) { + t.Errorf("sending-only key: got %v; want ErrResendRestrictedKey", err) + } +} + +func toStrings(v any) []string { + var out []string + if list, ok := v.([]any); ok { + for _, s := range list { + if str, ok := s.(string); ok { + out = append(out, str) + } + } + } + return out +} diff --git a/internal/server/server.go b/internal/server/server.go index b7810a78..6c0c07ca 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -365,6 +365,7 @@ func New(ctx context.Context, cfg *config.Config, db *sql.DB, logger *slog.Logge mux.HandleFunc("GET /v1/settings/email", h.RequireAuth(h.GetEmailSettings)) mux.HandleFunc("PATCH /v1/settings/email", settingsRL(h.RequireAuth(h.PatchEmailSettings))) mux.HandleFunc("POST /v1/settings/email/test", settingsRL(h.RequireAuth(h.TestEmailConnection))) + mux.HandleFunc("POST /v1/settings/email/rsvp-webhook", settingsRL(h.RequireAuth(h.SetupRSVPWebhook))) mux.HandleFunc("GET /v1/settings/google", h.RequireAuth(h.GetGoogleSettings)) mux.HandleFunc("PATCH /v1/settings/google", settingsRL(h.RequireAuth(h.PatchGoogleSettings))) mux.HandleFunc("GET /v1/settings/zoom", h.RequireAuth(h.GetZoomSettings)) From c53efae5cf5f65e87cb10ba14edc3522b893c161 Mon Sep 17 00:00:00 2001 From: ilbertt Date: Thu, 1 Oct 2026 11:12:31 +0200 Subject: [PATCH 097/250] ci: publish standalone Linux release archives --- .github/workflows/docker-publish.yml | 46 +++++++++++++++++++++++++--- DEPLOY.md | 34 +++++++++++++++++++- Dockerfile | 5 +++ README.md | 6 ++++ 4 files changed, 86 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 727cb844..b303a088 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -8,7 +8,8 @@ name: Docker publish # Deliberately does NOT move `:edge` or `:latest`. # * push to main → push `:edge` + `:sha-` (bleeding edge). # * push a `vX.Y.Z` tag → push `:X.Y.Z`, `:X.Y`, and `:latest`, then cut a GitHub -# Release. So `:latest` always tracks the newest *release*, +# Release with standalone binaries and checksums. +# So `:latest` always tracks the newest *release*, # never raw main. # # Pin a deployment to `:sha-`, never to `:dev` or `:edge` — those move under @@ -28,6 +29,7 @@ env: # Hardcoded lowercase — GHCR tags reject the repo's actual "Calnode/calnode" # casing (${{ github.repository }} would break the push). IMAGE_NAME: calnode/calnode + BUILD_PLATFORMS: linux/amd64,linux/arm64 jobs: build: @@ -73,7 +75,7 @@ jobs: uses: docker/build-push-action@v7 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: ${{ env.BUILD_PLATFORMS }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} @@ -81,6 +83,37 @@ jobs: VERSION=${{ steps.meta.outputs.version }} COMMIT=${{ github.sha }} + - name: Export standalone binaries + uses: docker/build-push-action@v7 + with: + context: . + target: standalone + platforms: ${{ env.BUILD_PLATFORMS }} + outputs: type=local,dest=dist/binaries,platform-split=true + build-args: | + VERSION=${{ steps.meta.outputs.version }} + COMMIT=${{ github.sha }} + + - name: Package standalone binaries + env: + VERSION: ${{ steps.meta.outputs.version }} + run: | + mkdir -p dist/release + for platform_dir in dist/binaries/linux_*; do + platform="${platform_dir##*/}" + tar -czf "dist/release/calnode_${VERSION#v}_${platform}.tar.gz" \ + -C "$platform_dir" calnode LICENSE + done + cd dist/release + sha256sum ./*.tar.gz > checksums.txt + + - name: Upload standalone binaries + uses: actions/upload-artifact@v4 + with: + name: standalone-binaries + path: dist/release/ + if-no-files-found: error + release: # Only on a version tag, and only once the image built + pushed. if: startsWith(github.ref, 'refs/tags/v') @@ -91,6 +124,11 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: standalone-binaries + path: dist/release + # Pull the matching version's section out of CHANGELOG.md for the release body, # so the GitHub Release and the CHANGELOG stay identical. Index-based (not a `\[` # regex) so it's portable across awk flavours. Falls back to GitHub's @@ -119,8 +157,8 @@ jobs: run: | if [ "${{ steps.notes.outputs.have_notes }}" = "true" ]; then gh release create "$GITHUB_REF_NAME" --title "$GITHUB_REF_NAME" \ - --notes-file release-notes.md --verify-tag + --notes-file release-notes.md --verify-tag dist/release/* else gh release create "$GITHUB_REF_NAME" --title "$GITHUB_REF_NAME" \ - --generate-notes --verify-tag + --generate-notes --verify-tag dist/release/* fi diff --git a/DEPLOY.md b/DEPLOY.md index 0cddc97a..7e298686 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -14,9 +14,41 @@ small Alpine runtime) and published to GHCR: Or build it yourself with `docker build -t calnode .`. -This guide covers a generic Docker deploy and a step-by-step **Railway** deploy +This guide covers a standalone binary, a generic Docker deploy and a step-by-step **Railway** deploy (the current reference host). +## Standalone binary + +Download `calnode__linux_amd64.tar.gz` (x86-64) or +`calnode__linux_arm64.tar.gz` (ARM64), plus `checksums.txt`, from the same +[GitHub release](https://github.com/Calnode/calnode/releases). Each archive contains +the same static executable as the corresponding container image, with the admin +UI and timezone database embedded, and the Apache-2.0 license. No Go, Node or Docker +installation is needed to run it. + +For example, after downloading the amd64 archive and checksums for your chosen release: + +```bash +version=X.Y.Z # replace with the downloaded release version, without the v prefix +sha256sum --check --ignore-missing checksums.txt +tar -xzf "calnode_${version}_linux_amd64.tar.gz" +mkdir -p data +export CALNODE_ENCRYPTION_KEY="$(openssl rand -hex 32)" +export CALNODE_RECOVERY_SECRET="$(openssl rand -hex 32)" +BASE_URL=http://localhost:3000 DATABASE_URL=sqlite://./data/calnode.db ./calnode +``` + +Save both generated secrets before restarting; reuse them on subsequent starts and +keep the recovery secret separately. For production, set `BASE_URL` to your HTTPS +address, use a persistent data directory, and place the process behind a +TLS-terminating proxy that preserves `Host`. The Linux host needs a CA certificate +store for outbound HTTPS. Run the process under a service manager for automatic restarts. + +The archive does **not** include Litestream or the container entrypoint. Setting +`LITESTREAM_REPLICA_URL` alone will not start backups or restore a database when running +the binary directly; configure Litestream separately or use another SQLite-aware +backup method. The email, calendar and other integration settings below still apply. + --- ## 1. Configuration (environment variables) diff --git a/Dockerfile b/Dockerfile index 605af93c..ab6d4426 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,11 @@ RUN wget -qO- \ "https://github.com/benbjohnson/litestream/releases/download/v${LITESTREAM_VERSION}/litestream-v${LITESTREAM_VERSION}-linux-${TARGETARCH}.tar.gz" \ | tar -xz -C /usr/local/bin litestream +# Export the same executable as the container, including its embedded frontend. +FROM scratch AS standalone +COPY --from=builder /build/calnode /calnode +COPY LICENSE /LICENSE + # ── Runtime stage ───────────────────────────────────────────────────────────── # alpine (not scratch) — needed for the shell entrypoint and Litestream. # No --platform pin here: inherits the build host's native architecture, diff --git a/README.md b/README.md index ac5c67d0..411efeb1 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,12 @@ bookings they host. (The stdio subcommand is the local operator → full access. ## Deploy for real +**Without Docker:** [GitHub releases](https://github.com/Calnode/calnode/releases) +include standalone Linux amd64 and arm64 archives, each containing the static +`calnode` binary and its license, alongside SHA-256 checksums. See +[running the standalone binary](DEPLOY.md#standalone-binary) for setup and backup +differences from the container. + ```bash docker run -d -p 3000:3000 \ -e BASE_URL=https://booking.example.com \ From fdae16b2e9cc7f5fea8179ad2bc2e131ea1eb0c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 09:25:23 +0000 Subject: [PATCH 098/250] @ilbertt has signed the CLA in Calnode/calnode#112 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index 259a49c4..d5f82122 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -55,6 +55,14 @@ "created_at": "2026-09-29T21:19:11Z", "repoId": 1277491008, "pullRequestNo": 110 + }, + { + "name": "ilbertt", + "id": 12596698, + "comment_id": 5928580128, + "created_at": "2026-10-01T09:25:10Z", + "repoId": 1277491008, + "pullRequestNo": 112 } ] } \ No newline at end of file From 40df6e375395a0f51642b322b5819941031e016a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:40:56 +0000 Subject: [PATCH 099/250] chore(deps): bump alpine from 3.21 to 3.24 Bumps alpine from 3.21 to 3.24. --- updated-dependencies: - dependency-name: alpine dependency-version: '3.24' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 605af93c..ddcf81c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ RUN wget -qO- \ # alpine (not scratch) — needed for the shell entrypoint and Litestream. # No --platform pin here: inherits the build host's native architecture, # matching whatever TARGETARCH the binary above was actually compiled for. -FROM alpine:3.21 +FROM alpine:3.24 RUN apk add --no-cache ca-certificates tzdata From abba2b9c59939ad80f5f8e6f0633e23bc680a898 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:41:03 +0000 Subject: [PATCH 100/250] chore(deps): bump docker/setup-qemu-action from 3 to 4 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3 to 4. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 727cb844..48a68e92 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -38,7 +38,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-qemu-action@v4 - uses: docker/setup-buildx-action@v3 From 4b5dc85c97217c327ec42d1c66b744695a4d8007 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:41:07 +0000 Subject: [PATCH 101/250] chore(deps): bump golang.org/x/image from 0.45.0 to 0.46.0 Bumps [golang.org/x/image](https://github.com/golang/image) from 0.45.0 to 0.46.0. - [Commits](https://github.com/golang/image/compare/v0.45.0...v0.46.0) --- updated-dependencies: - dependency-name: golang.org/x/image dependency-version: 0.46.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5228dacc..51786d8d 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/pressly/goose/v3 v3.27.1 github.com/yuin/goldmark v1.8.6 golang.org/x/crypto v0.57.0 - golang.org/x/image v0.45.0 + golang.org/x/image v0.46.0 golang.org/x/oauth2 v0.37.0 golang.org/x/text v0.42.0 modernc.org/sqlite v1.59.0 diff --git a/go.sum b/go.sum index bdfc41fd..808a0a30 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.45.0 h1:FMb1nTbH5H9vF55SriQHgFw5GnNL9Jg6L25BwXKzhB0= -golang.org/x/image v0.45.0/go.mod h1:n62x/7RqlwXDvGsSU4u6IUTUf6KghUZ9Bt7cG/T9Fx4= +golang.org/x/image v0.46.0 h1:b1+oYj0Jbp6K5MDT4i4/eZpYlk3V8SJhhDKh6LBHAyQ= +golang.org/x/image v0.46.0/go.mod h1:3B3W05VGVQyuXucLINLjXKrqISASfi4Xj+iCVkLMwew= golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= From 340c469d86c4367b9e9b9e1f68f1c806bbafebf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:41:18 +0000 Subject: [PATCH 102/250] chore(deps): bump ossf/scorecard-action from 2.4.3 to 2.4.4 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/4eaacf0543bb3f2c246792bd56e8cdeffafb205a...2d1146689b8cda280b9bc96326124645441f03bc) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-version: 2.4.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index bc2ac811..464d46bc 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -26,7 +26,7 @@ jobs: with: persist-credentials: false - - uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3 — floating v2 tag no longer resolves upstream; pinned to commit per Scorecard's own pinned-deps recommendation + - uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.3 — floating v2 tag no longer resolves upstream; pinned to commit per Scorecard's own pinned-deps recommendation with: results_file: results.sarif results_format: sarif From 1b7a38362f5a987b8a980094bdb3426627355700 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:41:30 +0000 Subject: [PATCH 103/250] chore(deps-dev): bump @internationalized/date in /frontend Bumps [@internationalized/date](https://github.com/adobe/react-spectrum) from 3.12.2 to 3.12.4. - [Release notes](https://github.com/adobe/react-spectrum/releases) - [Commits](https://github.com/adobe/react-spectrum/compare/@internationalized/date@3.12.2...@internationalized/date@3.12.4) --- updated-dependencies: - dependency-name: "@internationalized/date" dependency-version: 3.12.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 50 ++++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 8080c687..f9752ced 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,7 +25,7 @@ "tailwind-merge": "^3.6.0" }, "devDependencies": { - "@internationalized/date": "^3.12.2", + "@internationalized/date": "^3.12.4", "@lucide/svelte": "^1.47.0", "@sveltejs/adapter-static": "^3.0.10", "@sveltejs/kit": "^2.70.2", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index c3380458..ba2ff112 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -22,8 +22,8 @@ importers: version: 3.6.0 devDependencies: '@internationalized/date': - specifier: ^3.12.2 - version: 3.12.2 + specifier: ^3.12.4 + version: 3.12.4 '@lucide/svelte': specifier: ^1.47.0 version: 1.47.0(svelte@5.57.0) @@ -50,7 +50,7 @@ importers: version: 4.1.11(msw@2.14.6(@types/node@26.6.1)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0))(vitest@4.1.11) bits-ui: specifier: ^2.18.1 - version: 2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) + version: 2.18.1(@internationalized/date@3.12.4)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) playwright: specifier: ^1.61.0 version: 1.61.0 @@ -137,8 +137,8 @@ packages: '@types/node': optional: true - '@internationalized/date@3.12.2': - resolution: {integrity: sha512-FY1Y+H64NDs+HAF6omlnWxm3mEpfgaCSWtL5l551ZZfImA+kGjPFgrnJrGjH6lfmLL0g8Z/mBu1R3kufeCp6Jw==} + '@internationalized/date@3.12.4': + resolution: {integrity: sha512-M1dEn4c1U1HsSlaVR8upZtSqvXrTkHDfv18H01uCSJyjVLDxnBR38v/fMxecmlwXKR4i9HeZcmgQAPE6A+aGJQ==} '@jridgewell/gen-mapping@0.3.13': resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} @@ -445,6 +445,9 @@ packages: '@types/node@26.6.1': resolution: {integrity: sha512-VqGJBMCtdhqkBUCcBLvywI0NJ+KLuVzgNnlBUNFOQjqVxzo2lxLUNg1DSey8+u2u6ktswSAxg+s68QLzWHNOuA==} + '@types/node@26.6.3': + resolution: {integrity: sha512-dsqMQQoeTLqu9wynDD00q573mNzso3IdQOAfHRJqLCcmCFPoGo9A1bDpUcv/9tnKpErQWv9uKeGfl37EIS02Yg==} + '@types/set-cookie-parser@2.4.10': resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} @@ -924,8 +927,8 @@ packages: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} - rettime@0.11.11: - resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==} + rettime@0.11.12: + resolution: {integrity: sha512-5ExtR1ppiDBQkVoPw5NAqdbfH4Iq2VOmQKHMtUoaFxA9bo2krzFYBtyq6K40xxbYp+2w/YOr6D+1ToF6tTN53A==} rolldown@1.2.9: resolution: {integrity: sha512-hx/Pv0N1haXRb11qkfnK5MXB/iqr7i0yjWQqmO9uHqZpBgQSqzc8UsSnEpalsh+j1I8qQ2CkXAkJC8Br3dKSlg==} @@ -1069,11 +1072,11 @@ packages: resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} - tldts-core@7.4.13: - resolution: {integrity: sha512-mbYsrih5FRtGxs3Usvl/PqwJsNpp+jsmrdFviiK02teHDG0/HebBG/pqCylje3kzgXYzuLoHJF/0mz9W53t8Xg==} + tldts-core@7.4.16: + resolution: {integrity: sha512-MDolfaSJtlSK5Y0A1xl3277ekubZwobpBjugknDizI9O5Rm60a1m8k4ICK+MRsCDzPygT81mp3BBf5RKDlFRfA==} - tldts@7.4.13: - resolution: {integrity: sha512-iHtaIWWIbMDkCeJdTBzZFGgbluE5J+oHlb2g7+oAz1S1gpuVpabRZdQyd471Vl8UUkcz2vXSL8xZH2kyCe8tfA==} + tldts@7.4.16: + resolution: {integrity: sha512-QwBER5KMR86IIjpIiO7H/Z3IMJPsZ1A6RKPAqzTTgOyUQUSt9FdnKcqhTaJmkY6HVrgouZHZR0ncK5QxvmnQeg==} hasBin: true totalist@3.0.1: @@ -1286,7 +1289,7 @@ snapshots: '@types/node': 26.6.1 optional: true - '@internationalized/date@3.12.2': + '@internationalized/date@3.12.4': dependencies: '@swc/helpers': 0.5.23 @@ -1525,9 +1528,14 @@ snapshots: dependencies: undici-types: 8.9.0 + '@types/node@26.6.3': + dependencies: + undici-types: 8.9.0 + optional: true + '@types/set-cookie-parser@2.4.10': dependencies: - '@types/node': 26.6.1 + '@types/node': 26.6.3 optional: true '@types/statuses@2.0.6': @@ -1623,11 +1631,11 @@ snapshots: axobject-query@4.1.0: {} - bits-ui@2.18.1(@internationalized/date@3.12.2)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): + bits-ui@2.18.1(@internationalized/date@3.12.4)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0): dependencies: '@floating-ui/core': 1.7.5 '@floating-ui/dom': 1.7.6 - '@internationalized/date': 3.12.2 + '@internationalized/date': 3.12.4 esm-env: 1.2.2 runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.1)(jiti@2.7.0)))(svelte@5.57.0) svelte: 5.57.0 @@ -1884,7 +1892,7 @@ snapshots: outvariant: 1.4.3 path-to-regexp: 6.3.0 picocolors: 1.1.1 - rettime: 0.11.11 + rettime: 0.11.12 statuses: 2.0.2 strict-event-emitter: 0.5.1 tough-cookie: 6.0.2 @@ -1941,7 +1949,7 @@ snapshots: require-directory@2.1.1: optional: true - rettime@0.11.11: + rettime@0.11.12: optional: true rolldown@1.2.9: @@ -2112,19 +2120,19 @@ snapshots: tinyrainbow@3.1.0: {} - tldts-core@7.4.13: + tldts-core@7.4.16: optional: true - tldts@7.4.13: + tldts@7.4.16: dependencies: - tldts-core: 7.4.13 + tldts-core: 7.4.16 optional: true totalist@3.0.1: {} tough-cookie@6.0.2: dependencies: - tldts: 7.4.13 + tldts: 7.4.16 optional: true tslib@2.8.1: {} From f4110b28144bf8ddb4169d335347b5435edba7d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 18:41:43 +0000 Subject: [PATCH 104/250] chore(deps): bump docker/login-action from 3 to 4 Bumps [docker/login-action](https://github.com/docker/login-action) from 3 to 4. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 727cb844..2d8fbaed 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -44,7 +44,7 @@ jobs: - name: Log in to GHCR if: github.event_name != 'pull_request' - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} From 59011ad0c737a17b6ed09b3c3d66863c26b6bdd9 Mon Sep 17 00:00:00 2001 From: KitKat31337 <4126578+KitKat31337@users.noreply.github.com> Date: Thu, 1 Oct 2026 23:57:53 -0700 Subject: [PATCH 105/250] feat: add explicit public directory display order --- docs/ARCHITECTURE.md | 8 + frontend/src/lib/api.ts | 2 + .../routes/event-types/[slug]/+page.svelte | 9 + internal/db/directory_order_test.go | 42 ++++ .../00070_event_type_display_order.sql | 7 + internal/handler/directory.go | 2 +- internal/handler/directory_order_test.go | 185 ++++++++++++++++++ internal/handler/event_type.go | 16 +- internal/handler/event_type_duplicate.go | 4 +- internal/handler/event_type_duplicate_test.go | 1 + 10 files changed, 268 insertions(+), 8 deletions(-) create mode 100644 internal/db/directory_order_test.go create mode 100644 internal/db/migrations/00070_event_type_display_order.sql create mode 100644 internal/handler/directory_order_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 8baf33cc..899b14ef 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -69,6 +69,14 @@ app you must `pnpm build` in `frontend/` **and** rebuild/restart the Go binary ## 4. Persistence (SQLite) — and the single-connection rule +Public person (`/u/{handle}`) and team (`/team/{slug}`) directories list public, +active event types by `display_order` ascending, then name and unique slug for +deterministic ties. The integer defaults to 0, preserving alphabetical order for +existing types. Owners can set it through event-type create/PATCH or the event +editor's Directory order field; negative values put an event ahead of the default +group. It applies wherever the event is listed and is retained on duplication. +It does not affect the admin event-type list or team member roster ordering. + - `internal/db`: opens SQLite with **`SetMaxOpenConns(1)`** + `SetMaxIdleConns(1)`, **WAL** journal mode, `busy_timeout=5000`. One writer connection by design. - Migrations: **goose** SQL files in `internal/db/migrations/` (00001→00029). Run diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 4f2172c3..5a121d77 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -22,6 +22,8 @@ export type User = { }; export type EventType = { + /** Lower first on public person/team pages; ties sort by name, then slug. */ + display_order: number; allow_phone_call: boolean; id: string; slug: string; diff --git a/frontend/src/routes/event-types/[slug]/+page.svelte b/frontend/src/routes/event-types/[slug]/+page.svelte index 8243ff7c..234360dc 100644 --- a/frontend/src/routes/event-types/[slug]/+page.svelte +++ b/frontend/src/routes/event-types/[slug]/+page.svelte @@ -68,6 +68,7 @@ const isOnlineMeeting = (t: string) => t === 'google_meet' || t === 'teams'; let form = $state({ + display_order: 0, name: '', slug: '', description: '', duration_minutes: 30, slot_interval_minutes: 30, is_active: true, is_public: true, show_taken_slots: false, invite_delivery: 'calendar' as EventType['invite_delivery'], @@ -283,6 +284,7 @@ et = await api.get(`/v1/event-types/${slug}`); allowPhoneCall = et.allow_phone_call; form = { + display_order: et.display_order, name: et.name, slug: et.slug, description: et.description ?? '', @@ -326,6 +328,7 @@ } async function saveET() { + if (!Number.isSafeInteger(form.display_order)) { toast.error('Directory order must be a whole number.'); return; } if (!form.name.trim()) { toast.error('Name is required.'); return; } if (form.duration_minutes < 5) { toast.error('Duration must be at least 5 minutes.'); return; } // Matches the API, which only requires a positive value. A stricter floor here would @@ -342,6 +345,7 @@ etSaving = true; try { const updated = await api.patch(`/v1/event-types/${slug}`, { + display_order: form.display_order, slug: form.slug.trim(), name: form.name.trim(), description: form.description.trim() || null, @@ -588,6 +592,11 @@
    +
    + + +

    Lower numbers appear first on public person and team pages. Equal numbers sort by name. Applies wherever this event is listed.

    +
    diff --git a/internal/db/directory_order_test.go b/internal/db/directory_order_test.go new file mode 100644 index 00000000..fb8b7b0a --- /dev/null +++ b/internal/db/directory_order_test.go @@ -0,0 +1,42 @@ +package db_test + +import ( + "os" + "testing" + + "github.com/calnode/calnode/internal/db" + "github.com/pressly/goose/v3" +) + +func TestMigrate_displayOrderPreservesExistingEvents(t *testing.T) { + database, err := db.Open("sqlite://:memory:") + if err != nil { + t.Fatal(err) + } + defer database.Close() + // Start from the schema immediately before display_order was introduced. + goose.SetBaseFS(os.DirFS(".")) + if err := goose.SetDialect("sqlite3"); err != nil { + t.Fatal(err) + } + if err := goose.UpTo(database, "migrations", 69); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`INSERT INTO users (id,email,name) VALUES ('owner','owner@example.com','Owner')`); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`INSERT INTO event_types (id,user_id,slug,name,duration_minutes) VALUES ('event','owner','existing','Existing event',30)`); err != nil { + t.Fatal(err) + } + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + var name, slug string + var order int + if err := database.QueryRow(`SELECT name,slug,display_order FROM event_types WHERE id = 'event'`).Scan(&name, &slug, &order); err != nil { + t.Fatal(err) + } + if name != "Existing event" || slug != "existing" || order != 0 { + t.Fatalf("existing event changed: name=%q slug=%q order=%d", name, slug, order) + } +} diff --git a/internal/db/migrations/00070_event_type_display_order.sql b/internal/db/migrations/00070_event_type_display_order.sql new file mode 100644 index 00000000..cbd03dc3 --- /dev/null +++ b/internal/db/migrations/00070_event_type_display_order.sql @@ -0,0 +1,7 @@ +-- +goose Up +-- Public directory order is independent of names and shared booking URLs. +-- Equal values retain alphabetical ordering; existing event types all start at 0. +ALTER TABLE event_types ADD COLUMN display_order INTEGER NOT NULL DEFAULT 0; + +-- +goose Down +-- Leave the additive column in place, consistent with other column migrations. diff --git a/internal/handler/directory.go b/internal/handler/directory.go index cb76df94..df89ed17 100644 --- a/internal/handler/directory.go +++ b/internal/handler/directory.go @@ -58,7 +58,7 @@ func (h *Handler) directoryItems(ctx context.Context, loc *i18n.Locale, where st rows, err := h.db.QueryContext(ctx, ` SELECT slug, name, duration_minutes, location_type, COALESCE(location_value,''), price_cents, currency - FROM event_types et WHERE `+where+` ORDER BY name`, args...) // #nosec G202 -- where is one of two literals at the call sites; every value is bound via args... + FROM event_types et WHERE `+where+` ORDER BY et.display_order, et.name, et.slug`, args...) // #nosec G202 -- where is one of two literals at the call sites; every value is bound via args... if err != nil { return nil, err } diff --git a/internal/handler/directory_order_test.go b/internal/handler/directory_order_test.go new file mode 100644 index 00000000..d053c29b --- /dev/null +++ b/internal/handler/directory_order_test.go @@ -0,0 +1,185 @@ +package handler_test + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "github.com/calnode/calnode/internal/handler" +) + +func patchDirectoryOrder(t *testing.T, h *handler.Handler, key, slug, body string) *httptest.ResponseRecorder { + t.Helper() + req := authReq(http.MethodPatch, "/v1/event-types/"+slug, body, key) + req.SetPathValue("slug", slug) + rec := httptest.NewRecorder() + h.RequireAuth(h.PatchEventType)(rec, req) + return rec +} + +func assertDisplayOrder(t *testing.T, rec *httptest.ResponseRecorder, status, want int) { + t.Helper() + if rec.Code != status { + t.Fatalf("status = %d; want %d: %s", rec.Code, status, rec.Body.String()) + } + var resp struct { + DisplayOrder *int `json:"display_order"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { + t.Fatal(err) + } + if resp.DisplayOrder == nil || *resp.DisplayOrder != want { + t.Fatalf("display_order missing or wrong; want %d: %s", want, rec.Body.String()) + } +} + +func TestEventType_displayOrder(t *testing.T) { + h, database, key, _ := setupWorkspaceWithDB(t) + for i, value := range []string{"", `,"display_order":-10`, `,"display_order":20`} { + slug := fmt.Sprintf("ordered-%d", i) + req := authReq(http.MethodPost, "/v1/event-types", fmt.Sprintf(`{"slug":%q,"name":"Meeting","duration_minutes":30%s}`, slug, value), key) + rec := httptest.NewRecorder() + h.RequireAuth(h.CreateEventType)(rec, req) + assertDisplayOrder(t, rec, http.StatusCreated, []int{0, -10, 20}[i]) + } + + const slug = "ordered-1" + for _, tc := range []struct { + body string + want int + }{ + {`{"name":"Renamed"}`, -10}, // omitted fields survive partial updates + {`{"display_order":null}`, -10}, + {`{"display_order":7}`, 7}, + {`{"display_order":0}`, 0}, // explicit zero resets the order + {`{"display_order":-5}`, -5}, + } { + assertDisplayOrder(t, patchDirectoryOrder(t, h, key, slug, tc.body), http.StatusOK, tc.want) + } + for _, body := range []string{`{"display_order":1.5}`, `{"display_order":"1"}`, `{"display_order":9223372036854775808}`} { + t.Run(body, func(t *testing.T) { + if rec := patchDirectoryOrder(t, h, key, slug, body); rec.Code != http.StatusBadRequest { + t.Fatalf("invalid order: status = %d: %s", rec.Code, rec.Body.String()) + } + req := authReq(http.MethodPost, "/v1/event-types", strings.Replace(body, "{", `{"slug":"invalid-order","name":"Meeting","duration_minutes":30,`, 1), key) + rec := httptest.NewRecorder() + h.RequireAuth(h.CreateEventType)(rec, req) + if rec.Code != http.StatusBadRequest { + t.Fatalf("invalid create order: status = %d: %s", rec.Code, rec.Body.String()) + } + }) + } + seedMember(t, database, "order-member", "order-member@example.com") + const memberKey = "directory-order-member-key" + mustExec(t, database, `INSERT INTO api_keys (id,user_id,name,key_hash) VALUES ('order-key','order-member','test',?)`, sha256HexForTest(memberKey)) + mustExec(t, database, `INSERT INTO event_type_hosts (id,event_type_id,user_id,role) SELECT 'order-host',id,'order-member','required' FROM event_types WHERE slug = ?`, slug) + if rec := patchDirectoryOrder(t, h, memberKey, slug, `{"display_order":100}`); rec.Code != http.StatusNotFound { + t.Fatalf("host can change order: status = %d", rec.Code) + } + // GET/list use the same scan contract as create/PATCH; check both explicitly. + req := authReq(http.MethodGet, "/v1/event-types/"+slug, "", key) + req.SetPathValue("slug", slug) + rec := httptest.NewRecorder() + h.RequireAuth(h.GetEventType)(rec, req) + assertDisplayOrder(t, rec, http.StatusOK, -5) + rec = httptest.NewRecorder() + h.RequireAuth(h.ListEventTypes)(rec, authReq(http.MethodGet, "/v1/event-types", "", key)) + var list struct { + Items []struct { + Slug string `json:"slug"` + DisplayOrder *int `json:"display_order"` + } `json:"items"` + } + if rec.Code != http.StatusOK { + t.Fatalf("list: %d: %s", rec.Code, rec.Body.String()) + } + if err := json.Unmarshal(rec.Body.Bytes(), &list); err != nil { + t.Fatal(err) + } + found := false + for _, item := range list.Items { + if item.Slug == slug { + found = true + if item.DisplayOrder == nil || *item.DisplayOrder != -5 { + t.Fatalf("list lost display_order: %s", rec.Body.String()) + } + } + } + if !found { + t.Fatal("list missing event") + } + assertDisplayOrder(t, duplicate(t, h, key, slug), http.StatusCreated, -5) +} + +func TestDirectories_displayOrder(t *testing.T) { + h, database, key, ownerID := setupWorkspaceWithDB(t) + mustExec(t, database, `UPDATE users SET handle = 'ordered-host' WHERE id = ?`, ownerID) + seedMember(t, database, "other-owner", "other-owner@example.com") + mustExec(t, database, `INSERT INTO teams (id,name,slug) VALUES ('order-team','Order team','order-team')`) + // Insert in a different order from the desired output. Slugs deliberately + // disagree with names, so sorting solely by slug cannot pass this test. + for _, item := range []struct { + slug, name string + order int + }{ + {"a-last", "Alpha", 10}, + {"z-first", "Zulu", -10}, + {"b-beta", "Beta", 0}, + {"d-alpha", "Alpha", 0}, + {"c-alpha", "Alpha", 0}, + } { + mustExec(t, database, `INSERT INTO event_types (id,user_id,team_id,slug,name,duration_minutes,display_order) VALUES (?,?,'order-team',?,?,30,?)`, item.slug, ownerID, item.slug, item.name, item.order) + } + // A hosted event participates in the same ordering as owned events. + mustExec(t, database, `UPDATE event_types SET user_id = 'other-owner' WHERE slug = 'b-beta'`) + mustExec(t, database, `INSERT INTO event_type_hosts (id,event_type_id,user_id,role) VALUES ('order-host','b-beta',?,'required')`, ownerID) + for _, slug := range []string{"hidden", "inactive", "unrelated"} { + mustExec(t, database, `INSERT INTO event_types (id,user_id,team_id,slug,name,duration_minutes,display_order) VALUES (?,?,'order-team',?, ?,30,-100)`, slug, ownerID, slug, slug) + } + mustExec(t, database, `UPDATE event_types SET is_public = 0 WHERE slug = 'hidden'`) + mustExec(t, database, `UPDATE event_types SET is_active = 0 WHERE slug = 'inactive'`) + mustExec(t, database, `UPDATE event_types SET user_id = 'other-owner', team_id = NULL WHERE slug = 'unrelated'`) + checkPages := func(want []string) { + t.Helper() + for _, page := range []string{"person", "team"} { + t.Run(page+strings.Join(want, ","), func(t *testing.T) { + var code int + var body string + if page == "person" { + code, body = personPage(t, h, "ordered-host") + } else { + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodGet, "/team/order-team", nil) + req.SetPathValue("slug", "order-team") + h.TeamPage(rec, req) + code, body = rec.Code, rec.Body.String() + } + if code != http.StatusOK { + t.Fatalf("page: %d: %s", code, body) + } + previous := -1 + for _, slug := range want { + index := strings.Index(body, `href="/book/`+slug+`"`) + if index <= previous { + t.Fatalf("missing or out-of-order %s; want %v", slug, want) + } + previous = index + } + for _, slug := range []string{"hidden", "inactive", "unrelated"} { + if strings.Contains(body, `href="/book/`+slug+`"`) { + t.Errorf("page contains %s", slug) + } + } + }) + } + } + checkPages([]string{"z-first", "c-alpha", "d-alpha", "b-beta", "a-last"}) + assertDisplayOrder(t, patchDirectoryOrder(t, h, key, "a-last", `{"display_order":-20}`), http.StatusOK, -20) + checkPages([]string{"a-last", "z-first", "c-alpha", "d-alpha", "b-beta"}) + // All-zero defaults retain alphabetical ordering with deterministic slug ties. + mustExec(t, database, `UPDATE event_types SET display_order = 0`) + checkPages([]string{"a-last", "c-alpha", "d-alpha", "b-beta", "z-first"}) +} diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index c0bf93ba..3beae545 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -24,6 +24,7 @@ type eventTypeJSON struct { ID string `json:"id"` Slug string `json:"slug"` Name string `json:"name"` + DisplayOrder int `json:"display_order"` // lower first on public directories; ties sort by name, then slug Description *string `json:"description"` DurationMinutes int `json:"duration_minutes"` SlotIntervalMinutes int `json:"slot_interval_minutes"` @@ -105,7 +106,7 @@ func scanEventTypeRow(s rowScanner, trailing ...any) (*eventTypeJSON, error) { &isActive, &isPublic, &showTaken, &et.CreatedAt, &msgConf, &msgCancel, &msgResched, &msgRemind, &msgGreeting, &subjConf, &subjCancel, &subjResched, &subjRemind, - &et.PriceCents, &et.Currency, &et.InviteDelivery, + &et.PriceCents, &et.Currency, &et.InviteDelivery, &et.DisplayOrder, } dests = append(dests, trailing...) err := s.Scan(dests...) @@ -164,7 +165,7 @@ const etColumns = `id, slug, name, description, is_active, is_public, show_taken_slots, created_at, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, msg_greeting, subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder, - price_cents, currency, invite_delivery` + price_cents, currency, invite_delivery, display_order` // selectETCols fetches a single owner-scoped event type (no `owned` column). const selectETCols = "SELECT " + etColumns + " FROM event_types" @@ -218,6 +219,7 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { var req struct { Slug string `json:"slug"` Name string `json:"name"` + DisplayOrder int `json:"display_order"` Description *string `json:"description"` DurationMinutes int `json:"duration_minutes"` SlotIntervalMinutes *int `json:"slot_interval_minutes"` @@ -335,12 +337,12 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { slot_interval_minutes, location_type, location_value, allow_phone_call, routing_mode, buffer_before_minutes, buffer_after_minutes, min_notice_minutes, max_future_days, max_active_bookings, show_taken_slots, invite_delivery, - msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, + msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, display_order) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, id, user.ID, req.Slug, req.Name, req.Description, req.DurationMinutes, slotInterval, locType, req.LocationValue, req.AllowPhoneCall != nil && *req.AllowPhoneCall, routingMode, bufBefore, bufAfter, minNotice, maxFuture, maxActive, showTaken, inviteDelivery, - defaultMsgConfirmation, defaultMsgCancellation, defaultMsgReschedule, defaultMsgReminder) + defaultMsgConfirmation, defaultMsgCancellation, defaultMsgReschedule, defaultMsgReminder, req.DisplayOrder) if err != nil { if db.IsUniqueViolation(err) { h.writeError(w, http.StatusConflict, "slug already in use") @@ -457,6 +459,7 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { var req struct { Slug *string `json:"slug"` Name *string `json:"name"` + DisplayOrder *int `json:"display_order"` Description *string `json:"description"` DurationMinutes *int `json:"duration_minutes"` SlotIntervalMinutes *int `json:"slot_interval_minutes"` @@ -524,6 +527,9 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { if req.Description != nil { set("description", *req.Description) } + if req.DisplayOrder != nil { + set("display_order", *req.DisplayOrder) + } if req.DurationMinutes != nil { if *req.DurationMinutes <= 0 { h.writeError(w, http.StatusBadRequest, "duration_minutes must be positive") diff --git a/internal/handler/event_type_duplicate.go b/internal/handler/event_type_duplicate.go index e56a5d97..d3e3b8fc 100644 --- a/internal/handler/event_type_duplicate.go +++ b/internal/handler/event_type_duplicate.go @@ -141,7 +141,7 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { is_active, is_public, show_taken_slots, archived_at, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, msg_greeting, subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder, - price_cents, currency, invite_delivery) + price_cents, currency, invite_delivery, display_order) SELECT ?, user_id, team_id, ?, name, description, duration_minutes, slot_interval_minutes, @@ -152,7 +152,7 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { 0, is_public, show_taken_slots, NULL, msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, msg_greeting, subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder, - price_cents, currency, invite_delivery + price_cents, currency, invite_delivery, display_order FROM event_types WHERE id = ?`, newID, newSlug, srcID); err != nil { h.logger.ErrorContext(r.Context(), "duplicate event type: copy row", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") diff --git a/internal/handler/event_type_duplicate_test.go b/internal/handler/event_type_duplicate_test.go index 44ae4bbb..581aef3d 100644 --- a/internal/handler/event_type_duplicate_test.go +++ b/internal/handler/event_type_duplicate_test.go @@ -605,6 +605,7 @@ func TestDuplicateEventType_handlesEveryEventTypeColumn(t *testing.T) { "subj_reminder": true, "price_cents": true, "currency": true, "invite_delivery": true, + "display_order": true, } // Deliberately not inherited, with the reason. notInherited := map[string]string{ From 7ed50634b0e96739a07f5235e77403d232f43d5e Mon Sep 17 00:00:00 2001 From: KitKat31337 <4126578+KitKat31337@users.noreply.github.com> Date: Fri, 2 Oct 2026 02:00:29 -0700 Subject: [PATCH 106/250] fix(directory): share configured business branding on public pages --- docs/ARCHITECTURE.md | 6 +- internal/handler/branding_settings.go | 4 +- internal/handler/directory.go | 4 + internal/handler/public_branding_test.go | 101 ++++++++++++++++++++++ internal/handler/shared_partials.go | 7 +- internal/handler/templates/_shared.html | 15 +++- internal/handler/templates/book.html | 6 +- internal/handler/templates/directory.html | 1 + internal/handler/templates/manage.html | 6 +- 9 files changed, 129 insertions(+), 21 deletions(-) create mode 100644 internal/handler/public_branding_test.go diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 8baf33cc..11ed3558 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -736,7 +736,11 @@ as the desired state: - **Branding (`branding_settings.go`, migrations 00029/00050):** instance-wide `business_name` + `logo_url` + `banner_url` on the singleton row. Business name is the wordmark fallback (defaults to "Calnode") + public-page header; the logo is the email - header image + public-page header. `GET/PATCH /v1/settings/branding` (name + opacity + header image + public-page header. Booking, manage, person (`/u/{handle}`) and team + (`/team/{slug}`) directories share the `businessHeader` partial, using the configured + logo height (scaled by `pageLogoHeight`) and opacity, or the business name when no + logo is set. Directory avatars remain inside the person/team card. + `GET/PATCH /v1/settings/branding` (name + opacity settings only); the logo and banner are each an **upload** (`POST/DELETE /v1/settings/branding/logo` and `.../banner`, public serve at `GET /branding/logo` / `GET /branding/banner`) reusing the avatar pipeline: diff --git a/internal/handler/branding_settings.go b/internal/handler/branding_settings.go index 98e3f188..42017919 100644 --- a/internal/handler/branding_settings.go +++ b/internal/handler/branding_settings.go @@ -27,7 +27,7 @@ const logoServePath = "/branding/logo" const bannerServePath = "/branding/banner" // brandingSettings is the instance-wide brand identity used in emails and on the -// public booking/manage pages. +// public booking/manage/directory pages. type brandingSettings struct { BusinessName string LogoURL string // served path (relative), e.g. "/branding/logo?v=123"; empty = no logo @@ -69,7 +69,7 @@ func (h *Handler) loadBranding(ctx context.Context) brandingSettings { } // pageLogoHeight scales the email logo height up ~1.3× for the roomier public -// booking/manage page headers. +// booking/manage/directory page headers. func pageLogoHeight(emailPx int) int { if emailPx <= 0 { emailPx = 28 diff --git a/internal/handler/directory.go b/internal/handler/directory.go index cb76df94..ea11ea82 100644 --- a/internal/handler/directory.go +++ b/internal/handler/directory.go @@ -46,6 +46,8 @@ type directoryPageData struct { GA4MeasurementID string BusinessName string LogoURL string + LogoHeight int + LogoOpacity string PrivacyURL string TermsURL string DemoMode bool @@ -98,6 +100,8 @@ func (h *Handler) renderDirectory(w http.ResponseWriter, r *http.Request, data d data.GA4MeasurementID = track.GA4MeasurementID data.BusinessName = brand.BusinessName data.LogoURL = brand.LogoURL + data.LogoHeight = pageLogoHeight(brand.LogoHeight) + data.LogoOpacity = opacityCSS(brand.LogoOpacity) data.PrivacyURL = brand.PrivacyURL data.TermsURL = brand.TermsURL data.DemoMode = h.demoMode diff --git a/internal/handler/public_branding_test.go b/internal/handler/public_branding_test.go new file mode 100644 index 00000000..69a0c7d7 --- /dev/null +++ b/internal/handler/public_branding_test.go @@ -0,0 +1,101 @@ +package handler_test + +import ( + "html" + "net/http" + "net/http/httptest" + "strings" + "testing" +) + +func TestPublicPages_businessBranding(t *testing.T) { + for _, tc := range []struct { + name, businessName, logoURL string + height, opacity int + wantHeight, wantOpacity string + }{ + {"logo", `Acme "Studio" & Co`, "/branding/logo?v=123", 40, 60, "52", "0.6"}, + {"logoWithoutName", "", "/branding/logo?v=123", 28, 100, "36", "1"}, + {"nameOnly", `Acme "Studio" & Co`, "", 28, 100, "", ""}, + {"neither", "", "", 28, 100, "", ""}, + {"normalizedSettings", "Acme", "/branding/logo?v=123", 0, 200, "36", "1"}, + } { + t.Run(tc.name, func(t *testing.T) { + h, database, key, userID := setupWorkspaceWithDB(t) + if _, err := database.Exec(`UPDATE server_settings SET business_name = ?, logo_url = ?, logo_height = ?, logo_opacity = ? WHERE id = 1`, + tc.businessName, tc.logoURL, tc.height, tc.opacity); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`UPDATE users SET handle = 'host', avatar_url = '/avatars/host.png' WHERE id = ?`, userID); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`INSERT INTO teams (id, name, slug) VALUES ('brand-team', 'Design', 'design')`); err != nil { + t.Fatal(err) + } + slug, etID := seedEventTypeHTTP(t, h, key) + seedBooking(t, database, "brand-booking", etID, userID, "2026-06-20T09:00:00Z", "2026-06-20T09:30:00Z", "confirmed") + token := issueTestToken(t, database, "brand-booking") + for _, page := range []struct { + name, path, pathKey, pathValue string + serve http.HandlerFunc + }{ + {"person", "/u/host", "handle", "host", h.PersonPage}, + {"team", "/team/design", "slug", "design", h.TeamPage}, + {"booking", "/book/" + slug, "slug", slug, h.BookPage}, + {"manage", "/manage/" + token, "token", token, h.ManagePage}, + } { + t.Run(page.name, func(t *testing.T) { + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodGet, page.path, nil) + req.SetPathValue(page.pathKey, page.pathValue) + page.serve(rec, req) + body := rec.Body.String() + if rec.Code != http.StatusOK || !strings.Contains(body, "") { + t.Fatalf("incomplete page: status %d, body %.200s", rec.Code, body) + } + start := strings.Index(body, "
    ") + if end == -1 { + t.Fatal("incomplete business header") + } + header := body[start : start+end] + if tc.logoURL != "" { + alt := tc.businessName + if alt == "" { + alt = "Business logo" + } + for _, want := range []string{ + `src="` + tc.logoURL + `"`, `alt="` + html.EscapeString(alt) + `"`, + "height:" + tc.wantHeight + "px;width:auto;max-width:100%;opacity:" + tc.wantOpacity, + "max-width:100%;box-sizing:border-box;", + } { + if !strings.Contains(header, want) { + t.Errorf("header missing %q: %s", want, header) + } + } + } else if strings.Contains(header, ""+html.EscapeString(tc.businessName)+"") { + t.Errorf("incorrect name-only header: %s", header) + } + } + if page.name == "person" && !strings.Contains(body, ``) { + t.Error("person avatar missing from directory card") + } + if page.name == "team" && !strings.Contains(body, ``) { + t.Error("team avatar missing from directory card") + } + if (page.name == "person" || page.name == "team") && start > strings.Index(body, `
    `) { + t.Error("business header should precede the directory card") + } + }) + } + }) + } +} diff --git a/internal/handler/shared_partials.go b/internal/handler/shared_partials.go index fbb7ef0d..38dd9c32 100644 --- a/internal/handler/shared_partials.go +++ b/internal/handler/shared_partials.go @@ -2,11 +2,10 @@ package handler import _ "embed" -// sharedPartialsSrc holds the template partials shared by the book and manage public -// pages (see templates/_shared.html): the consent/tracking/footer chrome +// sharedPartialsSrc holds the template partials shared by the book, manage and directory +// public pages (see templates/_shared.html): the business header and consent/tracking/footer chrome // (trackingHead, consentBanner, legalFooter) plus structural parts (calendarGrid). -// It is parsed into BOTH the book and manage template sets so these pieces have a -// single source and the two surfaces can't drift apart. +// It is parsed into all three template sets so these pieces have a single source. // //go:embed templates/_shared.html var sharedPartialsSrc string diff --git a/internal/handler/templates/_shared.html b/internal/handler/templates/_shared.html index a415e4f1..c4855008 100644 --- a/internal/handler/templates/_shared.html +++ b/internal/handler/templates/_shared.html @@ -1,8 +1,7 @@ {{/* - Partials SHARED by the book and manage public pages — parsed into BOTH template - sets (see book.go / manage_handler.go) so these pieces live in ONE place and the - two surfaces can't drift apart: - - chrome: trackingHead, consentBanner, legalFooter (consent/analytics/footer) + Partials SHARED by the book, manage and directory public pages — parsed into all + three template sets so these pieces live in ONE place: + - chrome: businessHeader, trackingHead, consentBanner, legalFooter - structural: calendarGrid (month nav + the JS-filled day grid) The embed widget (embed.js) is deliberately NOT included: it's a vanilla-JS web @@ -14,6 +13,14 @@ booking-logic.js at runtime). */}} +{{define "businessHeader"}} +{{if or .LogoURL .BusinessName}} +
    + {{if .LogoURL}}{{if .BusinessName}}{{.BusinessName}}{{else}}Business logo{{end}}{{else}}{{.BusinessName}}{{end}} +
    +{{end}} +{{end}} + {{define "trackingHead"}}{{if or .GTMContainerID .GA4MeasurementID}}
    @@ -570,6 +582,13 @@ {:else} +{#if editingForOwner} +
    + You're editing {ownerLabel}'s event type as an admin. It stays theirs, + and your own calendar and Zoom connections play no part in it. +
    +{/if} +
    {#each TABS as t}

    {#if hostScope === 'me'} - Every booking goes to you. + {editingForOwner ? `Every booking goes to ${ownerLabel}.` : 'Every booking goes to you.'} {:else} Pick who can take these bookings — add members individually or pull in a whole team. {/if} @@ -1135,7 +1162,7 @@

    {/if} -{#if activeTab === 'hosts' && $currentUser?.is_admin} +{#if activeTab === 'hosts' && $currentUser?.is_admin && et?.owned !== false}

    Choose a saved required host. The booking URL stays the same. Transfer is available only when there are no upcoming bookings. Calendar connections and global availability stay with each account.

    diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index 3beae545..40a36136 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -67,10 +67,19 @@ type eventTypeJSON struct { // list, with is_active forced off so it stops taking bookings. Reversible. Archived bool `json:"archived"` // Owned is true when the requesting user owns this event type; false when they - // only see it as an assigned host (read-only — only the owner can edit). + // see it as an assigned host, or as an admin looking at someone else's. Owned bool `json:"owned"` - // OwnerName/OwnerEmail identify the owner so a read-only host knows who to - // contact for changes. Populated only for the host (read-only) GET case. + // CanEdit is true when the requesting user may change this event type: its owner, + // or any admin. False means read-only (an assigned host). Owned alone no longer + // answers that question, since an admin can edit event types they do not own. + CanEdit bool `json:"can_edit"` + // OwnerID is the user the event type belongs to (event_types.user_id). Per-owner + // resources - availability, calendar and Zoom connections - are that user's, also + // when an admin is the one editing. + OwnerID string `json:"owner_id"` + // OwnerName/OwnerEmail identify the owner when the requesting user is not the + // owner, so a read-only host knows who to contact for changes and an admin can see + // whose event type they are looking at. OwnerName string `json:"owner_name,omitempty"` OwnerEmail string `json:"owner_email,omitempty"` // InviteSenderReady reports, on the single-event-type GET, whether Calnode can @@ -167,28 +176,65 @@ const etColumns = `id, slug, name, description, subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder, price_cents, currency, invite_delivery, display_order` -// selectETCols fetches a single owner-scoped event type (no `owned` column). +// selectETCols fetches a single event type without the caller-relative columns. const selectETCols = "SELECT " + etColumns + " FROM event_types" +// etOwnerColumns are the trailing columns the list and get queries add after +// etColumns, scanned by scanEventTypeWithOwner. +const etOwnerColumns = `, user_id, + (SELECT name FROM users WHERE id = event_types.user_id) AS owner_name, + (SELECT email FROM users WHERE id = event_types.user_id) AS owner_email, + (archived_at IS NOT NULL) AS archived` + // listEventTypesQuery returns every event type the user owns OR is an assigned -// host on, with an `owned` flag (the owner is also seeded into event_type_hosts, -// so ownership is keyed on event_types.user_id, not host membership). -const listEventTypesQuery = "SELECT " + etColumns + `, (user_id = ?) AS owned, - (archived_at IS NOT NULL) AS archived +// host on (the owner is also seeded into event_type_hosts, so ownership is keyed on +// event_types.user_id, not host membership). The first parameter widens it to every +// event type on the instance; ListEventTypes sets it only for an admin asking for +// ?scope=all. +const listEventTypesQuery = "SELECT " + etColumns + etOwnerColumns + ` FROM event_types -WHERE user_id = ? +WHERE ? = 1 + OR user_id = ? OR id IN (SELECT event_type_id FROM event_type_hosts WHERE user_id = ?) ORDER BY created_at` -// getEventTypeQuery fetches one event type by slug if the user owns it or hosts -// it, with the `owned` flag and the owner's name/email (so a read-only host knows -// who to contact for changes). -const getEventTypeQuery = "SELECT " + etColumns + `, (user_id = ?) AS owned, - (SELECT name FROM users WHERE id = event_types.user_id) AS owner_name, - (SELECT email FROM users WHERE id = event_types.user_id) AS owner_email, - (archived_at IS NOT NULL) AS archived +// getEventTypeQuery fetches one event type by slug if the user owns it, hosts it, or +// is an admin (the first parameter), with the owner's id, name and email. +const getEventTypeQuery = "SELECT " + etColumns + etOwnerColumns + ` FROM event_types -WHERE slug = ? AND (user_id = ? OR id IN (SELECT event_type_id FROM event_type_hosts WHERE user_id = ?))` +WHERE slug = ? AND (? = 1 OR user_id = ? OR id IN (SELECT event_type_id FROM event_type_hosts WHERE user_id = ?))` + +// scanEventTypeWithOwner scans a row of listEventTypesQuery or getEventTypeQuery and +// fills the fields that describe the event type relative to the caller. +func scanEventTypeWithOwner(s rowScanner, user AuthUser) (*eventTypeJSON, error) { + var ownerID, ownerName, ownerEmail string + var archived int + et, err := scanEventTypeRow(s, &ownerID, &ownerName, &ownerEmail, &archived) + if et == nil || err != nil { + return et, err + } + et.Archived = archived != 0 + et.setOwnership(user, ownerID) + if !et.Owned { + et.OwnerName, et.OwnerEmail = ownerName, ownerEmail + } + return et, nil +} + +// setOwnership fills owner_id, owned and can_edit for the requesting user. +func (et *eventTypeJSON) setOwnership(user AuthUser, ownerID string) { + et.OwnerID = ownerID + et.Owned = ownerID == user.ID + et.CanEdit = canManageEventType(user, ownerID) +} + +// boolArg binds a Go bool as SQLite's 0/1 for the `? = 1` switches above. +func boolArg(b bool) int { + if b { + return 1 + } + return 0 +} // loadReminders fetches the hours_before list for an event type and sets et.Reminders. func (h *Handler) loadReminders(ctx context.Context, etID string, et *eventTypeJSON) error { @@ -380,15 +426,21 @@ func (h *Handler) CreateEventType(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusInternalServerError, "internal error") return } - et.Owned = true // the creator owns it + et.setOwnership(user, user.ID) // the creator owns it h.writeJSON(w, http.StatusCreated, et) } // ListEventTypes handles GET /v1/event-types. +// +// By default it lists the event types the caller owns or hosts, for admins too, so an +// admin's own list stays their own. ?scope=all widens it to every event type on the +// instance, gated exactly like GET /v1/bookings?scope=all: honoured for an admin, +// silently ignored for anyone else, so a member cannot use it to escalate. func (h *Handler) ListEventTypes(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) + all := r.URL.Query().Get("scope") == "all" && user.IsAdmin - rows, err := h.db.QueryContext(r.Context(), listEventTypesQuery, user.ID, user.ID, user.ID) + rows, err := h.db.QueryContext(r.Context(), listEventTypesQuery, boolArg(all), user.ID, user.ID) if err != nil { h.logger.ErrorContext(r.Context(), "list event types", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") @@ -398,15 +450,12 @@ func (h *Handler) ListEventTypes(w http.ResponseWriter, r *http.Request) { items := make([]eventTypeJSON, 0) for rows.Next() { - var owned, archived int - et, err := scanEventTypeRow(rows, &owned, &archived) + et, err := scanEventTypeWithOwner(rows, user) if err != nil { h.logger.ErrorContext(r.Context(), "scan event type", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") return } - et.Owned = owned != 0 - et.Archived = archived != 0 items = append(items, *et) } if err := rows.Err(); err != nil { @@ -422,10 +471,8 @@ func (h *Handler) GetEventType(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) slug := r.PathValue("slug") - var owned, archived int - var ownerName, ownerEmail string - row := h.db.QueryRowContext(r.Context(), getEventTypeQuery, user.ID, slug, user.ID, user.ID) - et, err := scanEventTypeRow(row, &owned, &ownerName, &ownerEmail, &archived) + row := h.db.QueryRowContext(r.Context(), getEventTypeQuery, slug, boolArg(user.IsAdmin), user.ID, user.ID) + et, err := scanEventTypeWithOwner(row, user) if err != nil { h.logger.ErrorContext(r.Context(), "get event type", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") @@ -435,12 +482,6 @@ func (h *Handler) GetEventType(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusNotFound, "event type not found") return } - et.Owned = owned != 0 - et.Archived = archived != 0 - if !et.Owned { // read-only host: surface who to contact for changes - et.OwnerName = ownerName - et.OwnerEmail = ownerEmail - } et.InviteSenderReady = h.inviteSenderReady(r.Context()) if err := h.loadReminders(r.Context(), et.ID, et); err != nil { h.logger.ErrorContext(r.Context(), "get event type: load reminders", "error", err) @@ -709,16 +750,18 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { set(s.col, nullableString(strings.TrimSpace(*s.val))) } - // Look up the event type ID + current location (needed for reminder upsert, to - // verify ownership, and to validate the effective online-meeting location below). - var etID, curLocType, curLocVal, curInviteDelivery string - if err := h.db.QueryRowContext(r.Context(), - `SELECT id, location_type, COALESCE(location_value, ''), invite_delivery FROM event_types WHERE slug = ? AND user_id = ?`, slug, user.ID). - Scan(&etID, &curLocType, &curLocVal, &curInviteDelivery); err != nil { - if err == sql.ErrNoRows { - h.writeError(w, http.StatusNotFound, "event type not found") - return - } + // Look up the event type ID, owner + current location (needed for reminder upsert, + // to verify the caller may edit it, and to validate the effective online-meeting + // location below). + var etID, ownerID, curLocType, curLocVal, curInviteDelivery string + err := h.db.QueryRowContext(r.Context(), + `SELECT id, user_id, location_type, COALESCE(location_value, ''), invite_delivery FROM event_types WHERE slug = ?`, slug). + Scan(&etID, &ownerID, &curLocType, &curLocVal, &curInviteDelivery) + if err == sql.ErrNoRows || (err == nil && !canManageEventType(user, ownerID)) { + h.writeError(w, http.StatusNotFound, "event type not found") + return + } + if err != nil { h.logger.ErrorContext(r.Context(), "patch event type: lookup id", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") return @@ -748,8 +791,12 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { if req.LocationValue != nil { effLocVal = *req.LocationValue } + // + // Validated against the event type's OWNER, not the caller: when an admin edits + // someone else's event type, it is still the owner's calendar or Zoom account that + // mints the link at booking time, so the admin's own connections prove nothing. if effLocType != curLocType || effLocVal != curLocVal { - if err := h.validateLocation(r.Context(), user.ID, effLocType, &effLocVal); err != nil { + if err := h.validateLocation(r.Context(), ownerID, effLocType, &effLocVal); err != nil { h.writeError(w, http.StatusBadRequest, err.Error()) return } @@ -805,9 +852,9 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { // Apply the event_types UPDATE if there are scalar fields to change. if len(setClauses) > 0 { - args = append(args, slug, user.ID) + args = append(args, etID) res, err := h.db.ExecContext(r.Context(), - "UPDATE event_types SET "+strings.Join(setClauses, ", ")+" WHERE slug = ? AND user_id = ?", // #nosec G202 -- setClauses is built by set()/the literal col list above; every column name is a hardcoded string, every value is bound via args... + "UPDATE event_types SET "+strings.Join(setClauses, ", ")+" WHERE id = ?", // #nosec G202 -- setClauses is built by set()/the literal col list above; every column name is a hardcoded string, every value is bound via args... args...) if err != nil { if db.IsUniqueViolation(err) { @@ -840,8 +887,7 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { // effectiveSlug, not slug: a rename above moved the row out from under the name this // request arrived on, and re-reading by that name would 404 a patch that succeeded. - row := h.db.QueryRowContext(r.Context(), - selectETCols+" WHERE slug = ? AND user_id = ?", effectiveSlug, user.ID) + row := h.db.QueryRowContext(r.Context(), selectETCols+" WHERE slug = ?", effectiveSlug) et, err := scanEventType(row) if err != nil { h.logger.ErrorContext(r.Context(), "fetch patched event type", "error", err) @@ -853,7 +899,8 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusInternalServerError, "internal error") return } - et.Owned = true // only the owner can patch + et.setOwnership(user, ownerID) + h.logForeignEventTypeChange(r.Context(), "update", etID, ownerID, user) h.writeJSON(w, http.StatusOK, et) } @@ -890,10 +937,12 @@ func (h *Handler) replaceReminders(ctx context.Context, etID string, newHours [] // DeleteEventType handles DELETE /v1/event-types/{slug}. func (h *Handler) DeleteEventType(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) - slug := r.PathValue("slug") + etID, ownerID := h.eventTypeForEditor(w, r, r.PathValue("slug"), user) + if etID == "" { + return + } - res, err := h.db.ExecContext(r.Context(), - `DELETE FROM event_types WHERE slug = ? AND user_id = ?`, slug, user.ID) + res, err := h.db.ExecContext(r.Context(), `DELETE FROM event_types WHERE id = ?`, etID) if err != nil { if db.IsForeignKeyViolation(err) { h.writeError(w, http.StatusConflict, "this event type has bookings in its history (including cancelled ones) and can't be deleted — deactivate it instead") @@ -908,5 +957,6 @@ func (h *Handler) DeleteEventType(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusNotFound, "event type not found") return } + h.logForeignEventTypeChange(r.Context(), "delete", etID, ownerID, user) w.WriteHeader(http.StatusNoContent) } diff --git a/internal/handler/event_type_admin_test.go b/internal/handler/event_type_admin_test.go new file mode 100644 index 00000000..18ae9f27 --- /dev/null +++ b/internal/handler/event_type_admin_test.go @@ -0,0 +1,303 @@ +package handler_test + +import ( + "database/sql" + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "github.com/calnode/calnode/internal/handler" + "github.com/calnode/calnode/internal/zoom" +) + +// Admins and the instance owner can list, view, edit and delete every event type on +// the instance (discussion #155); members keep seeing only what they own or host. +// Every request here goes through RequireAuth with an X-API-Key, so these tests are +// also the check that an admin's API key carries the admin's rights and a member's +// key does not: the role comes from the key's user row, not from the key. + +type etAdminItem struct { + Slug string `json:"slug"` + Name string `json:"name"` + Owned bool `json:"owned"` + CanEdit bool `json:"can_edit"` + OwnerID string `json:"owner_id"` + OwnerName string `json:"owner_name"` + OwnerEmail string `json:"owner_email"` +} + +// adminWorkspace is a workspace with the instance owner (from /v1/setup), a plain +// admin, an event type owned by a member, and a second member who neither owns nor +// hosts it. +type adminWorkspace struct { + h *handler.Handler + db *sql.DB + ownerKey, adminKey string + memberKey, otherKey string + slug, etID string + adminID, memberID, otherID string +} + +func setupAdminWorkspace(t *testing.T) adminWorkspace { + t.Helper() + h, database, ownerKey, _ := setupWorkspaceWithDB(t) + ws := adminWorkspace{ + h: h, db: database, ownerKey: ownerKey, + adminKey: "admin-et-key", memberKey: "member-et-key", otherKey: "other-et-key", + adminID: "u-admin", memberID: "u-member", otherID: "u-other", + } + for _, u := range []struct { + id, email, name, key string + admin int + }{ + {ws.adminID, "admin@example.com", "Ada Admin", ws.adminKey, 1}, + {ws.memberID, "member@example.com", "Mo Member", ws.memberKey, 0}, + {ws.otherID, "other@example.com", "Otto Other", ws.otherKey, 0}, + } { + if _, err := database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin) VALUES (?,?,?,'UTC',?)`, u.id, u.email, u.name, u.admin); err != nil { + t.Fatalf("seed user %s: %v", u.id, err) + } + if _, err := database.Exec(`INSERT INTO api_keys (id,user_id,name,key_hash,created_at) VALUES (?,?,'t',?,'2024-01-01')`, "k-"+u.id, u.id, sha256HexForTest(u.key)); err != nil { + t.Fatalf("seed key %s: %v", u.id, err) + } + } + ws.slug, ws.etID = seedEventTypeHTTP(t, h, ws.memberKey) + return ws +} + +func etCall(t *testing.T, h http.HandlerFunc, method, path, slug, body, key string) *httptest.ResponseRecorder { + t.Helper() + req := authReq(method, path, body, key) + if slug != "" { + req.SetPathValue("slug", slug) + } + rec := httptest.NewRecorder() + h(rec, req) + return rec +} + +func listETs(t *testing.T, h *handler.Handler, key, query string) map[string]etAdminItem { + t.Helper() + rec := etCall(t, h.RequireAuth(h.ListEventTypes), http.MethodGet, "/v1/event-types"+query, "", "", key) + if rec.Code != http.StatusOK { + t.Fatalf("list event types%s: %d — %s", query, rec.Code, rec.Body.String()) + } + var resp struct { + Items []etAdminItem `json:"items"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { + t.Fatalf("list decode: %v", err) + } + out := map[string]etAdminItem{} + for _, it := range resp.Items { + out[it.Slug] = it + } + return out +} + +func TestEventTypes_scopeAllListsEveryEventTypeForAdminsOnly(t *testing.T) { + ws := setupAdminWorkspace(t) + + // An admin's own list stays their own: no foreign event types without asking. + if _, ok := listETs(t, ws.h, ws.adminKey, "")[ws.slug]; ok { + t.Error("admin default list includes a member's event type; want it only under ?scope=all") + } + + for name, key := range map[string]string{"admin": ws.adminKey, "instance owner": ws.ownerKey} { + it, ok := listETs(t, ws.h, key, "?scope=all")[ws.slug] + if !ok { + t.Fatalf("%s ?scope=all: member's event type missing", name) + } + if it.Owned || !it.CanEdit { + t.Errorf("%s ?scope=all: owned=%v can_edit=%v; want owned=false can_edit=true", name, it.Owned, it.CanEdit) + } + if it.OwnerID != ws.memberID || it.OwnerName != "Mo Member" || it.OwnerEmail != "member@example.com" { + t.Errorf("%s ?scope=all: owner = %q/%q/%q; want the member", name, it.OwnerID, it.OwnerName, it.OwnerEmail) + } + } + + // A member asking for scope=all is ignored, not refused, exactly like bookings. + if _, ok := listETs(t, ws.h, ws.otherKey, "?scope=all")[ws.slug]; ok { + t.Error("member ?scope=all sees another member's event type; scope=all must be admin-only") + } + // The owner's own view is unchanged. + it, ok := listETs(t, ws.h, ws.memberKey, "")[ws.slug] + if !ok || !it.Owned || !it.CanEdit || it.OwnerID != ws.memberID { + t.Errorf("owner list: %+v (present=%v); want owned, editable, owner_id = self", it, ok) + } + if it.OwnerName != "" || it.OwnerEmail != "" { + t.Errorf("owner list: owner_name/email = %q/%q; want empty for the owner's own event type", it.OwnerName, it.OwnerEmail) + } +} + +func TestEventTypes_adminManagesAnotherMembersEventType(t *testing.T) { + ws := setupAdminWorkspace(t) + h := ws.h + path := "/v1/event-types/" + ws.slug + + rec := etCall(t, h.RequireAuth(h.GetEventType), http.MethodGet, path, ws.slug, "", ws.adminKey) + if rec.Code != http.StatusOK { + t.Fatalf("admin get: %d — %s", rec.Code, rec.Body.String()) + } + var got etAdminItem + json.Unmarshal(rec.Body.Bytes(), &got) + if got.Owned || !got.CanEdit || got.OwnerID != ws.memberID || got.OwnerEmail == "" { + t.Errorf("admin get: %+v; want owned=false can_edit=true and the member as owner", got) + } + + rec = etCall(t, h.RequireAuth(h.PatchEventType), http.MethodPatch, path, ws.slug, `{"name":"Renamed by admin"}`, ws.adminKey) + if rec.Code != http.StatusOK { + t.Fatalf("admin patch: %d — %s", rec.Code, rec.Body.String()) + } + json.Unmarshal(rec.Body.Bytes(), &got) + if got.Name != "Renamed by admin" || got.Owned || !got.CanEdit || got.OwnerID != ws.memberID { + t.Errorf("admin patch response: %+v; want the new name, owned=false, can_edit=true, owner = member", got) + } + var ownerID string + if err := ws.db.QueryRow(`SELECT user_id FROM event_types WHERE id = ?`, ws.etID).Scan(&ownerID); err != nil { + t.Fatal(err) + } + if ownerID != ws.memberID { + t.Fatalf("event type owner after admin edit = %q; an edit must never move ownership", ownerID) + } + + // The rest of the editor: hosts, questions, duplicate. + if rec := putHosts(t, h, ws.slug, ws.adminKey, `{"hosts":[{"user_id":"`+ws.memberID+`","role":"rotation","priority":0},{"user_id":"`+ws.otherID+`","role":"rotation","priority":1}]}`); rec.Code != http.StatusOK { + t.Fatalf("admin put hosts: %d — %s", rec.Code, rec.Body.String()) + } + if hosts := getHosts(t, h, ws.slug, ws.adminKey); len(hosts.Items) != 2 { + t.Errorf("admin get hosts: %d hosts; want 2", len(hosts.Items)) + } + qPath := path + "/questions" + rec = etCall(t, h.RequireAuth(h.CreateQuestion), http.MethodPost, qPath, ws.slug, `{"label":"Company","type":"text"}`, ws.adminKey) + if rec.Code != http.StatusCreated { + t.Fatalf("admin create question: %d — %s", rec.Code, rec.Body.String()) + } + var q struct { + ID string `json:"id"` + } + json.Unmarshal(rec.Body.Bytes(), &q) + req := authReq(http.MethodPatch, qPath+"/"+q.ID, `{"label":"Company name"}`, ws.adminKey) + req.SetPathValue("slug", ws.slug) + req.SetPathValue("id", q.ID) + rec = httptest.NewRecorder() + h.RequireAuth(h.UpdateQuestion)(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("admin update question: %d — %s", rec.Code, rec.Body.String()) + } + rec = etCall(t, h.RequireAuth(h.ListQuestionsAdmin), http.MethodGet, qPath+"/admin", ws.slug, "", ws.adminKey) + if rec.Code != http.StatusOK || !strings.Contains(rec.Body.String(), "Company name") { + t.Fatalf("admin list questions: %d — %s", rec.Code, rec.Body.String()) + } + + rec = etCall(t, h.RequireAuth(h.DuplicateEventType), http.MethodPost, path+"/duplicate", ws.slug, "", ws.adminKey) + if rec.Code != http.StatusCreated { + t.Fatalf("admin duplicate: %d — %s", rec.Code, rec.Body.String()) + } + var dup etAdminItem + json.Unmarshal(rec.Body.Bytes(), &dup) + if dup.OwnerID != ws.memberID || dup.Owned { + t.Errorf("admin duplicate: owner_id=%q owned=%v; the copy must stay with the source's owner", dup.OwnerID, dup.Owned) + } + + rec = etCall(t, h.RequireAuth(h.DeleteEventType), http.MethodDelete, "/v1/event-types/"+dup.Slug, dup.Slug, "", ws.adminKey) + if rec.Code != http.StatusNoContent { + t.Fatalf("admin delete: %d — %s", rec.Code, rec.Body.String()) + } + var n int + ws.db.QueryRow(`SELECT COUNT(*) FROM event_types WHERE slug = ?`, dup.Slug).Scan(&n) + if n != 0 { + t.Error("admin delete: event type still there") + } +} + +func TestEventTypes_memberCannotManageAnotherMembersEventType(t *testing.T) { + ws := setupAdminWorkspace(t) + h := ws.h + path := "/v1/event-types/" + ws.slug + + for _, c := range []struct { + name string + fn http.HandlerFunc + method, path string + body string + }{ + {"get", h.GetEventType, http.MethodGet, path, ""}, + {"patch", h.PatchEventType, http.MethodPatch, path, `{"name":"Hijacked"}`}, + {"delete", h.DeleteEventType, http.MethodDelete, path, ""}, + {"get hosts", h.ListEventTypeHosts, http.MethodGet, path + "/hosts", ""}, + {"put hosts", h.SetEventTypeHosts, http.MethodPut, path + "/hosts", `{"hosts":[{"user_id":"u-other","role":"required","priority":0}]}`}, + {"list questions", h.ListQuestionsAdmin, http.MethodGet, path + "/questions/admin", ""}, + {"create question", h.CreateQuestion, http.MethodPost, path + "/questions", `{"label":"x","type":"text"}`}, + {"duplicate", h.DuplicateEventType, http.MethodPost, path + "/duplicate", ""}, + {"test email", h.SendTestEmail, http.MethodPost, path + "/test-email", `{"type":"confirmation"}`}, + } { + if rec := etCall(t, h.RequireAuth(c.fn), c.method, c.path, ws.slug, c.body, ws.otherKey); rec.Code != http.StatusNotFound { + t.Errorf("member %s on another member's event type: %d; want 404", c.name, rec.Code) + } + } + var name, ownerID string + if err := ws.db.QueryRow(`SELECT name, user_id FROM event_types WHERE id = ?`, ws.etID).Scan(&name, &ownerID); err != nil { + t.Fatalf("event type gone after member requests: %v", err) + } + if name != "Test Meeting" || ownerID != ws.memberID { + t.Errorf("event type changed by a member: name=%q owner=%q", name, ownerID) + } +} + +// An assigned host still sees the event type read-only: admin rights are not handed to +// hosts, and can_edit says so explicitly. +func TestEventTypes_hostStaysReadOnly(t *testing.T) { + ws := setupAdminWorkspace(t) + h := ws.h + if _, err := ws.db.Exec(`INSERT INTO event_type_hosts (id,event_type_id,user_id,role,priority) VALUES ('eth-other',?,?,'rotation',1)`, ws.etID, ws.otherID); err != nil { + t.Fatal(err) + } + it, ok := listETs(t, h, ws.otherKey, "")[ws.slug] + if !ok || it.Owned || it.CanEdit { + t.Errorf("host list: %+v (present=%v); want present, owned=false, can_edit=false", it, ok) + } + rec := etCall(t, h.RequireAuth(h.GetEventType), http.MethodGet, "/v1/event-types/"+ws.slug, ws.slug, "", ws.otherKey) + var got etAdminItem + json.Unmarshal(rec.Body.Bytes(), &got) + if rec.Code != http.StatusOK || got.CanEdit || got.OwnerEmail != "member@example.com" { + t.Errorf("host get: %d %+v; want 200, can_edit=false, the owner's email", rec.Code, got) + } + if rec := etCall(t, h.RequireAuth(h.PatchEventType), http.MethodPatch, "/v1/event-types/"+ws.slug, ws.slug, `{"name":"Hijacked"}`, ws.otherKey); rec.Code != http.StatusNotFound { + t.Errorf("host patch: %d; want 404", rec.Code) + } +} + +// When an admin edits someone else's event type, per-owner checks still use the event +// type's OWNER. The location is the one such check in the edit path: a Zoom location +// with no manual link is valid only if the account that will mint the meetings at +// booking time is connected, and that is the owner's, not the admin's. +func TestPatchEventType_adminEditValidatesLocationAgainstOwner(t *testing.T) { + ws := setupAdminWorkspace(t) + zc, err := zoom.New(ws.db, "client", "secret", "http://localhost/zoom/callback", strings.Repeat("ab", 32)) + if err != nil { + t.Fatal(err) + } + ws.h.SetZoom(zc) + patch := func() *httptest.ResponseRecorder { + return etCall(t, ws.h.RequireAuth(ws.h.PatchEventType), http.MethodPatch, "/v1/event-types/"+ws.slug, ws.slug, `{"location_type":"zoom","location_value":""}`, ws.adminKey) + } + + // Only the admin has Zoom: not good enough, the owner's account mints the meetings. + if _, err := ws.db.Exec(`INSERT INTO zoom_connections (user_id, access_token_enc) VALUES (?, 'x')`, ws.adminID); err != nil { + t.Fatal(err) + } + if rec := patch(); rec.Code != http.StatusBadRequest { + t.Fatalf("zoom with only the admin connected: %d — %s; want 400, the location must be validated against the owner, not the admin", rec.Code, rec.Body.String()) + } + + // The owner connects Zoom: now the same admin edit is valid. + if _, err := ws.db.Exec(`INSERT INTO zoom_connections (user_id, access_token_enc) VALUES (?, 'x')`, ws.memberID); err != nil { + t.Fatal(err) + } + if rec := patch(); rec.Code != http.StatusOK { + t.Fatalf("zoom with the owner connected: %d — %s; want 200", rec.Code, rec.Body.String()) + } +} diff --git a/internal/handler/event_type_duplicate.go b/internal/handler/event_type_duplicate.go index d3e3b8fc..5ba09b22 100644 --- a/internal/handler/event_type_duplicate.go +++ b/internal/handler/event_type_duplicate.go @@ -87,10 +87,12 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) srcSlug := r.PathValue("slug") - // Owner-scoped, like PATCH and DELETE. An assigned host sees an event type - // read-only (only the owner can edit), so handing them a copy they could not - // then change would be worse than refusing. - srcID := h.eventTypeIDForOwner(w, r, srcSlug, user.ID) + // Editor-scoped, like PATCH and DELETE: the owner or an admin. An assigned host + // sees an event type read-only, so handing them a copy they could not then change + // would be worse than refusing. The copy keeps the source's owner (user_id is + // copied below), so an admin duplicating someone else's event type makes another + // one for that person, not one for themselves. + srcID, ownerID := h.eventTypeForEditor(w, r, srcSlug, user) if srcID == "" { return // eventTypeIDForOwner already wrote 404/500 } @@ -185,7 +187,8 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusInternalServerError, "internal error") return } - et.Owned = true // the copy belongs to the caller, like a freshly created one + et.setOwnership(user, ownerID) // the copy belongs to the source's owner + h.logForeignEventTypeChange(r.Context(), "duplicate", newID, ownerID, user) h.writeJSON(w, http.StatusCreated, et) } diff --git a/internal/handler/event_type_hosts.go b/internal/handler/event_type_hosts.go index 535fb263..d90d4741 100644 --- a/internal/handler/event_type_hosts.go +++ b/internal/handler/event_type_hosts.go @@ -42,28 +42,54 @@ func (h *Handler) resolveEventTypeHosts(ctx context.Context, eventTypeID string) return out, rows.Err() } -// eventTypeIDForOwner resolves an event type's id from its slug, scoped to the -// authenticated owner. Returns "" (and writes the response) if not found. -func (h *Handler) eventTypeIDForOwner(w http.ResponseWriter, r *http.Request, slug, userID string) string { - var id string +// canManageEventType is the one rule for who may change an event type: its owner, or +// any admin (the instance owner is always an admin). Assigned hosts are not on the +// list - they see the event type read-only. Admins get every event type for the same +// reason they get every booking (§6): with only the owner able to edit, a shared +// round-robin event type owned by a shared account could be changed only by signing +// in as that account (discussion #155). +func canManageEventType(user AuthUser, ownerID string) bool { + return ownerID == user.ID || user.IsAdmin +} + +// eventTypeForEditor resolves an event type the caller may manage from its slug and +// returns its id and its owner's id. Returns "" (and writes the response) if there is +// no such event type or the caller may not manage it; both are a 404, as before, so a +// member cannot probe for slugs they have no access to. +// +// The owner id is what per-owner checks must use when an admin edits someone else's +// event type: location validation, for one, asks whether the OWNER's calendar or Zoom +// account can mint links, because that is whose account mints them at booking time. +func (h *Handler) eventTypeForEditor(w http.ResponseWriter, r *http.Request, slug string, user AuthUser) (id, ownerID string) { err := h.db.QueryRowContext(r.Context(), - `SELECT id FROM event_types WHERE slug = ? AND user_id = ?`, slug, userID).Scan(&id) - if errors.Is(err, sql.ErrNoRows) { + `SELECT id, user_id FROM event_types WHERE slug = ?`, slug).Scan(&id, &ownerID) + if errors.Is(err, sql.ErrNoRows) || (err == nil && !canManageEventType(user, ownerID)) { h.writeError(w, http.StatusNotFound, "event type not found") - return "" + return "", "" } if err != nil { - h.logger.ErrorContext(r.Context(), "event type hosts: resolve id", "error", err) + h.logger.ErrorContext(r.Context(), "event type: resolve for editor", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") - return "" + return "", "" + } + return id, ownerID +} + +// logForeignEventTypeChange records a change an admin made to an event type they do +// not own. There is no audit table; this follows TransferEventType, which logs +// ownership changes the same way, so the line can be found next to it. +func (h *Handler) logForeignEventTypeChange(ctx context.Context, action, etID, ownerID string, actor AuthUser) { + if ownerID == actor.ID { + return } - return id + h.logger.InfoContext(ctx, "event type changed by admin", + "action", action, "event_type_id", etID, "owner", ownerID, "actor", actor.ID) } // ListEventTypeHosts handles GET /v1/event-types/{slug}/hosts. func (h *Handler) ListEventTypeHosts(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) - etID := h.eventTypeIDForOwner(w, r, r.PathValue("slug"), user.ID) + etID, _ := h.eventTypeForEditor(w, r, r.PathValue("slug"), user) if etID == "" { return } @@ -107,7 +133,7 @@ func (h *Handler) ListEventTypeHosts(w http.ResponseWriter, r *http.Request) { // entire host list. Body: {"hosts":[{"user_id","role","priority"}]}. func (h *Handler) SetEventTypeHosts(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) - etID := h.eventTypeIDForOwner(w, r, r.PathValue("slug"), user.ID) + etID, ownerID := h.eventTypeForEditor(w, r, r.PathValue("slug"), user) if etID == "" { return } @@ -207,6 +233,7 @@ func (h *Handler) SetEventTypeHosts(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusInternalServerError, "internal error") return } + h.logForeignEventTypeChange(r.Context(), "set_hosts", etID, ownerID, user) h.ListEventTypeHosts(w, r) } diff --git a/internal/handler/question_handler.go b/internal/handler/question_handler.go index 73268df2..ea2a1183 100644 --- a/internal/handler/question_handler.go +++ b/internal/handler/question_handler.go @@ -87,18 +87,8 @@ func (h *Handler) ListQuestions(w http.ResponseWriter, r *http.Request) { // questions on inactive or private event types. func (h *Handler) ListQuestionsAdmin(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) - slug := r.PathValue("slug") - - var etID string - err := h.db.QueryRowContext(r.Context(), - `SELECT id FROM event_types WHERE slug = ? AND user_id = ?`, slug, user.ID).Scan(&etID) - if errors.Is(err, sql.ErrNoRows) { - h.writeError(w, http.StatusNotFound, "event type not found") - return - } - if err != nil { - h.logger.ErrorContext(r.Context(), "list questions admin: lookup", "error", err) - h.writeError(w, http.StatusInternalServerError, "internal error") + etID, _ := h.eventTypeForEditor(w, r, r.PathValue("slug"), user) + if etID == "" { return } @@ -167,17 +157,9 @@ func (h *Handler) CreateQuestion(w http.ResponseWriter, r *http.Request) { return } - // Verify caller owns this event type. - var etID string - err := h.db.QueryRowContext(r.Context(), - `SELECT id FROM event_types WHERE slug = ? AND user_id = ?`, slug, user.ID).Scan(&etID) - if errors.Is(err, sql.ErrNoRows) { - h.writeError(w, http.StatusNotFound, "event type not found") - return - } - if err != nil { - h.logger.ErrorContext(r.Context(), "create question: lookup", "error", err) - h.writeError(w, http.StatusInternalServerError, "internal error") + // Verify the caller may edit this event type (its owner, or an admin). + etID, ownerID := h.eventTypeForEditor(w, r, slug, user) + if etID == "" { return } @@ -231,6 +213,7 @@ func (h *Handler) CreateQuestion(w http.ResponseWriter, r *http.Request) { Required: req.Required, Position: position, } + h.logForeignEventTypeChange(r.Context(), "create_question", etID, ownerID, user) h.writeJSON(w, http.StatusCreated, q) } @@ -253,15 +236,18 @@ func (h *Handler) UpdateQuestion(w http.ResponseWriter, r *http.Request) { return } - // Load current question verifying ownership via event_types.user_id. + // Verify the caller may edit the event type, then load the question within it. + etID, ownerID := h.eventTypeForEditor(w, r, slug, user) + if etID == "" { + return + } var current questionJSON var optRaw sql.NullString var requiredInt int err := h.db.QueryRowContext(r.Context(), ` - SELECT q.id, q.event_type_id, q.label, q.type, q.options, q.required, q.position - FROM event_type_questions q - JOIN event_types et ON et.id = q.event_type_id - WHERE q.id = ? AND et.slug = ? AND et.user_id = ?`, qID, slug, user.ID). + SELECT id, event_type_id, label, type, options, required, position + FROM event_type_questions + WHERE id = ? AND event_type_id = ?`, qID, etID). Scan(¤t.ID, ¤t.EventTypeID, ¤t.Label, ¤t.Type, &optRaw, &requiredInt, ¤t.Position) if errors.Is(err, sql.ErrNoRows) { @@ -329,22 +315,21 @@ func (h *Handler) UpdateQuestion(w http.ResponseWriter, r *http.Request) { return } + h.logForeignEventTypeChange(r.Context(), "update_question", etID, ownerID, user) h.writeJSON(w, http.StatusOK, current) } // DeleteQuestion handles DELETE /v1/event-types/{slug}/questions/{id} (admin). func (h *Handler) DeleteQuestion(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) - slug := r.PathValue("slug") + etID, ownerID := h.eventTypeForEditor(w, r, r.PathValue("slug"), user) + if etID == "" { + return + } qID := r.PathValue("id") - res, err := h.db.ExecContext(r.Context(), ` - DELETE FROM event_type_questions - WHERE id = ( - SELECT q.id FROM event_type_questions q - JOIN event_types et ON et.id = q.event_type_id - WHERE q.id = ? AND et.slug = ? AND et.user_id = ? - )`, qID, slug, user.ID) + res, err := h.db.ExecContext(r.Context(), + `DELETE FROM event_type_questions WHERE id = ? AND event_type_id = ?`, qID, etID) if err != nil { h.logger.ErrorContext(r.Context(), "delete question", "error", err) h.writeError(w, http.StatusInternalServerError, "internal error") @@ -354,6 +339,7 @@ func (h *Handler) DeleteQuestion(w http.ResponseWriter, r *http.Request) { h.writeError(w, http.StatusNotFound, "question not found") return } + h.logForeignEventTypeChange(r.Context(), "delete_question", etID, ownerID, user) w.WriteHeader(http.StatusNoContent) } diff --git a/internal/handler/test_email.go b/internal/handler/test_email.go index 269d843e..c2b68634 100644 --- a/internal/handler/test_email.go +++ b/internal/handler/test_email.go @@ -11,8 +11,10 @@ import ( ) // SendTestEmail handles POST /v1/event-types/{slug}/test-email. -// It sends a sample email to the authenticated host so they can preview -// how the custom message looks inside the real email template. +// It sends a sample email to the caller so they can preview how the custom message +// looks inside the real email template. When an admin previews someone else's event +// type, the sample still names the event type's owner as the host (that is what a +// booker would see), but it goes to the admin who asked for it, never to the owner. func (h *Handler) SendTestEmail(w http.ResponseWriter, r *http.Request) { user, _ := userFromContext(r.Context()) slug := r.PathValue("slug") @@ -34,21 +36,24 @@ func (h *Handler) SendTestEmail(w http.ResponseWriter, r *http.Request) { return } - // Load the event type and its custom messages (verifies ownership first). - var etName string + // Load the event type, its owner and its custom messages (verifies the caller may + // edit it first). + var ownerID, ownerName, ownerEmail, etName string var durationMinutes int var locVal, msgConf, msgCancel, msgResched, msgRemind sql.NullString var subjConf, subjCancel, subjResched, subjRemind sql.NullString err := h.db.QueryRowContext(r.Context(), ` - SELECT name, duration_minutes, location_value, - msg_confirmation, msg_cancellation, msg_reschedule, msg_reminder, - subj_confirmation, subj_cancellation, subj_reschedule, subj_reminder - FROM event_types - WHERE slug = ? AND user_id = ?`, slug, user.ID). - Scan(&etName, &durationMinutes, &locVal, + SELECT et.user_id, u.name, u.email, + et.name, et.duration_minutes, et.location_value, + et.msg_confirmation, et.msg_cancellation, et.msg_reschedule, et.msg_reminder, + et.subj_confirmation, et.subj_cancellation, et.subj_reschedule, et.subj_reminder + FROM event_types et + JOIN users u ON u.id = et.user_id + WHERE et.slug = ?`, slug). + Scan(&ownerID, &ownerName, &ownerEmail, &etName, &durationMinutes, &locVal, &msgConf, &msgCancel, &msgResched, &msgRemind, &subjConf, &subjCancel, &subjResched, &subjRemind) - if err == sql.ErrNoRows { + if err == sql.ErrNoRows || (err == nil && !canManageEventType(user, ownerID)) { h.writeError(w, http.StatusNotFound, "event type not found") return } @@ -89,8 +94,8 @@ func (h *Handler) SendTestEmail(w http.ResponseWriter, r *http.Request) { BookingID: "preview-test", EventTypeName: etName, EventTypeSlug: slug, - HostName: user.Name, - HostEmail: user.Email, + HostName: ownerName, + HostEmail: ownerEmail, OrganizerName: "Alex Johnson", OrganizerEmail: user.Email, // send to host so they can review it OrganizerTimezone: user.IANATZ, From 0ebc94d97e9551ff6d4ee880b4eb59d2ed32a342 Mon Sep 17 00:00:00 2001 From: raccoder-com <41738155+raccoder-com@users.noreply.github.com> Date: Thu, 22 Oct 2026 01:21:47 +0400 Subject: [PATCH 176/250] docs(event-types): say who actually mints meeting links Location validation checks the event type's owner, as it always has for an owner's own edit; the link is minted at booking time by the primary host, who for round-robin or collective event types need not be the owner. The comments, the test and ARCHITECTURE claimed the owner mints it; they now describe the rule and state the multi-host limitation. Also: the Zoom 400 no longer says "your" account (the check uses the owner's), the duplicate handler names eventTypeForEditor instead of the removed helper, the audit claim lists which routes resolve through eventTypeForEditor, and the owner_name/owner_email contract is narrowed to GET and list responses. --- audit/claims.yaml | 7 ++++--- docs/ARCHITECTURE.md | 21 ++++++++++++++------- internal/handler/booking_handler.go | 2 +- internal/handler/event_type.go | 15 +++++++++------ internal/handler/event_type_admin_test.go | 6 +++--- internal/handler/event_type_duplicate.go | 2 +- internal/handler/event_type_hosts.go | 4 +++- 7 files changed, 35 insertions(+), 22 deletions(-) diff --git a/audit/claims.yaml b/audit/claims.yaml index f6ff3de0..3e544cb7 100644 --- a/audit/claims.yaml +++ b/audit/claims.yaml @@ -264,9 +264,10 @@ claims: workspace-wide access; there is no per-resource permission matrix to misconfigure or drift out of sync." - "internal/handler/event_type_hosts.go's canManageEventType — owner or - IsAdmin, the single check behind every event-type edit route (via - eventTypeForEditor), so admins manage every event type the same way they see - every booking." + IsAdmin, the one rule behind every event-type edit route (resolved through + eventTypeForEditor, or called directly by PatchEventType and SendTestEmail; + TransferEventType is requireAdmin plus expected_owner_id), so admins manage + every event type the same way they see every booking." status: verified caveat: > Recorded here because a prior Layer 2 audit pass flagged REST's admin-only diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 404e80d3..17fb6afc 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -815,17 +815,24 @@ as the desired state: `GET /v1/event-types?scope=all` lists all of them (same `IsAdmin` gate, silently ignored for members), and GET/PATCH/DELETE, `/hosts`, `/questions`, `/duplicate` and `/test-email` accept any slug from an admin. One rule decides it, - `canManageEventType` (owner or admin), resolved by `eventTypeForEditor`, which returns - 404 rather than 403 so a member cannot probe slugs. Slugs are unique per instance, so + `canManageEventType` (owner or admin), mostly resolved by `eventTypeForEditor` + (PATCH and test-email call it directly), which returns 404 rather than 403 so a + member cannot probe slugs. Slugs are unique per instance, so the slug-addressed routes stay unambiguous. The JSON carries `owned` (caller is the owner), `can_edit` (owner or admin; false = - read-only host) and `owner_id`; `owner_name`/`owner_email` whenever the caller is not - the owner. The admin UI gates read-only on `can_edit`, not `owned`. + read-only host) and `owner_id`; on GET and the list, `owner_name`/`owner_email` + whenever the caller is not the owner (PATCH and duplicate responses omit them). The admin UI gates read-only on `can_edit`, not `owned`. ⛔ An admin edit never changes **whose** event type it is. Everything per-owner keeps resolving to `event_types.user_id`: `validateLocation` checks the owner's calendar - and Zoom connections (that is whose account mints links at booking time), the - editor's "Just me" host is the owner, a duplicate belongs to the source's owner, and - the test email names the owner as host (it is still sent to the admin who asked). + and Zoom connections (the same rule as an owner's own edit), the editor's "Just me" + host is the owner, a duplicate belongs to the source's owner, and the test email + names the owner as host (it is still sent to the admin who asked). + Known limitation, unchanged by admin editing: links are minted at booking time by + the **primary host's** account (§10). For a fixed event type that is the owner; for + round-robin or collective it is the assigned host, who need not be the owner. A + location saved without a manual link can therefore validate against the owner and + still fall back to no link for a host who has no matching connection, and the test + email names the owner where a real booking names the primary host. There is no audit table; admin changes to someone else's event type are logged as `event type changed by admin` with action, owner and actor, next to the transfer log line. Transfer itself (§7) is unchanged: it still moves only the caller's own event diff --git a/internal/handler/booking_handler.go b/internal/handler/booking_handler.go index 351efb69..5f7d4b80 100644 --- a/internal/handler/booking_handler.go +++ b/internal/handler/booking_handler.go @@ -205,7 +205,7 @@ func (h *Handler) validateLocation(ctx context.Context, ownerID, locType string, return nil } } - return fmt.Errorf("connect your Zoom account to auto-generate meeting links, or enter a Zoom link") + return fmt.Errorf("connect the event type owner's Zoom account to auto-generate meeting links, or enter a Zoom link") case "livekit": // Built-in video: the room is always minted server-side per booking, so there's no // manual link (that's what the "Video link" type is for). LiveKit must be configured. diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index 40a36136..b704d8b8 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -77,9 +77,10 @@ type eventTypeJSON struct { // resources - availability, calendar and Zoom connections - are that user's, also // when an admin is the one editing. OwnerID string `json:"owner_id"` - // OwnerName/OwnerEmail identify the owner when the requesting user is not the - // owner, so a read-only host knows who to contact for changes and an admin can see - // whose event type they are looking at. + // OwnerName/OwnerEmail identify the owner on the GET and list responses when the + // requesting user is not the owner, so a read-only host knows who to contact for + // changes and an admin can see whose event type they are looking at. PATCH and + // duplicate responses leave them empty. OwnerName string `json:"owner_name,omitempty"` OwnerEmail string `json:"owner_email,omitempty"` // InviteSenderReady reports, on the single-event-type GET, whether Calnode can @@ -792,9 +793,11 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { effLocVal = *req.LocationValue } // - // Validated against the event type's OWNER, not the caller: when an admin edits - // someone else's event type, it is still the owner's calendar or Zoom account that - // mints the link at booking time, so the admin's own connections prove nothing. + // Validated against the event type's OWNER, not the caller, so an admin edit applies + // the same rule the owner's own edit always has and the admin's connections prove + // nothing. The link itself is minted at booking time by the PRIMARY host's account + // (mintMeetingLink); for a fixed event type that is the owner, for round-robin or + // collective it can be another host, and this check does not look at them. if effLocType != curLocType || effLocVal != curLocVal { if err := h.validateLocation(r.Context(), ownerID, effLocType, &effLocVal); err != nil { h.writeError(w, http.StatusBadRequest, err.Error()) diff --git a/internal/handler/event_type_admin_test.go b/internal/handler/event_type_admin_test.go index 18ae9f27..21195ce3 100644 --- a/internal/handler/event_type_admin_test.go +++ b/internal/handler/event_type_admin_test.go @@ -272,8 +272,8 @@ func TestEventTypes_hostStaysReadOnly(t *testing.T) { // When an admin edits someone else's event type, per-owner checks still use the event // type's OWNER. The location is the one such check in the edit path: a Zoom location -// with no manual link is valid only if the account that will mint the meetings at -// booking time is connected, and that is the owner's, not the admin's. +// with no manual link is valid only if the owner's Zoom account is connected, as when +// the owner edits it; the admin's own connection does not count. func TestPatchEventType_adminEditValidatesLocationAgainstOwner(t *testing.T) { ws := setupAdminWorkspace(t) zc, err := zoom.New(ws.db, "client", "secret", "http://localhost/zoom/callback", strings.Repeat("ab", 32)) @@ -285,7 +285,7 @@ func TestPatchEventType_adminEditValidatesLocationAgainstOwner(t *testing.T) { return etCall(t, ws.h.RequireAuth(ws.h.PatchEventType), http.MethodPatch, "/v1/event-types/"+ws.slug, ws.slug, `{"location_type":"zoom","location_value":""}`, ws.adminKey) } - // Only the admin has Zoom: not good enough, the owner's account mints the meetings. + // Only the admin has Zoom: not good enough, the check is on the owner's account. if _, err := ws.db.Exec(`INSERT INTO zoom_connections (user_id, access_token_enc) VALUES (?, 'x')`, ws.adminID); err != nil { t.Fatal(err) } diff --git a/internal/handler/event_type_duplicate.go b/internal/handler/event_type_duplicate.go index 5ba09b22..a4d7bff9 100644 --- a/internal/handler/event_type_duplicate.go +++ b/internal/handler/event_type_duplicate.go @@ -94,7 +94,7 @@ func (h *Handler) DuplicateEventType(w http.ResponseWriter, r *http.Request) { // one for that person, not one for themselves. srcID, ownerID := h.eventTypeForEditor(w, r, srcSlug, user) if srcID == "" { - return // eventTypeIDForOwner already wrote 404/500 + return // eventTypeForEditor already wrote 404/500 } tx, err := h.db.BeginTx(r.Context(), nil) diff --git a/internal/handler/event_type_hosts.go b/internal/handler/event_type_hosts.go index d90d4741..f7d43b06 100644 --- a/internal/handler/event_type_hosts.go +++ b/internal/handler/event_type_hosts.go @@ -59,7 +59,9 @@ func canManageEventType(user AuthUser, ownerID string) bool { // // The owner id is what per-owner checks must use when an admin edits someone else's // event type: location validation, for one, asks whether the OWNER's calendar or Zoom -// account can mint links, because that is whose account mints them at booking time. +// account can mint links, the same rule as when the owner edits it. At booking time the +// primary host's account mints the link, which for round-robin or collective event +// types need not be the owner. func (h *Handler) eventTypeForEditor(w http.ResponseWriter, r *http.Request, slug string, user AuthUser) (id, ownerID string) { err := h.db.QueryRowContext(r.Context(), `SELECT id, user_id FROM event_types WHERE slug = ?`, slug).Scan(&id, &ownerID) From 61ce48512189cc22f91596142e97c0e68e29aa5a Mon Sep 17 00:00:00 2001 From: raccoder-com <41738155+raccoder-com@users.noreply.github.com> Date: Thu, 22 Oct 2026 01:22:38 +0400 Subject: [PATCH 177/250] docs(event-types): a fixed event type's host need not be its owner either --- docs/ARCHITECTURE.md | 5 +++-- internal/handler/event_type.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 17fb6afc..e6bedfed 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -828,8 +828,9 @@ as the desired state: host is the owner, a duplicate belongs to the source's owner, and the test email names the owner as host (it is still sent to the admin who asked). Known limitation, unchanged by admin editing: links are minted at booking time by - the **primary host's** account (§10). For a fixed event type that is the owner; for - round-robin or collective it is the assigned host, who need not be the owner. A + the **primary host's** account (§10): the fixed event type's host or the assigned + round-robin/collective host, neither of whom has to be the owner (the host list + need not include them). A location saved without a manual link can therefore validate against the owner and still fall back to no link for a host who has no matching connection, and the test email names the owner where a real booking names the primary host. diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index b704d8b8..3a0fadb7 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -796,8 +796,9 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { // Validated against the event type's OWNER, not the caller, so an admin edit applies // the same rule the owner's own edit always has and the admin's connections prove // nothing. The link itself is minted at booking time by the PRIMARY host's account - // (mintMeetingLink); for a fixed event type that is the owner, for round-robin or - // collective it can be another host, and this check does not look at them. + // (mintMeetingLink), i.e. the event type's host, which need not be the owner: the + // host list can exclude them, and round-robin or collective pick among several. This + // check does not look at the hosts. if effLocType != curLocType || effLocVal != curLocVal { if err := h.validateLocation(r.Context(), ownerID, effLocType, &effLocVal); err != nil { h.writeError(w, http.StatusBadRequest, err.Error()) From f881ccdd7b34d6630eb084fbc40baa75e0e2a263 Mon Sep 17 00:00:00 2001 From: raccoder-com <41738155+raccoder-com@users.noreply.github.com> Date: Thu, 22 Oct 2026 01:29:57 +0400 Subject: [PATCH 178/250] docs(event-types): only Meet/Teams/Zoom links are host-minted; transfer has its own check --- audit/claims.yaml | 9 +++++---- docs/ARCHITECTURE.md | 4 ++-- internal/handler/event_type.go | 4 ++-- internal/handler/event_type_hosts.go | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/audit/claims.yaml b/audit/claims.yaml index 3e544cb7..eb819e32 100644 --- a/audit/claims.yaml +++ b/audit/claims.yaml @@ -264,10 +264,11 @@ claims: workspace-wide access; there is no per-resource permission matrix to misconfigure or drift out of sync." - "internal/handler/event_type_hosts.go's canManageEventType — owner or - IsAdmin, the one rule behind every event-type edit route (resolved through - eventTypeForEditor, or called directly by PatchEventType and SendTestEmail; - TransferEventType is requireAdmin plus expected_owner_id), so admins manage - every event type the same way they see every booking." + IsAdmin, the one rule behind every event-type edit route except transfer + (resolved through eventTypeForEditor, or called directly by PatchEventType and + SendTestEmail), so admins manage every event type the same way they see every + booking. TransferEventType has its own check: requireAdmin plus + expected_owner_id equal to the caller, so it moves only the caller's own." status: verified caveat: > Recorded here because a prior Layer 2 audit pass flagged REST's admin-only diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index e6bedfed..4fc0b231 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -827,8 +827,8 @@ as the desired state: and Zoom connections (the same rule as an owner's own edit), the editor's "Just me" host is the owner, a duplicate belongs to the source's owner, and the test email names the owner as host (it is still sent to the admin who asked). - Known limitation, unchanged by admin editing: links are minted at booking time by - the **primary host's** account (§10): the fixed event type's host or the assigned + Known limitation, unchanged by admin editing: Meet, Teams and Zoom links are minted + at booking time by the **primary host's** account (§10): the fixed event type's host or the assigned round-robin/collective host, neither of whom has to be the owner (the host list need not include them). A location saved without a manual link can therefore validate against the owner and diff --git a/internal/handler/event_type.go b/internal/handler/event_type.go index 3a0fadb7..45f8404e 100644 --- a/internal/handler/event_type.go +++ b/internal/handler/event_type.go @@ -795,8 +795,8 @@ func (h *Handler) PatchEventType(w http.ResponseWriter, r *http.Request) { // // Validated against the event type's OWNER, not the caller, so an admin edit applies // the same rule the owner's own edit always has and the admin's connections prove - // nothing. The link itself is minted at booking time by the PRIMARY host's account - // (mintMeetingLink), i.e. the event type's host, which need not be the owner: the + // nothing. A Meet, Teams or Zoom link is minted at booking time by the PRIMARY host's + // account (mintMeetingLink), i.e. the event type's host, which need not be the owner: the // host list can exclude them, and round-robin or collective pick among several. This // check does not look at the hosts. if effLocType != curLocType || effLocVal != curLocVal { diff --git a/internal/handler/event_type_hosts.go b/internal/handler/event_type_hosts.go index f7d43b06..87cafb68 100644 --- a/internal/handler/event_type_hosts.go +++ b/internal/handler/event_type_hosts.go @@ -59,9 +59,9 @@ func canManageEventType(user AuthUser, ownerID string) bool { // // The owner id is what per-owner checks must use when an admin edits someone else's // event type: location validation, for one, asks whether the OWNER's calendar or Zoom -// account can mint links, the same rule as when the owner edits it. At booking time the -// primary host's account mints the link, which for round-robin or collective event -// types need not be the owner. +// account can mint links, the same rule as when the owner edits it. At booking time a +// Meet, Teams or Zoom link is minted by the primary host's account, and the primary +// host need not be the owner. func (h *Handler) eventTypeForEditor(w http.ResponseWriter, r *http.Request, slug string, user AuthUser) (id, ownerID string) { err := h.db.QueryRowContext(r.Context(), `SELECT id, user_id FROM event_types WHERE slug = ?`, slug).Scan(&id, &ownerID) From 85a40fc82e81869f1bd52a4cf603e3d566ee0ce5 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Fri, 30 Oct 2026 09:11:03 +1300 Subject: [PATCH 179/250] fix(ui): label and guard the "your own system" invite mode Follow-up to #158, which added invite_delivery 'none' without the wording and `guards agreed when it was designed. Four gaps, all in the event type editor: - The mode read "No one (you send your own)", a negation that looks like a mistake. It is now "Your own system", which reads as a deliberate choice. - Choosing it while email is not configured emails the booker nothing at all, and that is easy to do by accident and impossible to notice later, so it is confirmed once. The selection is held back until confirmed, and cancelling leaves the previous mode in place. - A permanent line says the setting applies to new bookings only, because the mode is copied onto a booking when it is created and later changes do not reach existing ones. - With an online location the booking still has a join link, and Calnode will not send it. The editor now says so and names location_value in the booking.created webhook, which is where an integration finds it. One implementation note: bits-ui keeps the clicked option as its internal selection even when the bound value is not changed, so after a cancel, re-picking the same option fired no change event and the dialog never reappeared. The Select is keyed on a counter that increments when a choice is declined, which remounts it against the current value. Verified in a browser: select, cancel, reselect, dialog reopens; confirm, the value applies; an online location shows the join-link warning. --- .../routes/event-types/[slug]/+page.svelte | 68 ++++++++++++++++--- 1 file changed, 57 insertions(+), 11 deletions(-) diff --git a/frontend/src/routes/event-types/[slug]/+page.svelte b/frontend/src/routes/event-types/[slug]/+page.svelte index b626f6b3..c0aa46fa 100644 --- a/frontend/src/routes/event-types/[slug]/+page.svelte +++ b/frontend/src/routes/event-types/[slug]/+page.svelte @@ -17,6 +17,7 @@ import { saveOnCmdS } from '$lib/save-shortcut'; import QuestionsPanel from '$lib/components/event-types/QuestionsPanel.svelte'; import EmbedPanel from '$lib/components/event-types/EmbedPanel.svelte'; + import { ConfirmDialog } from '$lib/components/ui/confirm-dialog'; // Ordered by expected usage. 'custom_video' is retired from the picker but the // backend still renders any legacy event types that use it. @@ -43,7 +44,7 @@ const INVITE_DELIVERY = [ { value: 'calendar', label: "The host's calendar" }, { value: 'calnode', label: 'Calnode, from your workspace' }, - { value: 'none', label: 'No one (you send your own)' }, + { value: 'none', label: 'Your own system' }, ]; // ── Event type ─────────────────────────────────────────────────────────────── @@ -70,6 +71,8 @@ // Which connected provider can natively mint each online platform's link. const PLATFORM_PROVIDER: Record = { google_meet: 'google', teams: 'microsoft' }; const isOnlineMeeting = (t: string) => t === 'google_meet' || t === 'teams'; + // Any location that produces a join link the booker has to receive somehow. + const isOnlineLocation = (t: string) => isOnlineMeeting(t) || t === 'zoom' || t === 'livekit'; let form = $state({ display_order: 0, @@ -83,6 +86,28 @@ price_cents: 0, currency: 'usd', }); + // "Your own system" means Calnode sends the booker nothing at all. When email is not + // configured that is easy to pick by accident and impossible to notice later, so it is + // confirmed once rather than applied silently. + let confirmNoneOpen = $state(false); + let noneAcknowledged = $state(false); + // Remounts the Select when a choice is declined. bits-ui keeps the clicked option as its + // internal selection even though the bound value did not change, so re-picking it fires no + // change event and the dialog would never reopen. + let inviteSelectReset = $state(0); + + function requestInviteDelivery(v: string | undefined) { + if (!v) return; + const mode = v as EventType['invite_delivery']; + if (mode === 'none' && et?.invite_sender_ready === false && !noneAcknowledged) { + confirmNoneOpen = true; + inviteSelectReset += 1; + return; + } + form.invite_delivery = mode; + if (mode !== 'none') noneAcknowledged = false; + } + // Price is edited in major units (e.g. dollars); stored as integer cents. let priceMajor = $state('0'); @@ -758,16 +783,18 @@
    - - - {INVITE_DELIVERY.find((o) => o.value === form.invite_delivery)?.label ?? 'Select…'} - - - {#each INVITE_DELIVERY as o} - {o.label} - {/each} - - + {#key inviteSelectReset} + + + {INVITE_DELIVERY.find((o) => o.value === form.invite_delivery)?.label ?? 'Select…'} + + + {#each INVITE_DELIVERY as o} + {o.label} + {/each} + + + {/key}

    {#if form.invite_delivery === 'calnode'} @@ -783,12 +810,22 @@ {/if}

    +

    + Applies to new bookings only. Existing bookings keep the method they were sent with. +

    {#if form.invite_delivery === 'calnode' && et?.invite_sender_ready === false}

    Email isn't set up, so bookers won't receive an invite. Add a sender in Settings → Email.

    {/if} + {#if form.invite_delivery === 'none' && isOnlineLocation(form.location_type)} +

    + This event type books an online meeting, so every booking has a join link, and Calnode will + not send it to the booker. Pass its location_value from the + booking.created webhook in your own confirmation. +

    + {/if}
    @@ -1194,4 +1231,13 @@
    {/if} + { form.invite_delivery = 'none'; noneAcknowledged = true; }} + /> + {/if} From c7b3e56778075d9ceda7fcbf3272f7dbe3bf33ae Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Fri, 30 Oct 2026 09:56:55 +1300 Subject: [PATCH 180/250] chore(release): 0.12.0 Eight fixes and two features since 0.11.2, plus one migration. Added: admins can manage every event type, and calendar invites can be left to your own system (invite_delivery 'none'), including the editor wording and guards, and the booking/webhook field that names the mode. Fixed: Microsoft free/busy counting free and cancelled entries as busy, the notetaker failing to enqueue any job after migration 00065, slot alignment in half-hour timezones, post-booking work sharing one deadline with email, host calendar checks running sequentially, reassign leaving two primary seats, and SMTP messages missing Date and Message-ID. Also the keyvault change that stopped a plain `docker run` losing every stored credential on restart. Migration 00071 rebuilds invite_delivery on bookings and event_types. Rehearsed against a copy of production data: 18ms, row counts and stored modes unchanged, the double-booking guard and foreign keys intact, and the down migration mapping none to calnode. --- CHANGELOG.md | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f8085d0..496a6395 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,41 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +## [0.12.0] - 2026-10-30 + ### Fixed +- **Microsoft calendars stop treating free and cancelled entries as busy.** Outlook's calendar + view lists entries that leave the owner available: reminders, all-day holidays from + subscribed calendars, cancelled meetings still on the calendar, and invitations that were + declined. Calnode counted all of them, so a single all-day "free" entry could block a + collective's whole day. None of those block now; tentative, busy, out-of-office and + working-elsewhere still do, which matches Outlook's own scheduling assistant. +- **The notetaker enqueues jobs again.** Migration 00065 replaced the jobs table's full unique + index with a partial one over live jobs, and SQLite only accepts a partial index as an + upsert target when the `ON CONFLICT` clause repeats its predicate. The bare target matched + no constraint, so every transcribe and summarize enqueue failed. A pending duplicate is + still pulled forward to run now, a running job is left alone rather than run twice, and a + finished one starts a fresh run. +- **Slots align to the host's wall clock, not the UTC epoch.** In a timezone offset by half an + hour or 45 minutes, hourly slots started at :30 or :45 local, so a 09:00-17:00 day never + offered 09:00; intervals that do not divide a day also drifted from day to day. Alignment + now counts from local midnight on the lead host's clock, on one shared clock because + collective and round-robin routing joins hosts on identical instants, and wall-clock + arithmetic keeps the grid stable across DST changes. +- **A slow mail server no longer drops other hosts' calendar events or the webhook.** + Post-booking work shared a single 30-second deadline, so a stalled SMTP server could spend + it before the remaining hosts were handled. Reminders are queued first because they are + durable and need no calendar, the calendar phase has its own budget, the webhook is + enqueued after it on an uncancelled context so it still carries the minted link, and email + runs under a separate budget. +- **Booking checks host calendars concurrently.** Hosts were read in sequence, so the budget + covered one provider round trip per host and a multi-host event could fail with a calendar + availability error. Checks now run concurrently and remain all-or-nothing, because a + partial union would read an unchecked provider's meetings as free time. +- **Reassigning a booking moves the primary seat atomically.** The new host could end up with + two seats on the same booking. The seat now moves in the same transaction as `host_id`, a + legacy booking without a seat gets one, and reassigning onto an existing co-host returns + 409 instead of creating a duplicate. - **Mail sent over SMTP carries `Date` and `Message-ID`.** Messages went out with only `From`, `To` and `Subject`. RFC 5322 requires an origination date on every message and expects a message identifier; some relays add what is missing, but not all do, and @@ -55,6 +89,8 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad that file, so the two must be kept together: restoring the database alone will not start. Deployments that set `CALNODE_ENCRYPTION_KEY` in the environment are unchanged and write no key file. + +### Added - **Admins can manage every event type, not just their own.** Until now only an event type's owner could edit or delete it; admins and the instance owner got the same read-only view as an assigned host. A shared round-robin event type owned by a shared @@ -67,8 +103,6 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad admin's. Members and hosts see exactly what they did before. Event types in API responses gain `can_edit` and `owner_id`; `owned` keeps its meaning (the caller is the owner). Changes an admin makes to someone else's event type are logged. - -### Added - **The published arm64 image is now exercised on native hardware on every PR and every publish.** A new `arm64-smoke` job runs on an ARM runner, asserts the image and the container really are `aarch64`, checks the app serves over HTTP, and — the part that @@ -76,7 +110,7 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad the existing data key rather than generating a new one. On a publish it pulls the exact digest the build job produced, so it cannot pass against a stale tag. - **Calendar invites can be left to your own system.** *Calendar invite → Sent by* gains a - third choice, *No one*. Hosts still get the meeting, with its Meet/Teams link, on their + third choice, *Your own system*. Hosts still get the meeting, with its Meet/Teams link, on their own calendar, but the booker is not a guest there, so their calendar provider sends no invite, and Calnode attaches none to its emails. For setups that send their own confirmation and invite. It needs no email setup; if email is set up, the booker's @@ -87,6 +121,14 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad `calnode` or `none`), and webhooks can add it as a payload field. It is not in the default field set, so existing webhooks are unchanged. +### Upgrade notes +- **Back up before upgrading.** This release adds migration `00071`, which rebuilds the + `invite_delivery` column on `bookings` and `event_types` because SQLite cannot alter a + `CHECK` constraint in place. It is a table rewrite: milliseconds at ordinary data sizes + (18ms against a small production database), but take a restore point first. The down + migration maps `none` to `calnode`, so lowering the version after using the new mode is + lossy for that value. + ## [0.11.2] - 2026-10-28 ### Added From 5d37e1fd8e32ab2bea47f2348b1c233704dc377a Mon Sep 17 00:00:00 2001 From: MinosChatzidakis Date: Sun, 1 Nov 2026 16:40:07 +0200 Subject: [PATCH 181/250] changed ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e378b9ae..fb8b6478 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ dist/ /graphify-out/ # Data (local dev DB) +calnode-data/ data/ data-demo/ *.db From ac267924216c2398afc0e4dc8a855997cba466db Mon Sep 17 00:00:00 2001 From: MinosChatzidakis Date: Sun, 1 Nov 2026 16:42:11 +0200 Subject: [PATCH 182/250] added greek translation for i18n --- internal/i18n/locales/el.json | 179 ++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 internal/i18n/locales/el.json diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json new file mode 100644 index 00000000..a9e061a4 --- /dev/null +++ b/internal/i18n/locales/el.json @@ -0,0 +1,179 @@ +{ + "book_by_chat": "Κράτηση μέσω συνομιλίας", + "close": "Κλείσιμο", + "assistant_greeting": "Γεια! Πείτε μου πότε περίπου θα θέλατε να γίνει η συνάντηση — π.χ. \"Την Τρίτη το απόγευμα\" ή \"την επόμενη εβδομάδα\" — και θα σας βρω μια ώρα. Μπορείτε εναλλακτικά να χρησιμοποιήσετε το ημερολόγιο.", + "assistant_input_placeholder": "Πληκτρολογήστε πότε είστε διαθέσιμοι...", + "assistant_input_aria": "Στείλτε μήνυμα στον βοηθό κρατήσεων...", + "send": "Αποστολή", + "show_more": "Εμφάνιση περισσότερων", + "show_less": "Εμφάνιση λιγότερων", + "date_picker_aria": "Επιλογή ημερομηνίας", + "timezone_aria": "Ζώνη ώρας", + "select_day_hint": "Επιλέξτε μια ημέρα για να δείτε τις διαθέσιμες ώρες.", + "back": "Πίσω", + "name_label": "Ονοματεπώνυμο", + "name_placeholder": "Το ονοματεπώνυμό σας", + "email_label": "Email", + "email_placeholder": "you@example.com", + "choose_option": "Επιλέξτε", + "confirm_booking": "Επιβεβαίωση κράτησης", + "confirming": "Γίνεται επιβεβαίωση", + "booking_confirmed": "Η κράτηση επιβεβαιώθηκε", + "confirmation_email_sent": "Σας έχει αποσταλεί email επιβεβαίωσης.", + "required_fields_error": "Παρακαλούμε συμπληρώστε όλα τα υποχρεωτικά πεδία.", + "slot_taken_error": "Αυτή η ώρα έχει επιλεγεί από κάποιον άλλον. Παρακαλούμε επιλέξτε μια διαφορετική ώρα.", + "booking_failed_error": "Η κράτηση απέτυχε. Παρακαλούμε προσπαθήστε ξανά.", + "network_error": "Σφάλμα δικτύου. Παρακαλούμε ελέγξτε τη σύνδεσή σας.", + "loading": "Φόρτωση", + "no_available_times": "Δεν υπάρχουν διαθέσιμες ώρες στις %s. Δοκιμάστε μια άλλη ημερομηνία.", + "no_available_times_host": "Ο/Η %[1]s δεν έχει διαθεσιμότητα στις %[2]s. Δοκιμάστε μια άλλη ημερομηνία.", + "slot_taken": "έχει ήδη κλειστεί", + "all_times_taken": "Κάθε ώρα της ημέρας αυτής έχει κλειστεί.", + "min_notice_hint": "Οι κρατήσεις πρέπει να γίνονται τουλάχιστον %s πριν.", + "could_not_load_times": "Δεν μπόρεσε να γίνει φόρτωση των ωρών. Παρακαλούμε δοκιμάστε ξανά.", + "times_shown_in": "Ζώνη ώρας ", + "payment_received": "Η πληρωμή ολοκληρώθηκε", + "payment_confirmed_sub": "Η κράτησή σας επιβεβαιώθηκε — σας έχει αποσταλεί ένα email επιβεβαίωσης.", + "assistant_error": "Λυπούμαστε — κάτι πήγε στραβά. Παρακλούμε χρησιμοποιήστε το παρακάτω ημερολόγιο.", + "assistant_disclosure": "Συνομιλείτε με έναν αυτόματο βοηθό, και όχι με άνθρωπο.", + "other": "άλλο", + "others": "άλλοι", + "list_separator": ", ", + "list_conjunction": " & ", + "language_switcher_aria": "Γλώσσα", + + "cookie_consent_aria": "Συναίνεση cookies", + "cookie_text": "Χρησιμοποιούμε cookies ανάλυσης για να κατανοήσουμε πώς χρησιμοποιείται αυτή η σελίδα κρατήσεων — ενεργοποιούνται μόνο εάν δώσετε τη συγκατάθεσή σας.", + "privacy_policy": "Πολιτική απορρήτου", + "decline": "Απόρριψη", + "accept": "Αποδοχή", + "privacy": "Ιδιωτικότητα", + "terms": "Όροι", + "cookie_settings": "Ρυθμίσεις cookies", + "prev_month_aria": "Προηγούμενος μήνας", + "next_month_aria": "Επόμενος μήνας", + "demo_public_label": "Δημόσια δοκιμή", + "demo_public_text": "τα δεδομένα που εμφανίζονται εδώ είναι εμφανή σε όλους και επαναφέρονται αυτόματα. Μην εισάγετε κάτι προσωπικό.", + "demo_view_source": "Προβολή κώδικα", + "powered_by": "Με την υποστήριξη του", + + "duration_min": "%d λεπτά", + "duration_hour_one": "1 ώρα", + "duration_hours": "%d ώρες", + "duration_hr_min": "%d ώ. %d λ.", + "location_video_meeting": "Συνάντηση μέσω βιντεοκλήσης", + "location_phone": "Τηλεφωνική κλήση", + "location_in_person": "Διά ζώσης", + "location_video_call": "Βιντεοκλήση", + + "manage_booking_title": "Διαχείριση κράτησης", + "link_expired_title": "Ο σύνδεσμος έχει λήξει ή δεν είναι έγκυρος", + "link_expired_text": "Αυτός ο σύνδεσμος διαχείρισης έχει λήξει ή δεν είναι πλέον έγκυρος. Παρακαλούμε ελέγξτε το email επιβεβαίωσης που έχετε λάβει για τον έγκρυρο σύνδεσμο, ή επικοινωνήστε με τον host για έναν νέο σύνδεσμο.", + "booking_already_cancelled_title": "Η κράτηση έχει ήδη ακυρωθεί", + "booking_already_cancelled_text": "Αυτή η κράτηση έχει ήδη ακυρωθεί. Για να κάνετε κράτηση για μια διαφορετική ώρα, επισκεφτείτε τη σελίδα με τις εκδηλώσεις", + "scheduled_for": "Προγραμματισμένο για", + "reschedule": "Επαναπρογραμματισμός", + "cancel_booking": "Ακύρωση κράτησης", + "select_a_date": "Επιλέξτε ημερομηνία", + "pick_day_hint": "Επιλέξτε μια μέρα από το ημερολόγιο.", + "confirm_reschedule_question": "Επιβεβαίωση αναπρογραμματισμού;", + "was_label": "Ήταν", + "now_label": "Τώρα", + "confirm_reschedule": "Επιβεβαίωση αναπρογραμματισμού", + "rescheduling": "Επαναπρογραμμάτισμός...", + "cancel_this_booking_question": "Ακύρωση της κράτησης;", + "cancel_booking_notice": "Η ακύρωση δεν μπορεί να αναιρεθεί. Ένα email ακύρωσης θα αποσταλεί σε εσάς και στον host.", + "reason_optional_label": "Αιτία (προαιρετικά)", + "reason_placeholder": "π.χ. σύγκρουση προγράμματος", + "yes_cancel_booking": "Ναι, ακύρωση κράτησης", + "cancelling": "Ακύρωση...", + "booking_rescheduled_title": "Η κράτηση επαναπρογραμματίστηκε", + "booking_rescheduled_prefix": "Η κράτησή σας έχει μεταφερθεί για ", + "booking_cancelled_title": "Η κράτηση ακυρώθηκε", + "booking_cancelled_text": "Η κράτησή σας έχει ακυρωθεί.", + "slot_no_longer_available_error": "Αυτή η ώρα δεν είναι πλέον διαθέσιμη. Παρακαλούμε επιλέξτε μια άλλη.", + "reschedule_failed_error": "Ο Επαναπρογραμμάτισμός απέτυχε. Παρακαλούμε δοκιμάστε ξανά.", + "already_cancelled_error": "Αυτή η κράτηση έχει ήδη ακυρωθεί.", + "cancellation_failed_error": "Η ακύρωση απέτυχε. Παρακαλούμε δοκιμάστε ξανά.", + + "dow_short_sun": "Κυρ", + "dow_short_mon": "Δευ", + "dow_short_tue": "Τρί", + "dow_short_wed": "Τετ", + "dow_short_thu": "Πέμ", + "dow_short_fri": "Παρ", + "dow_short_sat": "Σάβ", + "month_short_jan": "Ιαν", + "month_short_feb": "Φεβ", + "month_short_mar": "Μαρ", + "month_short_apr": "Απρ", + "month_short_may": "Μαΐ", + "month_short_jun": "Ιουν", + "month_short_jul": "Ιουλ", + "month_short_aug": "Αυγ", + "month_short_sep": "Σεπ", + "month_short_oct": "Οκτ", + "month_short_nov": "Νοε", + "month_short_dec": "Δεκ", + "clock_format": "12h", + "date_format": "%[1]s %[2]d %[3]s %[4]d", + + "email_greeting": "Γεια σας %s,", + "email_confirmed_lead": "Η κράτησή σας έχει επιβεβαιωθεί.", + "email_cancelled_lead": "Η κράτησή σας έχει ακυρωθεί.", + "email_rescheduled_lead": "Η κράτησή σας έχει επαναπρογραμματιστεί.", + "email_reminder_lead": "Σας υπενθυμίζουμε ότι η κράτησή σας πλησιάζει.", + "email_label_event": "Τύπος ραντεβού", + "email_label_with": "Με", + "email_label_start": "Αρχή", + "email_label_end": "Τέλος", + "email_label_when": "Πότε", + "email_label_location": "Τοποθεσία", + "email_label_reason": "Αιτία", + "email_label_was": "Ήταν", + "email_label_now": "Τώρα", + "email_add_to_calendar": "Προσθήκη στο ημερολόγιό σας:", + "email_add_to_calendar_updated": "Προσθήκη στο ημερολόγιό σας (ανανεωμένη ώρα):", + "email_calendar_google": "Google Calendar", + "email_calendar_outlook": "Outlook", + "email_booking_reference": "Κωδικός κράτησης: %s", + "email_manage_link_intro": "Για να επαναπρογραμματίσετε ή να ακυρώσετε την κράτησή σας, επισκεφτείτε:", + "email_manage_link_intro_reschedule": "Για να επαναπρογραμματίσετε ή να ακυρώσετε την κράτησή σας ξανά, επισκεφτείτε:", + "email_cancel_link_intro": "Για να ακυρώσετε, επισκεφτείτε:", + "email_rebook_intro": "Για να ξανακάνετε κράτηση, επισκεφτείτε:", + "email_manage_button": "Διαχείριση κράτησης", + "email_rebook_button": "Ξανακάντε κράτηση", + "email_subject_confirmed": "Η κράτηση επιβεβαιώθηκε: %s", + "email_subject_cancelled": "Η κράτηση ακυρώθηκε: %s", + "email_subject_rescheduled": "Η κράτηση επαναπρογραμματίστηκε: %s", + "email_subject_reminder": "Υπενθύμιση: %s πλησιάζει", + "email_booking_with": "Κράτηση με %s", + "email_manage_this_booking": "Διαχείριση αυτής της κράτησης:", + "calendar_event_summary": "%s με %s", + "calendar_event_booking_id": "Κωδικός κράτησης: %s", + + "err_booking_limit": "Έχετε τον μέγιστο επιτρεπτό αριθμό επερχόμενων κρατήσεων για αυτόν τον τύπο ραντεβού. Παρακαλούμε ακυρώστε μια υπάρχουσα κράτηση ή περιμένετε μέχρι κάποια να περάσει πριν ξανακάνετε κράτηση.", + "err_email_throttled": "Έχουν γίνει υπερβολικά πολλές κρατήσεις για αυτή τη διεύθυνση email πρόσφατα. Παρακαλούμε δοκιμάστε ξανά.", + "err_required_field": "Το υποχρεωτικό πεδίο %q δεν έχει συμπληρωθεί", + "err_required_checkbox": "%q πρέπει να έχει επιλεγεί", + "err_invalid_option": "μη έγκυρη επιλογή για %[1]q: Το %[2]q δεν είναι έγκυρη επιλογή", + + "assistant_unavailable": "Ο βοηθός κρατήσεων δεν είναι διαθέσιμος αυτή τη στιγμή - παρακαλούμε επιλέξτε μία ώρα από το παρακάτω ημερολόγιο.", + "assistant_trouble": "Λυπάμαι — αντιμετωπίζω κάποιο πρόβλημα αυτή τη στιγμή. Παρακαλούμε επιλέξτε μία ώρα από το παρακάτω ημερολόγιο.", + "assistant_iteration_cap": "Ας το κάνουμε απλά — Παρακαλούμε επιλέξτε μία ώρα από το παρακάτω ημερολόγιο..", + "assistant_status_slots": "Έλεγχος διαθεσιμότητας…", + "assistant_status_book": "Γίνεται κράτηση…", + "assistant_status_working": "Φόρτωση…", + "time_period": "Ώρα της ημέρας", + "time_morning": "Πρωί", + "time_afternoon": "Απόγευμα", + "time_evening": "Βράδυ", + "phone_call_number": "Τηλέφωνο (προαιρετικό, για τηλεφωνική κλήση)", + "calendar_degraded_notice": "Κάποιες πληροφορίες του ημερολογίου δεν μπορούσαν να φορτωθούν, επομένως η διαθεσιμότητα ενδέχεται να είανι ελλιπής.", + + "directory_book": "Κράτηση", + "directory_empty": "Δεν υπάρχει κάτι διαθέσιμο εδώ αυτή τη στιγμή.", + "directory_members": "Μέλη της ομάδας", + "directory_person_subtitle": "Κράτηση ώρα με τον/την %s", + "directory_team_subtitle": "Κράτηση ώρας με την ομάδα %s" +} From ad4e0b69137a71f4c3c1d81b00337c88b5b47d46 Mon Sep 17 00:00:00 2001 From: Minos Chatzidakis Date: Sun, 1 Nov 2026 16:58:09 +0200 Subject: [PATCH 183/250] Update internal/i18n/locales/el.json Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> --- internal/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json index a9e061a4..91a7e191 100644 --- a/internal/i18n/locales/el.json +++ b/internal/i18n/locales/el.json @@ -34,7 +34,7 @@ "times_shown_in": "Ζώνη ώρας ", "payment_received": "Η πληρωμή ολοκληρώθηκε", "payment_confirmed_sub": "Η κράτησή σας επιβεβαιώθηκε — σας έχει αποσταλεί ένα email επιβεβαίωσης.", - "assistant_error": "Λυπούμαστε — κάτι πήγε στραβά. Παρακλούμε χρησιμοποιήστε το παρακάτω ημερολόγιο.", + "assistant_error": "Λυπούμαστε — κάτι πήγε στραβά. Παρακαλούμε χρησιμοποιήστε το παρακάτω ημερολόγιο.", "assistant_disclosure": "Συνομιλείτε με έναν αυτόματο βοηθό, και όχι με άνθρωπο.", "other": "άλλο", "others": "άλλοι", From 85595077882fc872857f5a1126301bef7986341d Mon Sep 17 00:00:00 2001 From: Minos Chatzidakis Date: Sun, 1 Nov 2026 16:58:21 +0200 Subject: [PATCH 184/250] Update internal/i18n/locales/el.json Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> --- internal/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json index 91a7e191..b4c9b642 100644 --- a/internal/i18n/locales/el.json +++ b/internal/i18n/locales/el.json @@ -68,7 +68,7 @@ "manage_booking_title": "Διαχείριση κράτησης", "link_expired_title": "Ο σύνδεσμος έχει λήξει ή δεν είναι έγκυρος", - "link_expired_text": "Αυτός ο σύνδεσμος διαχείρισης έχει λήξει ή δεν είναι πλέον έγκυρος. Παρακαλούμε ελέγξτε το email επιβεβαίωσης που έχετε λάβει για τον έγκρυρο σύνδεσμο, ή επικοινωνήστε με τον host για έναν νέο σύνδεσμο.", + "link_expired_text": "Αυτός ο σύνδεσμος διαχείρισης έχει λήξει ή δεν είναι πλέον έγκυρος. Παρακαλούμε ελέγξτε το email επιβεβαίωσης που έχετε λάβει για τον έγκυρο σύνδεσμο, ή επικοινωνήστε με τον host για έναν νέο σύνδεσμο.", "booking_already_cancelled_title": "Η κράτηση έχει ήδη ακυρωθεί", "booking_already_cancelled_text": "Αυτή η κράτηση έχει ήδη ακυρωθεί. Για να κάνετε κράτηση για μια διαφορετική ώρα, επισκεφτείτε τη σελίδα με τις εκδηλώσεις", "scheduled_for": "Προγραμματισμένο για", From 4b9036ce4d042524d849cada435e1d77205b47f2 Mon Sep 17 00:00:00 2001 From: Minos Chatzidakis Date: Sun, 1 Nov 2026 16:58:44 +0200 Subject: [PATCH 185/250] Update internal/i18n/locales/el.json Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> --- internal/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json index b4c9b642..0343b110 100644 --- a/internal/i18n/locales/el.json +++ b/internal/i18n/locales/el.json @@ -80,7 +80,7 @@ "was_label": "Ήταν", "now_label": "Τώρα", "confirm_reschedule": "Επιβεβαίωση αναπρογραμματισμού", - "rescheduling": "Επαναπρογραμμάτισμός...", + "rescheduling": "Επαναπρογραμματισμός...", "cancel_this_booking_question": "Ακύρωση της κράτησης;", "cancel_booking_notice": "Η ακύρωση δεν μπορεί να αναιρεθεί. Ένα email ακύρωσης θα αποσταλεί σε εσάς και στον host.", "reason_optional_label": "Αιτία (προαιρετικά)", From a724c9d853c4c74b2a83ece0f1a170a6cdb6301f Mon Sep 17 00:00:00 2001 From: Minos Chatzidakis Date: Sun, 1 Nov 2026 16:58:51 +0200 Subject: [PATCH 186/250] Update internal/i18n/locales/el.json Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> --- internal/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json index 0343b110..6e4947fa 100644 --- a/internal/i18n/locales/el.json +++ b/internal/i18n/locales/el.json @@ -160,7 +160,7 @@ "assistant_unavailable": "Ο βοηθός κρατήσεων δεν είναι διαθέσιμος αυτή τη στιγμή - παρακαλούμε επιλέξτε μία ώρα από το παρακάτω ημερολόγιο.", "assistant_trouble": "Λυπάμαι — αντιμετωπίζω κάποιο πρόβλημα αυτή τη στιγμή. Παρακαλούμε επιλέξτε μία ώρα από το παρακάτω ημερολόγιο.", - "assistant_iteration_cap": "Ας το κάνουμε απλά — Παρακαλούμε επιλέξτε μία ώρα από το παρακάτω ημερολόγιο..", + "assistant_iteration_cap": "Ας το κάνουμε απλά — παρακαλούμε επιλέξτε μία ώρα από το παρακάτω ημερολόγιο.", "assistant_status_slots": "Έλεγχος διαθεσιμότητας…", "assistant_status_book": "Γίνεται κράτηση…", "assistant_status_working": "Φόρτωση…", From 4e23c8ad48f5e9890ebcef4d132277e0ac750544 Mon Sep 17 00:00:00 2001 From: Minos Chatzidakis Date: Sun, 1 Nov 2026 16:59:06 +0200 Subject: [PATCH 187/250] Update internal/i18n/locales/el.json Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> --- internal/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json index 6e4947fa..e05d8c86 100644 --- a/internal/i18n/locales/el.json +++ b/internal/i18n/locales/el.json @@ -92,7 +92,7 @@ "booking_cancelled_title": "Η κράτηση ακυρώθηκε", "booking_cancelled_text": "Η κράτησή σας έχει ακυρωθεί.", "slot_no_longer_available_error": "Αυτή η ώρα δεν είναι πλέον διαθέσιμη. Παρακαλούμε επιλέξτε μια άλλη.", - "reschedule_failed_error": "Ο Επαναπρογραμμάτισμός απέτυχε. Παρακαλούμε δοκιμάστε ξανά.", + "reschedule_failed_error": "Ο επαναπρογραμματισμός απέτυχε. Παρακαλούμε δοκιμάστε ξανά.", "already_cancelled_error": "Αυτή η κράτηση έχει ήδη ακυρωθεί.", "cancellation_failed_error": "Η ακύρωση απέτυχε. Παρακαλούμε δοκιμάστε ξανά.", From 7742ec03001b70ad7b1d4f3c92620e7b28c6bf1d Mon Sep 17 00:00:00 2001 From: Minos Chatzidakis Date: Sun, 1 Nov 2026 16:59:18 +0200 Subject: [PATCH 188/250] Update internal/i18n/locales/el.json Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> --- internal/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json index e05d8c86..c472a803 100644 --- a/internal/i18n/locales/el.json +++ b/internal/i18n/locales/el.json @@ -169,7 +169,7 @@ "time_afternoon": "Απόγευμα", "time_evening": "Βράδυ", "phone_call_number": "Τηλέφωνο (προαιρετικό, για τηλεφωνική κλήση)", - "calendar_degraded_notice": "Κάποιες πληροφορίες του ημερολογίου δεν μπορούσαν να φορτωθούν, επομένως η διαθεσιμότητα ενδέχεται να είανι ελλιπής.", + "calendar_degraded_notice": "Κάποιες πληροφορίες του ημερολογίου δεν μπορούσαν να φορτωθούν, επομένως η διαθεσιμότητα ενδέχεται να είναι ελλιπής.", "directory_book": "Κράτηση", "directory_empty": "Δεν υπάρχει κάτι διαθέσιμο εδώ αυτή τη στιγμή.", From e375880de5018ae85080bd50f7970e835499414c Mon Sep 17 00:00:00 2001 From: Minos Chatzidakis Date: Sun, 1 Nov 2026 16:59:31 +0200 Subject: [PATCH 189/250] Update internal/i18n/locales/el.json Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> --- internal/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/i18n/locales/el.json b/internal/i18n/locales/el.json index c472a803..e81cfc1f 100644 --- a/internal/i18n/locales/el.json +++ b/internal/i18n/locales/el.json @@ -174,6 +174,6 @@ "directory_book": "Κράτηση", "directory_empty": "Δεν υπάρχει κάτι διαθέσιμο εδώ αυτή τη στιγμή.", "directory_members": "Μέλη της ομάδας", - "directory_person_subtitle": "Κράτηση ώρα με τον/την %s", + "directory_person_subtitle": "Κράτηση ώρας με τον/την %s", "directory_team_subtitle": "Κράτηση ώρας με την ομάδα %s" } From 12dab50f1a6e3c1fe69e703849a4b4f5f52c015e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:37:39 +0000 Subject: [PATCH 190/250] chore(deps): bump golang from 1.27.2-alpine to 1.27.3-alpine Bumps golang from 1.27.2-alpine to 1.27.3-alpine. --- updated-dependencies: - dependency-name: golang dependency-version: 1.27.3-alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ddf12844..af6f0f6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN pnpm build # target arch; there is no reason for this stage to run under QEMU. Running it # emulated is what made a multi-arch build stall: the arm64 leg spent its time # interpreting the compiler instead of compiling. -FROM --platform=$BUILDPLATFORM golang:1.27.2-alpine AS builder +FROM --platform=$BUILDPLATFORM golang:1.27.3-alpine AS builder RUN apk add --no-cache ca-certificates wget From fb3a6110a17e2b8b0ab77af34a9d8d5fbcbd3adf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:37:50 +0000 Subject: [PATCH 191/250] chore(deps): bump modernc.org/sqlite from 1.60.1 to 1.61.0 Bumps [modernc.org/sqlite](https://gitlab.com/cznic/sqlite) from 1.60.1 to 1.61.0. - [Release notes](https://gitlab.com/cznic/sqlite/tags) - [Changelog](https://gitlab.com/cznic/sqlite/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/cznic/sqlite/compare/v1.60.1...v1.61.0) --- updated-dependencies: - dependency-name: modernc.org/sqlite dependency-version: 1.61.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index 062599c0..c9b12f02 100644 --- a/go.mod +++ b/go.mod @@ -14,27 +14,27 @@ require ( golang.org/x/image v0.46.0 golang.org/x/oauth2 v0.37.0 golang.org/x/text v0.42.0 - modernc.org/sqlite v1.60.1 + modernc.org/sqlite v1.61.0 ) require ( cloud.google.com/go/compute/metadata v0.3.0 // indirect - github.com/dustin/go-humanize v1.0.1 // indirect + github.com/dustin/go-humanize v1.1.0 // indirect github.com/google/jsonschema-go v0.4.3 // indirect github.com/google/uuid v1.6.0 // indirect github.com/mattn/go-isatty v0.0.24 // indirect github.com/mfridman/interpolate v0.0.2 // indirect - github.com/ncruces/go-strftime v1.0.0 // indirect + github.com/ncruces/go-strftime v1.1.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/segmentio/asm v1.2.1 // indirect github.com/segmentio/encoding v0.5.4 // indirect github.com/sethvargo/go-retry v0.4.0 // indirect github.com/yosida95/uritemplate/v3 v3.0.2 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sync v0.23.0 // indirect - golang.org/x/sys v0.48.0 // indirect + golang.org/x/sync v0.24.0 // indirect + golang.org/x/sys v0.49.0 // indirect golang.org/x/time v0.15.0 // indirect - modernc.org/libc v1.77.1 // indirect + modernc.org/libc v1.79.0 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.12.1 // indirect ) diff --git a/go.sum b/go.sum index 46e34909..2ce055db 100644 --- a/go.sum +++ b/go.sum @@ -2,16 +2,16 @@ cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2Qx cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/dustin/go-humanize v1.1.0 h1:dbKTrvD0klcbBV/h4AWJdMuZogJACoMlvWIWZ5b2xWg= +github.com/dustin/go-humanize v1.1.0/go.mod h1:hc1CvRkJMsgxqjmjMQF3QNRAZBwY8AXBAzKYoSX9sFI= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/jsonschema-go v0.4.3 h1:/DBOLZTfDow7pe2GmaJNhltueGTtDKICi8V8p+DQPd0= github.com/google/jsonschema-go v0.4.3/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE= -github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 h1:LMLX+LgTNWpfvCBdFebv6EsYotImrt/Ppc5cXIriCSo= -github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk= +github.com/google/pprof v0.0.0-20261016150608-1facf8f91b50 h1:PlNWJRxu5APSV0pWqfIsZ0qt9OOGHSWfZQ4zvx+WgWs= +github.com/google/pprof v0.0.0-20261016150608-1facf8f91b50/go.mod h1:yUo1AMMpsPIDFGuwDK8nLcf8+vvAd5l2O6JDZ6hpwrM= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= @@ -24,8 +24,8 @@ github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6B github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= github.com/modelcontextprotocol/go-sdk v1.8.0 h1:KIvahhYqwtbeniWVPs3TcXEA7b8jEtwfBpOTAI+Urx4= github.com/modelcontextprotocol/go-sdk v1.8.0/go.mod h1:dL7u98E/zjJTGzEq+j30jQ8K2k1mb6LeAH4inEcSGts= -github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= -github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= +github.com/ncruces/go-strftime v1.1.0 h1:vtPmPWMkb539RGV9WpWT9EwJGvrOCKvMNI4obWL47Hk= +github.com/ncruces/go-strftime v1.1.0/go.mod h1:yVaq7iwCN09vHRrKBrrflXT0M9tTMG2KmZ9Fj7xeG/g= github.com/pressly/goose/v3 v3.28.0 h1:D2M+iL31GmpZxSHOhX8mqyqAT3CXnokUmm0eKoSP+Vc= github.com/pressly/goose/v3 v3.28.0/go.mod h1:v26MOuB8bL3kzzrt3Vqhb3R0PRVsl8hFQKdrht/L6Rk= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= @@ -51,35 +51,35 @@ golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZ golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.46.0 h1:b1+oYj0Jbp6K5MDT4i4/eZpYlk3V8SJhhDKh6LBHAyQ= golang.org/x/image v0.46.0/go.mod h1:3B3W05VGVQyuXucLINLjXKrqISASfi4Xj+iCVkLMwew= -golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= -golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= +golang.org/x/mod v0.42.0 h1:ICeL3t2L30ljSPHHxDnR4fqVcBt/zR2zJAb9juavmQg= +golang.org/x/mod v0.42.0/go.mod h1:u5fzIrRInkL8MaO1cbRkUHT64v303YIT5KEqpNr7jRs= golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= -golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= -golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= -golang.org/x/tools v0.50.0 h1:c2ifzfcuY7L90lZ2aKd8S4K2NpASF08SZx9ZuJkHmSU= -golang.org/x/tools v0.50.0/go.mod h1:7ulVMw3831Mwi5EZD6RomGyffr4VFjuNYXf2BbCEAV0= -modernc.org/cc/v4 v4.29.7 h1:q+NXGJ0bK3b4TXFYQQVr9pYETGnmwFWkrUzJnMya/Tg= -modernc.org/cc/v4 v4.29.7/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= -modernc.org/ccgo/v4 v4.36.1 h1:ZNIUZAryN0UgnJwtyxrdEzcFc3yD4Cu4AzjfPXsLsIE= -modernc.org/ccgo/v4 v4.36.1/go.mod h1:rrtGc2QkS239nYb/mQNuBMyjq3/y3ZXWbBjPoV3wqzA= +golang.org/x/tools v0.52.0 h1:ryxg4U63oaUYk7uOLTF37n43f4qgtGvqV4Ioit1BaEs= +golang.org/x/tools v0.52.0/go.mod h1:ItcP5UNaVGG+Yc4eIYmaFLNJ4soEopkx5Y2d4lcEurs= +modernc.org/cc/v4 v4.30.3 h1:aDq8gIX1X7+VFgO/JYYji6pLWL2H4tv3g8WatT3KCys= +modernc.org/cc/v4 v4.30.3/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= +modernc.org/ccgo/v4 v4.37.0 h1:BAuJCUtIHIxFIYaFhqXIw5YaoMBlNCUlFovejHfMip4= +modernc.org/ccgo/v4 v4.37.0/go.mod h1:/8627VhwWtAbqUXmPORxFQU5SgLrAx2jl9seLw9GBhY= modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= -modernc.org/gc/v3 v3.1.5 h1:21ldfPfRYE31Tb7B3mwAK8gy1AxP4+dKjrOQPfqakoc= -modernc.org/gc/v3 v3.1.5/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/gc/v3 v3.2.0 h1:/Y3LGDMQaoYf55PebP1qsZ5FDGgAZyG1RYKEHeQzh1o= +modernc.org/gc/v3 v3.2.0/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= -modernc.org/libc v1.77.1 h1:Ct8j47QtiZ1Enj2DtFXQtUqrPCAjdCmPjtCuvrYQ0Hs= -modernc.org/libc v1.77.1/go.mod h1:87/pZ4L6nD1zqW4nItuS12YO7hN1igAah34xjnQo/W0= +modernc.org/libc v1.79.0 h1:9Dvvv++bAMSkSuBzuOFAatbTV5OIoq6Y6FohmD3e7q8= +modernc.org/libc v1.79.0/go.mod h1:uT3kR61NsbeKJSLqq83GJwSnZMVLlSjyAz4DfTaBy1M= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= modernc.org/memory v1.12.1 h1:nFMiWrpStgZczNl6XI9GnIk/rWhYIyHGUaR04pGbp9g= @@ -88,8 +88,8 @@ modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg= modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.60.1 h1:/blz53O951KWFOso4QQvEs/Fq6cDBKLtMVrYNSeJVKw= -modernc.org/sqlite v1.60.1/go.mod h1:1dIoEagfDE72QytD5scH1lxARtaUgKgHC/NuApA27r0= +modernc.org/sqlite v1.61.0 h1:sQi63oLQ9uquAUA4CzOisH35Q3pEszkPBuHM0tFL8CY= +modernc.org/sqlite v1.61.0/go.mod h1:f4gr5tbpx2umklaT/QVtbi/50hNdM+4ng+2zMo8KXJ0= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= From a26725991f588cb252725dd82825f780c708a0ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:37:57 +0000 Subject: [PATCH 192/250] chore(deps): bump actions/cache from 4 to 6 Bumps [actions/cache](https://github.com/actions/cache) from 4 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ns8-module.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ns8-module.yml b/.github/workflows/ns8-module.yml index b31ffda4..7879ae16 100644 --- a/.github/workflows/ns8-module.yml +++ b/.github/workflows/ns8-module.yml @@ -196,7 +196,7 @@ jobs: # The UI build is the slow part; cache the dependency tree the way the # upstream NS8 publish workflow does, so branch and PR runs do not # re-download the whole Vue/Carbon tree every time. - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: packaging/ns8/ui/node_modules key: "yarn-${{ hashFiles('packaging/ns8/ui/yarn.lock') }}" From 231a4a25580b8a6faa07286d08ba0efcb7995c97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:38:09 +0000 Subject: [PATCH 193/250] chore(deps-dev): bump svelte from 5.57.0 to 5.57.3 in /frontend Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 5.57.0 to 5.57.3. - [Release notes](https://github.com/sveltejs/svelte/releases) - [Changelog](https://github.com/sveltejs/svelte/blob/main/packages/svelte/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte/commits/svelte@5.57.3/packages/svelte) --- updated-dependencies: - dependency-name: svelte dependency-version: 5.57.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 212 +++++++++++++++++++++------------------- 2 files changed, 111 insertions(+), 103 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 8036e0b7..1acaf7f1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -37,7 +37,7 @@ "bits-ui": "^2.19.5", "playwright": "^1.61.0", "shadcn-svelte": "1.3.0", - "svelte": "^5.57.0", + "svelte": "^5.57.3", "svelte-check": "^4.7.1", "svelte-sonner": "^1.1.1", "tailwind-variants": "^3.2.2", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index ce39cc4b..6f9ae391 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -26,16 +26,16 @@ importers: version: 3.12.4 '@lucide/svelte': specifier: ^1.54.0 - version: 1.54.0(svelte@5.57.0) + version: 1.54.0(svelte@5.57.3) '@sveltejs/adapter-static': specifier: ^3.0.10 - version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))) + version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))) '@sveltejs/kit': specifier: ^2.70.2 - version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) + version: 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) '@sveltejs/vite-plugin-svelte': specifier: ^7.1.2 - version: 7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) + version: 7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) '@tailwindcss/vite': specifier: ^4.3.1 version: 4.3.1(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) @@ -50,22 +50,22 @@ importers: version: 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11) bits-ui: specifier: ^2.19.5 - version: 2.19.5(@internationalized/date@3.12.4)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0) + version: 2.19.5(@internationalized/date@3.12.4)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3) playwright: specifier: ^1.61.0 version: 1.61.0 shadcn-svelte: specifier: 1.3.0 - version: 1.3.0(svelte@5.57.0) + version: 1.3.0(svelte@5.57.3) svelte: - specifier: ^5.57.0 - version: 5.57.0 + specifier: ^5.57.3 + version: 5.57.3 svelte-check: specifier: ^4.7.1 - version: 4.7.1(picomatch@4.0.7)(svelte@5.57.0)(typescript@5.9.3) + version: 4.7.1(picomatch@4.0.7)(svelte@5.57.3)(typescript@5.9.3) svelte-sonner: specifier: ^1.1.1 - version: 1.1.1(svelte@5.57.0) + version: 1.1.1(svelte@5.57.3) tailwind-variants: specifier: ^3.2.2 version: 3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.3) @@ -86,7 +86,7 @@ importers: version: 4.1.11(@types/node@26.6.5)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) vitest-browser-svelte: specifier: ^2.1.1 - version: 2.1.1(svelte@5.57.0)(vitest@4.1.11) + version: 2.1.1(svelte@5.57.3)(vitest@4.1.11) packages: @@ -102,12 +102,12 @@ packages: '@floating-ui/utils@0.2.12': resolution: {integrity: sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==} - '@inquirer/ansi@2.0.9': - resolution: {integrity: sha512-0Ywt3S8tqM6TWUcsRlBFQ1x+X3/o8kktX0ZiKAnByYb9GFDknnOhse1PVtfiD2BXPI8ar+BWx9PV9R0lQIcygw==} + '@inquirer/ansi@2.0.10': + resolution: {integrity: sha512-dwrc+1aqVZpHNkNDswXGtn1typ+Pxpo5FHZRyBw1le7onEJUkPUkYOY1FIFC1LvFMYUqqLuWBwElhAmencL7MQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/confirm@6.3.3': - resolution: {integrity: sha512-ImOBgpl/sJTFp8naeSkNu4S0Sf8F8pxv3/CUx+LoBAdQvCVqFz6rSB2A/oZYsJge3+yphbEDxEkfaRNYq1OU0A==} + '@inquirer/confirm@6.3.5': + resolution: {integrity: sha512-BJ59BOyURiZiAxdr9AuRu38/k+rV+DcTIM2fUF/c/BXrab6H8zMZTTOl3LgkSJH96Xob2vOJxDiBkHiz32Xx2w==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -115,8 +115,8 @@ packages: '@types/node': optional: true - '@inquirer/core@12.0.4': - resolution: {integrity: sha512-M5fB67y7jPObI45vhD82RskWwCSm0scOvenV/I6K8tIi2gfr9DXqQqJ+iw+Wi6SgapikdOiJibYzz1gW47fsDg==} + '@inquirer/core@12.0.6': + resolution: {integrity: sha512-5yxn2LsJ8Tu4ei2a+yNkmFRhM/cb+JMEsEs/AW6CCOnBnpMy4IjYiPMFyHtYq8weOmlTyqqCx40y0DsD7OsEPw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -124,12 +124,12 @@ packages: '@types/node': optional: true - '@inquirer/figures@2.0.9': - resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} + '@inquirer/figures@2.0.10': + resolution: {integrity: sha512-51elrUJV3jZpvD0ygz8+U10Kc6+Lzqln+/tYmnbhy6jo5oXpE6hMCcv+OTBC0enwJXsb3JIuT3VtEinRNCSK2A==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/type@4.2.0': - resolution: {integrity: sha512-2rnHX8RPo4glJYqnFc/v3nQeIhDcjyRRyaT7MGcfL/8xv/8K03SXYoA2tX06WVSKywWOE/ncbG3dtuzLjR5TCQ==} + '@inquirer/type@4.2.1': + resolution: {integrity: sha512-lDkPsnv5M5CcYB2T1qTc3dobNTPkVr4DU3Ic2Q6SW8/qVRHgvzdRdmVZ6YqG9Ag1aJTeMsLU0s0WPRh3CZWDQQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -439,12 +439,15 @@ packages: '@types/deep-eql@4.0.2': resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==} - '@types/estree@1.0.9': - resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} + '@types/estree@1.0.10': + resolution: {integrity: sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==} '@types/node@26.6.5': resolution: {integrity: sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==} + '@types/node@26.6.6': + resolution: {integrity: sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==} + '@types/set-cookie-parser@2.4.10': resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} @@ -496,8 +499,8 @@ packages: engines: {node: '>=0.4.0'} hasBin: true - acorn@8.18.0: - resolution: {integrity: sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==} + acorn@8.19.0: + resolution: {integrity: sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==} engines: {node: '>=0.4.0'} hasBin: true @@ -588,8 +591,8 @@ packages: devalue@5.8.1: resolution: {integrity: sha512-4CXDYRBGqN+57wVJkuXBYmpAVUSg3L6JAQa/DFqm238G73E1wuyc/JhGQJzN7vUf/CMphYau2zXbfWzDR5aTEw==} - devalue@5.9.2: - resolution: {integrity: sha512-po4PAY5c53tw5XMocSnf8A/5OHhbbUftpr93aEN6BBoAdntUmK7vu7wOATqvt7cXO7m1Cl4gMVn6p7n6n4mj0w==} + devalue@5.9.4: + resolution: {integrity: sha512-sPAT4pztbu6586/hrhOnMKS17IJrvg12mXiSPSS3W5qDeN2RGgvZ0diZCm31dBbnevfVmujNO3IM2wrS4Y2Rhg==} emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -608,8 +611,8 @@ packages: esm-env@1.2.2: resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==} - esrap@2.3.7: - resolution: {integrity: sha512-n2nf7fZR3c9yXf0BPEuHuXqT+KW0SJVj4cN5FMEkpCZ3scLjOQWpiccyCxVzCC2q1wubTghuEGzngJY/7Ah0Ow==} + esrap@2.4.0: + resolution: {integrity: sha512-CQPcneEHw/czj32uwQC52nYnax8H4SXt25FCM+LIwGZ49cMIxpOj3bP8wmzcI+Z0HIy5KkClaPhRLfCySzwHPA==} peerDependencies: '@typescript-eslint/types': ^8.2.0 peerDependenciesMeta: @@ -953,8 +956,8 @@ packages: set-cookie-parser@3.1.0: resolution: {integrity: sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==} - set-cookie-parser@3.1.3: - resolution: {integrity: sha512-xletSdAI5efyVJjsatBbzDkXl3M/Zmad3xfnQe7ZXuBB0yNwW7C2WFsNGjdRNfZunmNHQuX79xs/ACMTLCdcew==} + set-cookie-parser@3.2.1: + resolution: {integrity: sha512-Npd1Pt+4zb3BrSZDPd2qFwRpS6b1EUEasRrO8xS0zMJi0fApXXK5YuzP0minyJnxwnFHoVoJwA55q0A0cu63gQ==} shadcn-svelte@1.3.0: resolution: {integrity: sha512-Pd4ICWTkTks/b2YU4c9vF2XsX1x5HFPRl5bKszS1LcnWS83x+7T4WiIvbWz8Qh9knkcGZ+SCz1+Dmhdq+AYooA==} @@ -1020,8 +1023,8 @@ packages: peerDependencies: svelte: ^5.30.2 - svelte@5.57.0: - resolution: {integrity: sha512-NdbDn7fl4be1ViUG0oq/lvG6OZy3oENolV2ONjiqqsfVoeAfzaQAKUcEX3MrQod/Bebv1PgwET9rfXhgn9s4Kg==} + svelte@5.57.3: + resolution: {integrity: sha512-5mAftM3SoDV9X0zdF386F9p2pv8iKOwi/KfBS1XnBAkVCKFzVOLHUoa8iGWAt4buoicLmyWVRpuuD5wplXOQsg==} engines: {node: '>=18'} tabbable@6.5.0: @@ -1069,11 +1072,11 @@ packages: resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} - tldts-core@7.4.18: - resolution: {integrity: sha512-KI2PKvCmvQI/xD6ypPqkU0i7oxNXR/O58RLRaHR4svsgVUQ2JE/XC8BtMbG6PSehD27I8sZJRcC1ASnCy6lp3g==} + tldts-core@7.4.20: + resolution: {integrity: sha512-C630TWXZCZmLq0F2bW4QqwnaaxCQ/svpAqvJwnC4JvgEM5ohhBnGsEzTLSOXcN+xjz+kEaHS5uoWIw2klnqd0A==} - tldts@7.4.18: - resolution: {integrity: sha512-somxA8xKAUzlAxl0TX/jMSYIbRNFIVGnI96pVGJPeMc5BsHmfVXn6mOJT6U++ELnl04eGfzpfcEuZe8WiASkXg==} + tldts@7.4.19: + resolution: {integrity: sha512-48dH6aSpQnpbzDUc4vIQZ1VjB8tkK+e8c1yx05/SZK+rkssgjEOlxDd/yU8/a4vGYQ9vRgJr9dwMq9TJ0b3X2Q==} hasBin: true totalist@3.0.1: @@ -1254,22 +1257,22 @@ snapshots: '@floating-ui/utils@0.2.12': {} - '@inquirer/ansi@2.0.9': + '@inquirer/ansi@2.0.10': optional: true - '@inquirer/confirm@6.3.3(@types/node@26.6.5)': + '@inquirer/confirm@6.3.5(@types/node@26.6.5)': dependencies: - '@inquirer/core': 12.0.4(@types/node@26.6.5) - '@inquirer/type': 4.2.0(@types/node@26.6.5) + '@inquirer/core': 12.0.6(@types/node@26.6.5) + '@inquirer/type': 4.2.1(@types/node@26.6.5) optionalDependencies: '@types/node': 26.6.5 optional: true - '@inquirer/core@12.0.4(@types/node@26.6.5)': + '@inquirer/core@12.0.6(@types/node@26.6.5)': dependencies: - '@inquirer/ansi': 2.0.9 - '@inquirer/figures': 2.0.9 - '@inquirer/type': 4.2.0(@types/node@26.6.5) + '@inquirer/ansi': 2.0.10 + '@inquirer/figures': 2.0.10 + '@inquirer/type': 4.2.1(@types/node@26.6.5) cli-width: 4.1.0 fast-wrap-ansi: 0.2.2 mute-stream: 3.0.0 @@ -1278,10 +1281,10 @@ snapshots: '@types/node': 26.6.5 optional: true - '@inquirer/figures@2.0.9': + '@inquirer/figures@2.0.10': optional: true - '@inquirer/type@4.2.0(@types/node@26.6.5)': + '@inquirer/type@4.2.1(@types/node@26.6.5)': optionalDependencies: '@types/node': 26.6.5 optional: true @@ -1309,9 +1312,9 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.6.0 - '@lucide/svelte@1.54.0(svelte@5.57.0)': + '@lucide/svelte@1.54.0(svelte@5.57.3)': dependencies: - svelte: 5.57.0 + svelte: 5.57.3 '@mswjs/interceptors@0.41.9': dependencies: @@ -1395,19 +1398,19 @@ snapshots: dependencies: acorn: 8.17.0 - '@sveltejs/acorn-typescript@1.0.13(acorn@8.18.0)': + '@sveltejs/acorn-typescript@1.0.13(acorn@8.19.0)': dependencies: - acorn: 8.18.0 + acorn: 8.19.0 - '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))': + '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))': dependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) - '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))': + '@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))': dependencies: '@standard-schema/spec': 1.1.0 '@sveltejs/acorn-typescript': 1.0.10(acorn@8.17.0) - '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) + '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) '@types/cookie': 0.6.0 acorn: 8.17.0 cookie: 0.7.2 @@ -1418,19 +1421,19 @@ snapshots: mrmime: 2.0.1 set-cookie-parser: 3.1.0 sirv: 3.0.2 - svelte: 5.57.0 + svelte: 5.57.3 vite: 8.3.0(@types/node@26.6.5)(jiti@2.7.0) optionalDependencies: typescript: 5.9.3 '@sveltejs/load-config@0.2.0': {} - '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))': + '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))': dependencies: deepmerge: 4.3.1 magic-string: 0.30.21 obug: 2.1.3 - svelte: 5.57.0 + svelte: 5.57.3 vite: 8.3.0(@types/node@26.6.5)(jiti@2.7.0) vitefu: 1.1.3(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) @@ -1506,9 +1509,9 @@ snapshots: tailwindcss: 4.3.1 vite: 8.3.0(@types/node@26.6.5)(jiti@2.7.0) - '@testing-library/svelte-core@1.0.0(svelte@5.57.0)': + '@testing-library/svelte-core@1.0.0(svelte@5.57.3)': dependencies: - svelte: 5.57.0 + svelte: 5.57.3 '@types/chai@5.2.3': dependencies: @@ -1519,15 +1522,20 @@ snapshots: '@types/deep-eql@4.0.2': {} - '@types/estree@1.0.9': {} + '@types/estree@1.0.10': {} '@types/node@26.6.5': dependencies: undici-types: 8.9.0 + '@types/node@26.6.6': + dependencies: + undici-types: 8.9.0 + optional: true + '@types/set-cookie-parser@2.4.10': dependencies: - '@types/node': 26.6.5 + '@types/node': 26.6.6 optional: true '@types/statuses@2.0.6': @@ -1607,7 +1615,7 @@ snapshots: acorn@8.17.0: {} - acorn@8.18.0: {} + acorn@8.19.0: {} ansi-regex@5.0.1: optional: true @@ -1623,15 +1631,15 @@ snapshots: axobject-query@4.1.0: {} - bits-ui@2.19.5(@internationalized/date@3.12.4)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0): + bits-ui@2.19.5(@internationalized/date@3.12.4)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3): dependencies: '@floating-ui/core': 1.8.0 '@floating-ui/dom': 1.8.0 '@internationalized/date': 3.12.4 esm-env: 1.2.2 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0) - svelte: 5.57.0 - svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3) + svelte: 5.57.3 + svelte-toolbelt: 0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3) tabbable: 6.5.0 transitivePeerDependencies: - '@sveltejs/kit' @@ -1681,7 +1689,7 @@ snapshots: devalue@5.8.1: {} - devalue@5.9.2: {} + devalue@5.9.4: {} emoji-regex@8.0.0: optional: true @@ -1698,13 +1706,13 @@ snapshots: esm-env@1.2.2: {} - esrap@2.3.7: + esrap@2.4.0: dependencies: '@jridgewell/sourcemap-codec': 1.6.0 estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.9 + '@types/estree': 1.0.10 expect-type@1.3.0: {} @@ -1742,7 +1750,7 @@ snapshots: headers-polyfill@5.0.1: dependencies: '@types/set-cookie-parser': 2.4.10 - set-cookie-parser: 3.1.3 + set-cookie-parser: 3.2.1 optional: true inline-style-parser@0.2.7: {} @@ -1755,7 +1763,7 @@ snapshots: is-reference@3.0.3: dependencies: - '@types/estree': 1.0.9 + '@types/estree': 1.0.10 jiti@2.7.0: {} @@ -1873,7 +1881,7 @@ snapshots: msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3): dependencies: - '@inquirer/confirm': 6.3.3(@types/node@26.6.5) + '@inquirer/confirm': 6.3.5(@types/node@26.6.5) '@mswjs/interceptors': 0.41.9 '@open-draft/deferred-promise': 3.0.0 '@types/statuses': 2.0.6 @@ -1965,19 +1973,19 @@ snapshots: '@rolldown/binding-win32-arm64-msvc': 1.2.9 '@rolldown/binding-win32-x64-msvc': 1.2.9 - runed@0.28.0(svelte@5.57.0): + runed@0.28.0(svelte@5.57.3): dependencies: esm-env: 1.2.2 - svelte: 5.57.0 + svelte: 5.57.3 - runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0): + runed@0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3): dependencies: dequal: 2.0.3 esm-env: 1.2.2 lz-string: 1.5.0 - svelte: 5.57.0 + svelte: 5.57.3 optionalDependencies: - '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) + '@sveltejs/kit': 2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) sade@1.8.1: dependencies: @@ -1985,15 +1993,15 @@ snapshots: set-cookie-parser@3.1.0: {} - set-cookie-parser@3.1.3: + set-cookie-parser@3.2.1: optional: true - shadcn-svelte@1.3.0(svelte@5.57.0): + shadcn-svelte@1.3.0(svelte@5.57.3): dependencies: commander: 14.0.3 node-fetch-native: 1.6.7 postcss: 8.5.28 - svelte: 5.57.0 + svelte: 5.57.3 tailwind-merge: 3.6.0 siginfo@2.0.0: {} @@ -2035,7 +2043,7 @@ snapshots: dependencies: inline-style-parser: 0.2.7 - svelte-check@4.7.1(picomatch@4.0.7)(svelte@5.57.0)(typescript@5.9.3): + svelte-check@4.7.1(picomatch@4.0.7)(svelte@5.57.3)(typescript@5.9.3): dependencies: '@jridgewell/trace-mapping': 0.3.31 '@sveltejs/load-config': 0.2.0 @@ -2043,38 +2051,38 @@ snapshots: fdir: 6.5.0(picomatch@4.0.7) picocolors: 1.1.1 sade: 1.8.1 - svelte: 5.57.0 + svelte: 5.57.3 typescript: 5.9.3 transitivePeerDependencies: - picomatch - svelte-sonner@1.1.1(svelte@5.57.0): + svelte-sonner@1.1.1(svelte@5.57.3): dependencies: - runed: 0.28.0(svelte@5.57.0) - svelte: 5.57.0 + runed: 0.28.0(svelte@5.57.3) + svelte: 5.57.3 - svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0): + svelte-toolbelt@0.10.6(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3): dependencies: clsx: 2.1.1 - runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.0) + runed: 0.35.1(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3) style-to-object: 1.0.14 - svelte: 5.57.0 + svelte: 5.57.3 transitivePeerDependencies: - '@sveltejs/kit' - svelte@5.57.0: + svelte@5.57.3: dependencies: '@jridgewell/remapping': 2.3.5 '@jridgewell/sourcemap-codec': 1.6.0 - '@sveltejs/acorn-typescript': 1.0.13(acorn@8.18.0) - '@types/estree': 1.0.9 - acorn: 8.18.0 + '@sveltejs/acorn-typescript': 1.0.13(acorn@8.19.0) + '@types/estree': 1.0.10 + acorn: 8.19.0 aria-query: 5.3.1 axobject-query: 4.1.0 clsx: 2.1.1 - devalue: 5.9.2 + devalue: 5.9.4 esm-env: 1.2.2 - esrap: 2.3.7 + esrap: 2.4.0 is-reference: 3.0.3 locate-character: 3.0.0 magic-string: 0.30.21 @@ -2112,19 +2120,19 @@ snapshots: tinyrainbow@3.1.0: {} - tldts-core@7.4.18: + tldts-core@7.4.20: optional: true - tldts@7.4.18: + tldts@7.4.19: dependencies: - tldts-core: 7.4.18 + tldts-core: 7.4.20 optional: true totalist@3.0.1: {} tough-cookie@6.0.2: dependencies: - tldts: 7.4.18 + tldts: 7.4.19 optional: true tslib@2.8.1: {} @@ -2159,10 +2167,10 @@ snapshots: optionalDependencies: vite: 8.3.0(@types/node@26.6.5)(jiti@2.7.0) - vitest-browser-svelte@2.1.1(svelte@5.57.0)(vitest@4.1.11): + vitest-browser-svelte@2.1.1(svelte@5.57.3)(vitest@4.1.11): dependencies: - '@testing-library/svelte-core': 1.0.0(svelte@5.57.0) - svelte: 5.57.0 + '@testing-library/svelte-core': 1.0.0(svelte@5.57.3) + svelte: 5.57.3 vitest: 4.1.11(@types/node@26.6.5)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) vitest@4.1.11(@types/node@26.6.5)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)): From ba23e65cbf913289ee06017f7e1da0d8b9d067d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:38:12 +0000 Subject: [PATCH 194/250] chore(deps): bump actions/setup-go from 5 to 7 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 7. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 76e44df2..fe84ce5a 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -91,7 +91,7 @@ jobs: working-directory: frontend run: pnpm build - - uses: actions/setup-go@v5 + - uses: actions/setup-go@v7 with: go-version-file: go.mod cache: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c68eb835..5d6bfc1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: working-directory: frontend run: pnpm build - - uses: actions/setup-go@v5 + - uses: actions/setup-go@v7 with: go-version-file: go.mod cache: true From 44aa02b94ab4302ea40f3698b2ec0ceac9e2fc4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:39:43 +0000 Subject: [PATCH 195/250] chore(deps): bump github/codeql-action from 3 to 4 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v3...v4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 76e44df2..5f9749a4 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -48,7 +48,7 @@ jobs: path: results.sarif retention-days: 30 - - uses: github/codeql-action/upload-sarif@v3 + - uses: github/codeql-action/upload-sarif@v4 with: sarif_file: results.sarif From a8aeb24ec420f56787a285c3c0fece66545c2d2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:39:49 +0000 Subject: [PATCH 196/250] chore(deps): bump actions/download-artifact from 4 to 8 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4 to 8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v4...v8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 56f52598..3de5f8d1 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -262,7 +262,7 @@ jobs: steps: - uses: actions/checkout@v7 - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: standalone-binaries path: dist/release From c100f125436ba3e10e1254a7896a497fac80cef2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:39:54 +0000 Subject: [PATCH 197/250] chore(deps): bump actions/upload-artifact from 4 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 56f52598..3abec746 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -119,7 +119,7 @@ jobs: sha256sum ./*.tar.gz > checksums.txt - name: Upload standalone binaries - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: standalone-binaries path: dist/release/ From cc30e310b2e5322c690c954a634e8e4cc5935147 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Mon, 2 Nov 2026 11:31:30 +1300 Subject: [PATCH 198/250] fix(ci): stop the arm64 restart assertion failing on SIGPIPE The step runs under `set -euo pipefail` and tests the restart with docker logs calnode 2>&1 | grep -q "DEK unwrapped from keystore" `grep -q` exits as soon as it matches, so `docker logs` takes SIGPIPE and the pipeline returns 141 under pipefail. The assertion therefore fails even though the line was found. It is timing dependent, which is why it was intermittent: the failure dump in the same run printed the very line the assertion missed. Reproduced directly: `yes x | head -50000 | grep -q x` exits 141. This blocked a Dependabot PR that changes nothing related (#208, codeql-action). Capture the logs to a file with redirection, then grep the file, which cannot SIGPIPE. The same loop also retries for up to 20 seconds, covering Docker's log flush lagging the first successful HTTP response. The failure path now prints the tail of the log it actually searched. --- .github/workflows/docker-publish.yml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 56f52598..3a4ada50 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -238,10 +238,23 @@ jobs: code=$(curl -s -o /dev/null -w '%{http_code}' http://127.0.0.1:3000/ || true) if [ "$code" = "200" ] || [ "$code" = "302" ] || [ "$code" = "307" ]; then echo "still serving after restart (HTTP $code)" - docker logs calnode 2>&1 | grep -q "DEK unwrapped from keystore" \ - && echo "restart reused the persisted key" \ - || { echo "::error::restart did not reuse the persisted key"; exit 1; } - exit 0 + # Read the logs into a file before searching them. `docker logs | grep -q` + # fails under `set -o pipefail` as soon as grep matches: grep exits, docker + # logs takes SIGPIPE, and the pipeline returns non-zero even though the line + # was found. It is timing dependent, which is why this assertion failed + # intermittently while the log dump below clearly contained the line. + # The retry also covers Docker's log flush lagging the first HTTP response. + for attempt in $(seq 1 20); do + docker logs calnode > /tmp/restart.log 2>&1 || true + if grep -q "DEK unwrapped from keystore" /tmp/restart.log; then + echo "restart reused the persisted key" + exit 0 + fi + sleep 1 + done + echo "::error::restart did not reuse the persisted key" + tail -20 /tmp/restart.log + exit 1 fi sleep 2 done From a96604b6efe6d3780309356e8bd08effd5d65e1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:30:11 +0000 Subject: [PATCH 199/250] chore(deps): bump golang.org/x/image from 0.46.0 to 0.47.0 Bumps [golang.org/x/image](https://github.com/golang/image) from 0.46.0 to 0.47.0. - [Commits](https://github.com/golang/image/compare/v0.46.0...v0.47.0) --- updated-dependencies: - dependency-name: golang.org/x/image dependency-version: 0.47.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c9b12f02..f38a2840 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ require ( github.com/pressly/goose/v3 v3.28.0 github.com/yuin/goldmark v1.8.6 golang.org/x/crypto v0.57.0 - golang.org/x/image v0.46.0 + golang.org/x/image v0.47.0 golang.org/x/oauth2 v0.37.0 - golang.org/x/text v0.42.0 + golang.org/x/text v0.43.0 modernc.org/sqlite v1.61.0 ) diff --git a/go.sum b/go.sum index 2ce055db..570c09d9 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.46.0 h1:b1+oYj0Jbp6K5MDT4i4/eZpYlk3V8SJhhDKh6LBHAyQ= -golang.org/x/image v0.46.0/go.mod h1:3B3W05VGVQyuXucLINLjXKrqISASfi4Xj+iCVkLMwew= +golang.org/x/image v0.47.0 h1:za/8gVz++PPZqmZJBNSISICN5Rrj5zixP/8K++fgmqo= +golang.org/x/image v0.47.0/go.mod h1:IkN5o4A7vq55vXN8FWjjnhg9Rs2GOtffqsSi9mWAKYE= golang.org/x/mod v0.42.0 h1:ICeL3t2L30ljSPHHxDnR4fqVcBt/zR2zJAb9juavmQg= golang.org/x/mod v0.42.0/go.mod h1:u5fzIrRInkL8MaO1cbRkUHT64v303YIT5KEqpNr7jRs= golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= @@ -60,8 +60,8 @@ golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= -golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= +golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= +golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/tools v0.52.0 h1:ryxg4U63oaUYk7uOLTF37n43f4qgtGvqV4Ioit1BaEs= From 68cbb3ffd290fd0fce6341f8131a4abfd547fb79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:30:11 +0000 Subject: [PATCH 200/250] chore(deps): bump golang.org/x/text from 0.42.0 to 0.43.0 Bumps [golang.org/x/text](https://github.com/golang/text) from 0.42.0 to 0.43.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.42.0...v0.43.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-version: 0.43.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c9b12f02..c3e2b2b0 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( golang.org/x/crypto v0.57.0 golang.org/x/image v0.46.0 golang.org/x/oauth2 v0.37.0 - golang.org/x/text v0.42.0 + golang.org/x/text v0.43.0 modernc.org/sqlite v1.61.0 ) diff --git a/go.sum b/go.sum index 2ce055db..b3b6625b 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= -golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= +golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= +golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/tools v0.52.0 h1:ryxg4U63oaUYk7uOLTF37n43f4qgtGvqV4Ioit1BaEs= From 287f707e2dc6f6f3fc61458386cb493deee61d4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:37:51 +0000 Subject: [PATCH 201/250] chore(deps): bump github.com/pressly/goose/v3 from 3.28.0 to 3.29.0 Bumps [github.com/pressly/goose/v3](https://github.com/pressly/goose) from 3.28.0 to 3.29.0. - [Release notes](https://github.com/pressly/goose/releases) - [Changelog](https://github.com/pressly/goose/blob/main/CHANGELOG.md) - [Commits](https://github.com/pressly/goose/compare/v3.28.0...v3.29.0) --- updated-dependencies: - dependency-name: github.com/pressly/goose/v3 dependency-version: 3.29.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index f38a2840..0bfe70ec 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/disintegration/imaging v1.6.2 github.com/joho/godotenv v1.5.1 github.com/modelcontextprotocol/go-sdk v1.8.0 - github.com/pressly/goose/v3 v3.28.0 + github.com/pressly/goose/v3 v3.29.0 github.com/yuin/goldmark v1.8.6 - golang.org/x/crypto v0.57.0 + golang.org/x/crypto v0.58.0 golang.org/x/image v0.47.0 golang.org/x/oauth2 v0.37.0 golang.org/x/text v0.43.0 @@ -28,7 +28,7 @@ require ( github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/segmentio/asm v1.2.1 // indirect github.com/segmentio/encoding v0.5.4 // indirect - github.com/sethvargo/go-retry v0.4.0 // indirect + github.com/sethvargo/go-retry v0.5.0 // indirect github.com/yosida95/uritemplate/v3 v3.0.2 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sync v0.24.0 // indirect diff --git a/go.sum b/go.sum index 570c09d9..b049d3c4 100644 --- a/go.sum +++ b/go.sum @@ -26,16 +26,16 @@ github.com/modelcontextprotocol/go-sdk v1.8.0 h1:KIvahhYqwtbeniWVPs3TcXEA7b8jEtw github.com/modelcontextprotocol/go-sdk v1.8.0/go.mod h1:dL7u98E/zjJTGzEq+j30jQ8K2k1mb6LeAH4inEcSGts= github.com/ncruces/go-strftime v1.1.0 h1:vtPmPWMkb539RGV9WpWT9EwJGvrOCKvMNI4obWL47Hk= github.com/ncruces/go-strftime v1.1.0/go.mod h1:yVaq7iwCN09vHRrKBrrflXT0M9tTMG2KmZ9Fj7xeG/g= -github.com/pressly/goose/v3 v3.28.0 h1:D2M+iL31GmpZxSHOhX8mqyqAT3CXnokUmm0eKoSP+Vc= -github.com/pressly/goose/v3 v3.28.0/go.mod h1:v26MOuB8bL3kzzrt3Vqhb3R0PRVsl8hFQKdrht/L6Rk= +github.com/pressly/goose/v3 v3.29.0 h1:dtEnBCT7CqkHIUCdgrXsrmeisaN8gFkRU4Y5OEwif4o= +github.com/pressly/goose/v3 v3.29.0/go.mod h1:plA4aP4+u+Q3FMTgbFbhF8TuAWpAdfWpoFGkJsIFWh0= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0= github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0= -github.com/sethvargo/go-retry v0.4.0 h1:9qy1OoIAxBL+gBYnkTnTnWle5wlfsXQlwRzIbbpdqPw= -github.com/sethvargo/go-retry v0.4.0/go.mod h1:tvsjdKG6xfiCx4LSiUZ06kcv38xvdVQwv8R6/VnnVWg= +github.com/sethvargo/go-retry v0.5.0 h1:JYfFKmVJ8ER06GReN1efzc5cm52BrVsFVzmcHiKJwfY= +github.com/sethvargo/go-retry v0.5.0/go.mod h1:tvsjdKG6xfiCx4LSiUZ06kcv38xvdVQwv8R6/VnnVWg= github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4= @@ -46,8 +46,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= -golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= -golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= +golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= +golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.47.0 h1:za/8gVz++PPZqmZJBNSISICN5Rrj5zixP/8K++fgmqo= golang.org/x/image v0.47.0/go.mod h1:IkN5o4A7vq55vXN8FWjjnhg9Rs2GOtffqsSi9mWAKYE= From 9b9b5afc74aa89368cbe3e79f70567d59c23013a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:37:52 +0000 Subject: [PATCH 202/250] chore(deps): bump golang.org/x/crypto from 0.57.0 to 0.58.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.57.0 to 0.58.0. - [Commits](https://github.com/golang/crypto/compare/v0.57.0...v0.58.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.58.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f38a2840..dde0b636 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/modelcontextprotocol/go-sdk v1.8.0 github.com/pressly/goose/v3 v3.28.0 github.com/yuin/goldmark v1.8.6 - golang.org/x/crypto v0.57.0 + golang.org/x/crypto v0.58.0 golang.org/x/image v0.47.0 golang.org/x/oauth2 v0.37.0 golang.org/x/text v0.43.0 diff --git a/go.sum b/go.sum index 570c09d9..0ac3c572 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= -golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= -golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= +golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= +golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.47.0 h1:za/8gVz++PPZqmZJBNSISICN5Rrj5zixP/8K++fgmqo= golang.org/x/image v0.47.0/go.mod h1:IkN5o4A7vq55vXN8FWjjnhg9Rs2GOtffqsSi9mWAKYE= From 786b3c0821a6ad72c1b8a8ce36a72ce6b50151c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:38:21 +0000 Subject: [PATCH 203/250] chore(deps-dev): bump vitest-browser-svelte in /frontend Bumps [vitest-browser-svelte](https://github.com/vitest-community/vitest-browser-svelte) from 2.1.1 to 3.1.0. - [Release notes](https://github.com/vitest-community/vitest-browser-svelte/releases) - [Commits](https://github.com/vitest-community/vitest-browser-svelte/compare/v2.1.1...v3.1.0) --- updated-dependencies: - dependency-name: vitest-browser-svelte dependency-version: 3.1.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 1acaf7f1..ab0c7a56 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -46,6 +46,6 @@ "typescript": "^5.7.3", "vite": "^8.3.0", "vitest": "^4.1.10", - "vitest-browser-svelte": "^2.1.1" + "vitest-browser-svelte": "^3.1.0" } } diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 6f9ae391..27d1dfee 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -85,8 +85,8 @@ importers: specifier: ^4.1.10 version: 4.1.11(@types/node@26.6.5)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) vitest-browser-svelte: - specifier: ^2.1.1 - version: 2.1.1(svelte@5.57.3)(vitest@4.1.11) + specifier: ^3.1.0 + version: 3.1.0(svelte@5.57.3)(vitest@4.1.11) packages: @@ -424,8 +424,8 @@ packages: peerDependencies: vite: ^5.2.0 || ^6 || ^7 || ^8 - '@testing-library/svelte-core@1.0.0': - resolution: {integrity: sha512-VkUePoLV6oOYwSUvX6ShA8KLnJqZiYMIbP2JW2t0GLWLkJxKGvuH5qrrZBV/X7cXFnLGuFQEC7RheYiZOW68KQ==} + '@testing-library/svelte-core@1.1.3': + resolution: {integrity: sha512-KkMAvXeWorxN2Yn0kdC1lfoAItxpoj4uOWzxK5leDrNxonLvS5nwBFvztrroyTszQ0Wf/EU6iLT8JhY5qcn22g==} engines: {node: '>=16'} peerDependencies: svelte: ^3 || ^4 || ^5 || ^5.0.0-next.0 @@ -1159,11 +1159,11 @@ packages: vite: optional: true - vitest-browser-svelte@2.1.1: - resolution: {integrity: sha512-qbunYRSm+N92r9bfTkdDTpBZESLmp4QFz2SluV3n/x8U7ysosfeXYJZ4vXbJ0Y0LzoqqDnV5LHprmFgn4Eo+Ug==} + vitest-browser-svelte@3.1.0: + resolution: {integrity: sha512-+EBXSed6NArmzOC2DY4v9sI5n9TMIyfkMnewbXNQ7sR5IckQTCx7g1BbLdkH7kzm/tkgG/eEbRYlMWSbVfBtWA==} peerDependencies: svelte: ^3 || ^4 || ^5 || ^5.0.0-next.0 - vitest: ^4.0.0 + vitest: ^4.0.0 || ^5.0.0 vitest@4.1.11: resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==} @@ -1509,7 +1509,7 @@ snapshots: tailwindcss: 4.3.1 vite: 8.3.0(@types/node@26.6.5)(jiti@2.7.0) - '@testing-library/svelte-core@1.0.0(svelte@5.57.3)': + '@testing-library/svelte-core@1.1.3(svelte@5.57.3)': dependencies: svelte: 5.57.3 @@ -2167,9 +2167,9 @@ snapshots: optionalDependencies: vite: 8.3.0(@types/node@26.6.5)(jiti@2.7.0) - vitest-browser-svelte@2.1.1(svelte@5.57.3)(vitest@4.1.11): + vitest-browser-svelte@3.1.0(svelte@5.57.3)(vitest@4.1.11): dependencies: - '@testing-library/svelte-core': 1.0.0(svelte@5.57.3) + '@testing-library/svelte-core': 1.1.3(svelte@5.57.3) svelte: 5.57.3 vitest: 4.1.11(@types/node@26.6.5)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) From b4ee5aee66dff12faef512b6223b9641044dcaf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:38:27 +0000 Subject: [PATCH 204/250] chore(deps-dev): bump @lucide/svelte from 1.54.0 to 1.64.0 in /frontend Bumps [@lucide/svelte](https://github.com/lucide-icons/lucide/tree/HEAD/packages/svelte) from 1.54.0 to 1.64.0. - [Release notes](https://github.com/lucide-icons/lucide/releases) - [Commits](https://github.com/lucide-icons/lucide/commits/1.64.0/packages/svelte) --- updated-dependencies: - dependency-name: "@lucide/svelte" dependency-version: 1.64.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 1acaf7f1..f0f73826 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@internationalized/date": "^3.12.4", - "@lucide/svelte": "^1.54.0", + "@lucide/svelte": "^1.64.0", "@sveltejs/adapter-static": "^3.0.10", "@sveltejs/kit": "^2.70.2", "@sveltejs/vite-plugin-svelte": "^7.1.2", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 6f9ae391..2cc1002d 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -25,8 +25,8 @@ importers: specifier: ^3.12.4 version: 3.12.4 '@lucide/svelte': - specifier: ^1.54.0 - version: 1.54.0(svelte@5.57.3) + specifier: ^1.64.0 + version: 1.64.0(svelte@5.57.3) '@sveltejs/adapter-static': specifier: ^3.0.10 version: 3.0.10(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))) @@ -156,8 +156,8 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@lucide/svelte@1.54.0': - resolution: {integrity: sha512-PbUrcmVPU71zmcs1Kc5RlgF83SsBsSNC+MeuttAHMmvPMuoIJfyDPjit5kpAJxJwsmN2Pk1Bx75AwZxP8vkDvw==} + '@lucide/svelte@1.64.0': + resolution: {integrity: sha512-PSFui8Gkk0JcU4nXljZzy+MnBhXeY4DIblvvcDNPIvL6r5NIngeDfAvBs4C/XDlz+dTth9+LcHy6/zdhEmxEwQ==} peerDependencies: svelte: ^5 @@ -1312,7 +1312,7 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.6.0 - '@lucide/svelte@1.54.0(svelte@5.57.3)': + '@lucide/svelte@1.64.0(svelte@5.57.3)': dependencies: svelte: 5.57.3 From b1191de35e200b5c6c8bb20a132bd6709c83889f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:41:25 +0000 Subject: [PATCH 205/250] chore(deps-dev): bump shadcn-svelte from 1.3.0 to 1.7.2 in /frontend Bumps [shadcn-svelte](https://github.com/huntabyte/shadcn-svelte/tree/HEAD/packages/cli) from 1.3.0 to 1.7.2. - [Release notes](https://github.com/huntabyte/shadcn-svelte/releases) - [Changelog](https://github.com/huntabyte/shadcn-svelte/blob/main/packages/cli/CHANGELOG.md) - [Commits](https://github.com/huntabyte/shadcn-svelte/commits/shadcn-svelte@1.7.2/packages/cli) --- updated-dependencies: - dependency-name: shadcn-svelte dependency-version: 1.7.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 44 ++++++++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 1acaf7f1..bff35bf3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -36,7 +36,7 @@ "@vitest/browser-playwright": "^4.1.10", "bits-ui": "^2.19.5", "playwright": "^1.61.0", - "shadcn-svelte": "1.3.0", + "shadcn-svelte": "1.7.2", "svelte": "^5.57.3", "svelte-check": "^4.7.1", "svelte-sonner": "^1.1.1", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 6f9ae391..fcaba6bd 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -55,8 +55,8 @@ importers: specifier: ^1.61.0 version: 1.61.0 shadcn-svelte: - specifier: 1.3.0 - version: 1.3.0(svelte@5.57.3) + specifier: 1.7.2 + version: 1.7.2(svelte@5.57.3) svelte: specifier: ^5.57.3 version: 5.57.3 @@ -551,6 +551,11 @@ packages: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} + cn@0.3.3: + resolution: {integrity: sha512-OEiyJkSpYm2kOuNOKQ+c2wmzZRG8orrb9fnObtHTbCGNx/E9KLnGcmcocItOzREKk5KzQN5I2e3BUCj563KEpw==} + engines: {node: '>=20'} + hasBin: true + color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} @@ -874,6 +879,11 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + nanoid@3.3.20: + resolution: {integrity: sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + node-fetch-native@1.6.7: resolution: {integrity: sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==} @@ -919,6 +929,10 @@ packages: resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==} engines: {node: ^10 || ^12 || >=14} + postcss@8.5.32: + resolution: {integrity: sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==} + engines: {node: ^10 || ^12 || >=14} + readdirp@4.1.2: resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} engines: {node: '>= 14.18.0'} @@ -959,8 +973,8 @@ packages: set-cookie-parser@3.2.1: resolution: {integrity: sha512-Npd1Pt+4zb3BrSZDPd2qFwRpS6b1EUEasRrO8xS0zMJi0fApXXK5YuzP0minyJnxwnFHoVoJwA55q0A0cu63gQ==} - shadcn-svelte@1.3.0: - resolution: {integrity: sha512-Pd4ICWTkTks/b2YU4c9vF2XsX1x5HFPRl5bKszS1LcnWS83x+7T4WiIvbWz8Qh9knkcGZ+SCz1+Dmhdq+AYooA==} + shadcn-svelte@1.7.2: + resolution: {integrity: sha512-VcFgfCupRK58kVuNrobWz+Smv0wryxW1bNZYvrMqYbm7gOfTEIb/Jy7C6y0N8Ry3/d0oAzvTRPzFu2V8u0nhMA==} hasBin: true peerDependencies: svelte: ^5.0.0 @@ -980,6 +994,10 @@ packages: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} + source-map-js@1.2.2: + resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==} + engines: {node: '>=0.10.0'} + stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} @@ -1662,6 +1680,8 @@ snapshots: clsx@2.1.1: {} + cn@0.3.3: {} + color-convert@2.0.1: dependencies: color-name: 1.1.4 @@ -1910,6 +1930,8 @@ snapshots: nanoid@3.3.19: {} + nanoid@3.3.20: {} + node-fetch-native@1.6.7: {} obug@2.1.3: {} @@ -1944,6 +1966,12 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 + postcss@8.5.32: + dependencies: + nanoid: 3.3.20 + picocolors: 1.1.1 + source-map-js: 1.2.2 + readdirp@4.1.2: {} require-directory@2.1.1: @@ -1996,13 +2024,13 @@ snapshots: set-cookie-parser@3.2.1: optional: true - shadcn-svelte@1.3.0(svelte@5.57.3): + shadcn-svelte@1.7.2(svelte@5.57.3): dependencies: + cn: 0.3.3 commander: 14.0.3 node-fetch-native: 1.6.7 - postcss: 8.5.28 + postcss: 8.5.32 svelte: 5.57.3 - tailwind-merge: 3.6.0 siginfo@2.0.0: {} @@ -2017,6 +2045,8 @@ snapshots: source-map-js@1.2.1: {} + source-map-js@1.2.2: {} + stackback@0.0.2: {} statuses@2.0.2: From 1267f2229e0018429b79f0ea200a814de44a8bfa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:46:52 +0000 Subject: [PATCH 206/250] chore(deps-dev): bump playwright from 1.61.0 to 1.64.1 in /frontend Bumps [playwright](https://github.com/microsoft/playwright) from 1.61.0 to 1.64.1. - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.61.0...v1.64.1) --- updated-dependencies: - dependency-name: playwright dependency-version: 1.64.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 40 +++++++++++++++------------------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 66c29e09..32df993d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,7 +35,7 @@ "@vitest/browser": "^4.1.10", "@vitest/browser-playwright": "^4.1.10", "bits-ui": "^2.19.5", - "playwright": "^1.61.0", + "playwright": "^1.64.1", "shadcn-svelte": "1.7.2", "svelte": "^5.57.3", "svelte-check": "^4.7.1", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index ebaef3c7..57e3aa38 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -47,13 +47,13 @@ importers: version: 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11) '@vitest/browser-playwright': specifier: ^4.1.10 - version: 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11) + version: 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(playwright@1.64.1)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11) bits-ui: specifier: ^2.19.5 version: 2.19.5(@internationalized/date@3.12.4)(@sveltejs/kit@2.70.3(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.57.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3)(typescript@5.9.3)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)))(svelte@5.57.3) playwright: - specifier: ^1.61.0 - version: 1.61.0 + specifier: ^1.64.1 + version: 1.64.1 shadcn-svelte: specifier: 1.7.2 version: 1.7.2(svelte@5.57.3) @@ -649,11 +649,6 @@ packages: picomatch: optional: true - fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -911,14 +906,14 @@ packages: resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} engines: {node: '>=12'} - playwright-core@1.61.0: - resolution: {integrity: sha512-caX7TrY3Ml6egyDX0WUcTHDxodl/b51y5wJOdCEA36QviK/s2g081hvmGs8eaE3DWb6NYZQ6BjO/QkNRPenoPA==} - engines: {node: '>=18'} + playwright-core@1.64.1: + resolution: {integrity: sha512-BC4s8y6SEVA6Q1rSxZTto8hI1KUI3xXlHGZgvGqP4IqPdI/a6FX9H29IDNz7vKo9l21b6LfYosScPL6M3xxyDQ==} + engines: {node: '>=20'} hasBin: true - playwright@1.61.0: - resolution: {integrity: sha512-Z+7BeeqQPRRzklHsVFP4KTGIyMxKUmfeRA4WisM6G3/XW6nwGeX6fX9qYaDa+CiUqpOkb2f6X3nar05R3kSuJQ==} - engines: {node: '>=18'} + playwright@1.64.1: + resolution: {integrity: sha512-HCrVhHr5QQuwYoswEUGTb7gGp522yflbv/ST8nF4sFWGuLjQCt17Q/EubpGGSNKYn1tsTCPZxqHhHCfVURu7UA==} + engines: {node: '>=20'} hasBin: true pngjs@7.0.0: @@ -1559,11 +1554,11 @@ snapshots: '@types/statuses@2.0.6': optional: true - '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11)': + '@vitest/browser-playwright@4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(playwright@1.64.1)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11)': dependencies: '@vitest/browser': 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11) '@vitest/mocker': 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) - playwright: 1.61.0 + playwright: 1.64.1 tinyrainbow: 3.1.0 vitest: 4.1.11(@types/node@26.6.5)(@vitest/browser-playwright@4.1.11)(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0)) transitivePeerDependencies: @@ -1753,9 +1748,6 @@ snapshots: optionalDependencies: picomatch: 4.0.7 - fsevents@2.3.2: - optional: true - fsevents@2.3.3: optional: true @@ -1950,13 +1942,11 @@ snapshots: picomatch@4.0.7: {} - playwright-core@1.61.0: {} + playwright-core@1.64.1: {} - playwright@1.61.0: + playwright@1.64.1: dependencies: - playwright-core: 1.61.0 - optionalDependencies: - fsevents: 2.3.2 + playwright-core: 1.64.1 pngjs@7.0.0: {} @@ -2227,7 +2217,7 @@ snapshots: why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 26.6.5 - '@vitest/browser-playwright': 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(playwright@1.61.0)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11) + '@vitest/browser-playwright': 4.1.11(msw@2.14.6(@types/node@26.6.5)(typescript@5.9.3))(playwright@1.64.1)(vite@8.3.0(@types/node@26.6.5)(jiti@2.7.0))(vitest@4.1.11) transitivePeerDependencies: - msw From 6a69e392294393e779390479f012e52bf42389d2 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 3 Nov 2026 12:58:20 +1300 Subject: [PATCH 207/250] ci: run the visual smoke tests The suite in frontend (vitest browser mode, Chromium via Playwright) asserts computed styles for the shadcn components, which is what catches a bits-ui data-state that lost its @custom-variant remap: the logic works, the component renders unstyled, and neither svelte-check nor a build can see it. CLAUDE.md already requires running it after touching ui/**, app.css or the theme, but nothing enforced that, so it was a manual step that could be forgotten. It was in fact skipped for the recent dependency bumps. Runs after the frontend build so a broken build reports first, and installs the Chromium binary the config needs (the pnpm store does not carry it). --- .github/workflows/ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d6bfc1e..1305c115 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,6 +92,19 @@ jobs: working-directory: frontend run: pnpm build + # The unit tests above the browser do not exist: this suite mounts components in + # a real Chromium and asserts COMPUTED STYLES, which is the only thing that + # catches a bits-ui data-state that lost its @custom-variant remap. Logic stays + # green while the component renders unstyled, so a type check and a build cannot + # see it. It needs the browser binary, which is not in the pnpm store. + - name: Install the browser for visual tests + working-directory: frontend + run: pnpm exec playwright install --with-deps chromium + + - name: Visual smoke tests (computed styles in a real browser) + working-directory: frontend + run: pnpm test:visual + - uses: actions/setup-go@v7 with: go-version-file: go.mod From e1d011ba03b5ecc35bfea0ce1c7650117d44676a Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 3 Nov 2026 12:58:58 +1300 Subject: [PATCH 208/250] ci: add a release dry run, so the release job can be executed without a tag The release job is gated on `refs/tags/v`, so everything in it (packaging the standalone archives, and especially `download-artifact`) runs for the first time on a real release. That is how a dependency bump like download-artifact 4 to 8 can sit merged with no coverage until the next tag, where a failure blocks a release. Adds a `workflow_dispatch` trigger with a `dry_run` input, default true: - build pushes nothing on a dispatch (`push` is now `event_name == 'push'`, so pushes and tags still publish and PRs and dispatches do not); - the release job also runs on a dry-run dispatch, so its packaging and download steps execute against a real artifact; - `Create GitHub Release` stays gated on a version tag, so a dry run cannot publish anything. Rehearsing a release is now a manual dispatch, not a throwaway tag. --- .github/workflows/docker-publish.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 62b4e99c..52686864 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -19,6 +19,16 @@ on: branches: [main, dev] tags: ['v*.*.*'] pull_request: + # A rehearsal: build everything and run the release job's packaging and download + # steps, then stop before publishing a GitHub Release. It exists so the release + # path can be executed without cutting a tag, which is otherwise the only way to + # find out whether it still works. + workflow_dispatch: + inputs: + dry_run: + description: 'Exercise the release job without creating a GitHub Release' + type: boolean + default: true concurrency: group: docker-publish-${{ github.ref }} @@ -87,7 +97,7 @@ jobs: with: context: . platforms: ${{ env.BUILD_PLATFORMS }} - push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.event_name == 'push' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | @@ -266,8 +276,8 @@ jobs: run: docker logs calnode 2>&1 | tail -30 release: - # Only on a version tag, and only once the image built + pushed. - if: startsWith(github.ref, 'refs/tags/v') + # On a version tag, and on a dry-run dispatch, where it stops before publishing. + if: startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && inputs.dry_run) needs: build runs-on: ubuntu-latest permissions: @@ -303,6 +313,7 @@ jobs: # Preinstalled gh CLI + GITHUB_TOKEN (no third-party action — keeps the # supply-chain surface small). - name: Create GitHub Release + if: startsWith(github.ref, 'refs/tags/v') env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | From 1b249dbf8ae9d214fefb77077546b6675a3a07bc Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 3 Nov 2026 13:07:26 +1300 Subject: [PATCH 209/250] fix(ci): key the arm64 smoke job on "published an image", not "is a PR" The dry run added in #214 failed arm64-smoke, and the failure was correct: IMAGE_REF: ghcr.io/calnode/calnode@ ##[error]build produced no digest, so there is nothing to verify A dry-run dispatch builds without pushing, so it has no digest to pull, but the job's conditions were written as "pull unless this is a pull request". A dispatch is not a pull request, so it took the pull path with an empty digest. After #214 the only event that publishes an image is a push (branch or tag), so gate on that instead: pull the published digest on a push, and build natively for anything else (pull request or dry-run dispatch). The resolver that picks the ref is switched the same way. This is the dry run doing its job: it found a bug in the release path's assumptions before a tag could. --- .github/workflows/docker-publish.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 52686864..dcf3edbe 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -65,7 +65,7 @@ jobs: - uses: docker/setup-buildx-action@v4 - name: Log in to GHCR - if: github.event_name != 'pull_request' + if: github.event_name == 'push' uses: docker/login-action@v4 with: registry: ${{ env.REGISTRY }} @@ -165,7 +165,7 @@ jobs: test "$(uname -m)" = "aarch64" - name: Pull the image this build just published - if: github.event_name != 'pull_request' + if: github.event_name == 'push' env: IMAGE_REF: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build.outputs.digest }}" run: | @@ -176,18 +176,20 @@ jobs: fi docker pull "$IMAGE_REF" - - name: Build for arm64 natively (pull requests only) - if: github.event_name == 'pull_request' + - name: Build for arm64 natively (anything that did not publish an image) + if: github.event_name != 'push' run: docker build --platform linux/arm64 -t calnode-pr:arm64 . - name: Resolve the image under test id: img run: | set -euo pipefail - if [ "${{ github.event_name }}" = "pull_request" ]; then - echo "ref=calnode-pr:arm64" >> "$GITHUB_OUTPUT" - else + # A push published an image, so verify that exact digest. Anything else + # (pull request, dry-run dispatch) built locally and is verified as-is. + if [ "${{ github.event_name }}" = "push" ]; then echo "ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build.outputs.digest }}" >> "$GITHUB_OUTPUT" + else + echo "ref=calnode-pr:arm64" >> "$GITHUB_OUTPUT" fi - name: Confirm the image is arm64 From 5c1e4c1974926ab53bc73e3d39e20b6801a09a5d Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Tue, 3 Nov 2026 15:56:44 +1300 Subject: [PATCH 210/250] chore(release): 0.13.0 One user-facing addition, the Greek locale, plus dependency maintenance and two CI improvements. No migrations, so upgrading is an image swap with no schema change. The Greek translation is a contribution rather than a reviewed one, which the release notes say plainly. --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 496a6395..ac6426f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,29 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +## [0.13.0] - 2026-11-03 + +### Added +- **Greek.** The public surfaces now ship an `el` locale: the booking and manage pages, the + embed widget, the booking emails and calendar invite text. Locale resolution is unchanged, + so it is chosen from `Accept-Language`, a `?lang=el` override, or the operator's fallback + setting, and the switcher lists it automatically. Like every non-English locale here it is + a contribution rather than a reviewed translation, so the wording is worth a native check + before it is advertised. + +### Changed +- **Dependency maintenance.** Go 1.27.3 build image, `modernc.org/sqlite` 1.61.0, + `goose` 3.29.0, `x/crypto` 0.58.0, `x/text`, `x/image`, Svelte 5.57.3, Lucide, + shadcn-svelte, Playwright and vitest-browser-svelte, plus the GitHub Actions majors + (`setup-go` 7, `cache` 6, `codeql-action` 4, `upload`/`download-artifact` 7/8). No + application behaviour changed, and there are no database migrations in this release. +- **The visual smoke tests run in CI.** They mount components in a real browser and assert + computed styles, which is what catches a shadcn `data-state` that lost its variant remap. + They were previously a manual step and had been skipped for these dependency bumps. +- **The release job can be rehearsed without a tag.** A `workflow_dispatch` with + `dry_run=true` builds and runs the release steps, then stops before publishing, so a change + to the release path is no longer first exercised by a real release. + ## [0.12.0] - 2026-10-30 ### Fixed From b56da53764d1c71c740f2e5b52272dde6ebc7ee5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 00:44:12 +0000 Subject: [PATCH 211/250] @edimitchel has signed the CLA in Calnode/calnode#217 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index 2f5f8f75..f3143aae 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -95,6 +95,14 @@ "created_at": "2026-10-28T19:19:37Z", "repoId": 1277491008, "pullRequestNo": 179 + }, + { + "name": "edimitchel", + "id": 2922851, + "comment_id": 6598245583, + "created_at": "2026-11-03T07:48:30Z", + "repoId": 1277491008, + "pullRequestNo": 217 } ] } \ No newline at end of file From 0817f8f9a2f101982d81a8b9c764f7bb488e5ae5 Mon Sep 17 00:00:00 2001 From: shockalotti Date: Thu, 5 Nov 2026 06:47:28 +1300 Subject: [PATCH 212/250] i18n: add Polish (pl) locale (#216) (#220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds internal/i18n/locales/pl.json, contributed by kybeq in #216. No code change is needed: init() globs the directory, so the switcher, the fallback dropdown and the public API payload pick it up. Adapted from the report so the repo's three guards pass: - Date tables now match CLDR/Intl for pl. The proposed values were capitalised and dropped the Polish weekday dot ("Pon", "Sty"); CLDR has "pon." and "sty", and the calendar renders these raw (booking.css applies no text-transform). All 7 weekdays and 12 months changed. - "ponowanie" -> "ponownie" in email_rebook_intro and email_manage_link_intro_reschedule ("ponowanie" is not a Polish word). - others "inni" -> "innych": hostsLabel renders "… i 3 innych", and Polish takes the genitive plural after a numeral. Worth a native re-check. Also corrects the shipped-locale lists in CLAUDE.md and ARCHITECTURE §23, which were already stale: they said 9 locales while el had shipped, and now pl as well. Verified against a running instance: /book/?lang=pl renders in Polish, the switcher lists "polski" and selects it, html lang="pl", and the embedded i18n payload carries the CLDR values (month_short_jan="sty", dow_short_mon="pon."). Credits kybeq for the translation. --- CLAUDE.md | 2 +- docs/ARCHITECTURE.md | 2 +- internal/i18n/locales/pl.json | 171 ++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 internal/i18n/locales/pl.json diff --git a/CLAUDE.md b/CLAUDE.md index cfa2a80b..b5127d96 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -140,7 +140,7 @@ no string plumbing with the Go templates), and admin-authored content (event nam descriptions, questions, custom email copy). Locale is resolved per request from `Accept-Language` + a `?lang=` override + the operator's fallback setting (`internal/handler/i18n.go`), and the booker's locale is stored on the booking so later -reminders match. Ships `en es fr fr-CA de it pt nl sv`. Full detail: ARCHITECTURE §23. +reminders match. Ships `en es fr fr-CA de el it nl pl pt sv`. Full detail: ARCHITECTURE §23. **Adding a locale = adding `internal/i18n/locales/.json`.** Nothing else. `init()` globs the directory; the switcher, the fallback dropdown and the public API payload all read diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index d8f2ba2a..ccf2b8d0 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -1229,7 +1229,7 @@ LLM summary) — the next build; consent-gated (§8.11/§15 of the PRD). ## 23. Languages (i18n) -Calnode ships **9 locales**: `en` (source) · `es` · `fr` · `fr-CA` · `de` · `it` · `pt` · `nl` · `sv`. +Calnode ships **11 locales**: `en` (source) · `es` · `fr` · `fr-CA` · `de` · `el` · `it` · `nl` · `pl` · `pt` · `sv`. `fr-CA` is the first **regional** locale, and it is a separate file rather than a fallback because the differences are real: `courriel` not `e-mail`, `reporter`/`report` not diff --git a/internal/i18n/locales/pl.json b/internal/i18n/locales/pl.json new file mode 100644 index 00000000..e6f7fcc8 --- /dev/null +++ b/internal/i18n/locales/pl.json @@ -0,0 +1,171 @@ +{ + "book_by_chat": "Zarezerwuj przez czat", + "close": "Zamknij", + "assistant_greeting": "Cześć! Powiedz mi w przybliżeniu, kiedy chcesz się spotkać — np. „w czwartek po południu” lub „w przyszłym tygodniu” — a znajdę termin. W każdej chwili możesz też użyć kalendarza.", + "assistant_input_placeholder": "Wpisz, kiedy masz czas…", + "assistant_input_aria": "Napisz do asystenta rezerwacji", + "send": "Wyślij", + "show_more": "Pokaż więcej", + "show_less": "Pokaż mniej", + "date_picker_aria": "Wybór daty", + "timezone_aria": "Strefa czasowa", + "select_day_hint": "Wybierz dzień, aby zobaczyć dostępne godziny.", + "back": "Wstecz", + "name_label": "Imię i nazwisko", + "name_placeholder": "Twoje imię i nazwisko", + "email_label": "E-mail", + "email_placeholder": "ty@example.com", + "choose_option": "Wybierz opcję", + "confirm_booking": "Potwierdź rezerwację", + "confirming": "Potwierdzanie…", + "booking_confirmed": "Rezerwacja potwierdzona", + "confirmation_email_sent": "E-mail z potwierdzeniem został wysłany.", + "required_fields_error": "Wypełnij wszystkie wymagane pola.", + "slot_taken_error": "Ten termin właśnie został zajęty. Wybierz inną godzinę.", + "booking_failed_error": "Rezerwacja nie powiodła się. Spróbuj ponownie.", + "network_error": "Błąd sieci. Sprawdź swoje połączenie z internetem.", + "loading": "Ładowanie…", + "no_available_times": "Brak dostępnych terminów w dniu %s. Wybierz inną datę.", + "no_available_times_host": "%[1]s nie ma dostępnych terminów w dniu %[2]s. Wybierz inną datę.", + "slot_taken": "już zarezerwowane", + "all_times_taken": "Wszystkie terminy w tym dniu są zajęte.", + "min_notice_hint": "Rezerwacji należy dokonać z co najmniej %s wyprzedzeniem.", + "could_not_load_times": "Nie udało się załadować terminów. Spróbuj ponownie.", + "times_shown_in": "Godziny wyświetlane w strefie ", + "payment_received": "Płatność otrzymana", + "payment_confirmed_sub": "Twoja rezerwacja została potwierdzona — e-mail z potwierdzeniem jest już w drodze.", + "assistant_error": "Przepraszamy — coś poszło nie tak. Użyj poniższego kalendarza.", + "assistant_disclosure": "Rozmawiasz z automatycznym asystentem, a nie z człowiekiem.", + "other": "inny", + "others": "innych", + "list_separator": ", ", + "list_conjunction": " i ", + "language_switcher_aria": "Język", + "cookie_consent_aria": "Zgoda na pliki cookie", + "cookie_text": "Używamy analitycznych plików cookie, aby zrozumieć, jak używana jest ta strona rezerwacji — zapisujemy je tylko za Twoją zgodą.", + "privacy_policy": "Polityka prywatności", + "decline": "Odrzuć", + "accept": "Akceptuj", + "privacy": "Prywatność", + "terms": "Regulamin", + "cookie_settings": "Ustawienia plików cookie", + "prev_month_aria": "Poprzedni miesiąc", + "next_month_aria": "Następny miesiąc", + "demo_public_label": "Demo publiczne", + "demo_public_text": "dane widoczne w tym miejscu są publiczne i resetują się automatycznie. Nie wprowadzaj poufnych informacji.", + "demo_view_source": "Zobacz kod źródłowy", + "powered_by": "Obsługiwane przez", + "duration_min": "%d min", + "duration_hour_one": "1 godzina", + "duration_hours": "%d godz.", + "duration_hr_min": "%d godz. %d min", + "location_video_meeting": "Spotkanie wideo", + "location_phone": "Rozmowa telefoniczna", + "location_in_person": "Osobiście", + "location_video_call": "Połączenie wideo", + "manage_booking_title": "Zarządzaj rezerwacją", + "link_expired_title": "Link wygasł lub jest nieprawidłowy", + "link_expired_text": "Ten link do zarządzania wygasł lub nie jest już aktywny. Sprawdź e-mail z potwierdzeniem, aby znaleźć aktualny link, lub skontaktuj się z organizatorem.", + "booking_already_cancelled_title": "Rezerwacja została już anulowana", + "booking_already_cancelled_text": "Ta rezerwacja została anulowana. Aby zarezerwować nowy termin, przejdź do strony wydarzenia.", + "scheduled_for": "Zaplanowano na", + "reschedule": "Zmień termin", + "cancel_booking": "Anuluj rezerwację", + "select_a_date": "Wybierz datę", + "pick_day_hint": "Wybierz dzień z kalendarza.", + "confirm_reschedule_question": "Potwierdzić zmianę terminu?", + "was_label": "Było", + "now_label": "Teraz", + "confirm_reschedule": "Potwierdź zmianę terminu", + "rescheduling": "Zmienianie terminu…", + "cancel_this_booking_question": "Anulować tę rezerwację?", + "cancel_booking_notice": "Tej operacji nie można cofnąć. Wiadomość o anulowaniu zostanie wysłana do Ciebie oraz do organizatora.", + "reason_optional_label": "Powód (opcjonalnie)", + "reason_placeholder": "np. konflikt w kalendarzu", + "yes_cancel_booking": "Tak, anuluj rezerwację", + "cancelling": "Anulowanie…", + "booking_rescheduled_title": "Zmieniono termin rezerwacji", + "booking_rescheduled_prefix": "Twoja rezerwacja została przeniesiona na ", + "booking_cancelled_title": "Rezerwacja anulowana", + "booking_cancelled_text": "Twoja rezerwacja została anulowana.", + "slot_no_longer_available_error": "Ten termin nie jest już dostępny. Wybierz inną godzinę.", + "reschedule_failed_error": "Zmiana terminu nie powiodła się. Spróbuj ponownie.", + "already_cancelled_error": "Ta rezerwacja jest już anulowana.", + "cancellation_failed_error": "Anulowanie nie powiodło się. Spróbuj ponownie.", + "dow_short_sun": "niedz.", + "dow_short_mon": "pon.", + "dow_short_tue": "wt.", + "dow_short_wed": "śr.", + "dow_short_thu": "czw.", + "dow_short_fri": "pt.", + "dow_short_sat": "sob.", + "month_short_jan": "sty", + "month_short_feb": "lut", + "month_short_mar": "mar", + "month_short_apr": "kwi", + "month_short_may": "maj", + "month_short_jun": "cze", + "month_short_jul": "lip", + "month_short_aug": "sie", + "month_short_sep": "wrz", + "month_short_oct": "paź", + "month_short_nov": "lis", + "month_short_dec": "gru", + "clock_format": "24h", + "date_format": "%[1]s %[2]d %[3]s %[4]d", + "email_greeting": "Cześć %s,", + "email_confirmed_lead": "Twoja rezerwacja została potwierdzona.", + "email_cancelled_lead": "Twoja rezerwacja została anulowana.", + "email_rescheduled_lead": "Termin Twojej rezerwacji został zmieniony.", + "email_reminder_lead": "Przypomnienie: zbliża się termin Twojej rezerwacji.", + "email_label_event": "Wydarzenie", + "email_label_with": "Z kim", + "email_label_start": "Początek", + "email_label_end": "Koniec", + "email_label_when": "Kiedy", + "email_label_location": "Lokalizacja", + "email_label_reason": "Powód", + "email_label_was": "Poprzedni termin", + "email_label_now": "Nowy termin", + "email_add_to_calendar": "Dodaj do kalendarza:", + "email_add_to_calendar_updated": "Dodaj do kalendarza (zaktualizowany termin):", + "email_calendar_google": "Kalendarz Google", + "email_calendar_outlook": "Outlook", + "email_booking_reference": "Numer rezerwacji: %s", + "email_manage_link_intro": "Aby zmienić termin lub anulować rezerwację, przejdź do:", + "email_manage_link_intro_reschedule": "Aby ponownie zmienić termin lub anulować rezerwację, przejdź do:", + "email_cancel_link_intro": "Aby anulować, przejdź do:", + "email_rebook_intro": "Aby zarezerwować ponownie, przejdź do:", + "email_manage_button": "Zarządzaj rezerwacją", + "email_rebook_button": "Zarezerwuj ponownie", + "email_subject_confirmed": "Potwierdzenie rezerwacji: %s", + "email_subject_cancelled": "Anulowanie rezerwacji: %s", + "email_subject_rescheduled": "Zmiana terminu rezerwacji: %s", + "email_subject_reminder": "Przypomnienie: zbliża się %s", + "email_booking_with": "Rezerwacja z %s", + "email_manage_this_booking": "Zarządzaj tą rezerwacją:", + "calendar_event_summary": "%s – %s", + "calendar_event_booking_id": "Identyfikator rezerwacji: %s", + "err_booking_limit": "Masz już maksymalną liczbę nadchodzących rezerwacji dla tego wydarzenia. Anuluj istniejącą rezerwację lub poczekaj na jej zakończenie przed kolejną rezerwacją.", + "err_email_throttled": "Z tego adresu e-mail dokonywano ostatnio zbyt wielu rezerwacji. Spróbuj ponownie później.", + "err_required_field": "wymagane pole %q nie zostało wypełnione", + "err_required_checkbox": "pole %q musi zostać zaznaczone", + "err_invalid_option": "nieprawidłowa opcja dla %[1]q: %[2]q nie jest dozwolonym wyborem", + "assistant_unavailable": "Asystent rezerwacji jest w tej chwili niedostępny — wybierz termin z poniższego kalendarza.", + "assistant_trouble": "Przepraszamy — występują trudności techniczne. Wybierz termin z poniższego kalendarza.", + "assistant_iteration_cap": "Wybierzmy prostszą drogę — zaznacz termin z poniższego kalendarza.", + "assistant_status_slots": "Sprawdzanie dostępności…", + "assistant_status_book": "Rezerwowanie…", + "assistant_status_working": "Przetwarzanie…", + "time_period": "Pora dnia", + "time_morning": "Rano", + "time_afternoon": "Po południu", + "time_evening": "Wieczór", + "phone_call_number": "Numer telefonu (opcjonalnie, w przypadku rozmowy telefonicznej)", + "calendar_degraded_notice": "Nie udało się załadować części danych kalendarza, dlatego informacje o dostępności mogą być niepełne.", + "directory_book": "Zarezerwuj", + "directory_empty": "Brak dostępnych wydarzeń do zarezerwowania.", + "directory_members": "Członkowie zespołu", + "directory_person_subtitle": "Zarezerwuj spotkanie z użytkownikiem %s", + "directory_team_subtitle": "Zarezerwuj spotkanie z zespołem %s" +} From 6ed513b206a0dd8049a7f3b6e6f1ab99fa54f6b8 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 5 Nov 2026 07:04:53 +1300 Subject: [PATCH 213/250] docs: fix the remaining stale locale counts and translation caveats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #220 corrected the locale list in CLAUDE.md and ARCHITECTURE §23 but missed three other places that still claimed 9 languages, and left two claims that shipping Polish has now falsified: - README.md and CONTRIBUTING.md both still said 9 locales and listed 9. Both now say 11 and include Greek and Polish. Greek had already shipped without either file being updated, so this drift predates Polish. - ARCHITECTURE's LiveKit limitation repeated "9 languages". - ARCHITECTURE's "Plural rules are 2-form only" bullet said shipping Polish correctly needs a CLDR plural-category selector first. Polish now ships and does not need one: its plural-bearing keys dodge the missing categories (durations use the invariant abbreviations godz./min, and hostsLabel's inny/innych reads correctly at every count). Russian and Arabic still do need the selector. - "Every non-English locale is an LLM draft" is no longer true of pl, which was contributed and grammar-checked by a native speaker. Reworded to "most", with the exception stated and its two developer edits named. --- CONTRIBUTING.md | 9 +++++---- README.md | 7 ++++--- docs/ARCHITECTURE.md | 16 +++++++++++----- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76870aa3..cb3fcad8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -74,14 +74,15 @@ prefer additive, nullable/defaulted columns. ## Translations -Calnode ships 9 locales (`en es fr fr-CA de it pt nl sv`) across the booker-facing surfaces: +Calnode ships 11 locales (`en es fr fr-CA de el it nl pl pt sv`) across the booker-facing surfaces: booking page, manage/reschedule page, embed widget, the four emails, and the calendar invite. The admin UI and the built-in video room are English-only. **Translation PRs are very welcome** - both new languages and corrections to existing -ones. **Every non-English locale is currently a machine draft with no native review**, so -if you speak one of them, fixes are genuinely valuable and will be merged readily. Small, -single-language PRs are easier to review than sweeping ones. +ones. **Most non-English locales are machine drafts with no native review, and none has +had a full native read** (Polish was contributed and grammar-checked by a native +speaker), so if you speak one of them, fixes are genuinely valuable and will be merged +readily. Small, single-language PRs are easier to review than sweeping ones. **Adding a language is adding one file:** `internal/i18n/locales/.json`. No Go, template, or frontend change is needed - `init()` globs the directory, and the language diff --git a/README.md b/README.md index b9db471f..4ce56269 100644 --- a/README.md +++ b/README.md @@ -200,13 +200,14 @@ domains, Resend email, Google & Microsoft OAuth, Litestream backups, troubleshoo - **Zoom** — per-host OAuth; a Zoom-located booking mints a meeting under the assigned host's account - **Built-in video meetings (LiveKit)** — in-browser rooms as a booking location (no app or account for guests); host controls (end-for-all, hand-off **and reclaim** host, attendee screen-share toggle), **meeting recording** straight to your own **Litestream backup bucket** (the same one you already use for DB backup — no extra storage to provision) with in-app downloads, **recording consent** (notice + consent-or-leave), and an **AI notetaker** (Deepgram transcript → LLM notes). Headless-consumable: MCP `get_meeting_notes`/`get_transcript` + `recording.completed`/`transcript.ready`/`notes.ready` webhooks. BYO LiveKit endpoint (Cloud or self-hosted); configured in Settings → Video — see [docs/VIDEO.md](docs/VIDEO.md) -- **9 languages** on every booker-facing surface - booking page, manage/reschedule page, +- **11 languages** on every booker-facing surface - booking page, manage/reschedule page, embed widget, all four emails, and the calendar invite: **English · Spanish · French · - Canadian French · German · Italian · Portuguese · Dutch · Swedish**. Picked from + Canadian French · German · Greek · Italian · Dutch · Polish · Portuguese · Swedish**. Picked from `Accept-Language` with a footer switcher and an operator-set fallback language; the booker's choice is stored on the booking, so reminders arrive in the language they booked in. Adding a language is adding one JSON file - no code change. *(The admin UI and the built-in video room are - English-only. Non-English translations are machine drafts without native review - + English-only. Most non-English translations are machine drafts and none has had a full + native review; Polish was contributed and grammar-checked by a native speaker - corrections by PR are very welcome.)* - Embeddable booking widget (Shadow-DOM web component; inline + popup) - Members, roles (owner/admin/member), email-token invitations diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index ccf2b8d0..73d63b6a 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -987,11 +987,14 @@ Each account can set `booking_accent` in its profile. The default preserves the patching. The **public** booking surfaces are unaffected and are verified on mobile; this is admin-only. Deferred 2026-08-22, not a regression. - **LiveKit room is not translated** - the booking surfaces, emails and calendar invites - ship in 9 languages (§23), but the in-browser meeting UI is ~45 hardcoded English + ship in 11 languages (§23), but the in-browser meeting UI is ~45 hardcoded English strings. It has its own vanilla-JS asset pipeline and shares no string plumbing with the Go templates, so it needs a small runtime `t()` of its own. Separate work, not hard. -- **Plural rules are 2-form only** (§23) - shipping Polish, Russian or Arabic correctly - needs a real CLDR plural-category selector first. +- **Plural rules are 2-form only** (§23) - every plural-bearing key splits on `n == 1` and + nothing else. Polish ships despite that because its keys dodge the missing categories: + durations use invariant abbreviations (`godz.`, `min`), and `hostsLabel`'s + `other`/`others` pair (`inny`/`innych`) is correct for every count. Russian or Arabic + genuinely do need a CLDR plural-category selector first. - **OAuth app verification** — the Google and Microsoft apps should go through publisher verification before wide public use to avoid "unverified app" warnings. @@ -1329,8 +1332,11 @@ Two traps: ### Translation quality -**Every non-English locale is an LLM draft with no native review.** The structure is -verified by the guards above; the *wording* is not. Register was chosen per language rather +**Most non-English locales are LLM drafts with no native review, and none has had a full +native read.** The structure is +verified by the guards above; the *wording* is not. `pl` is the partial exception: it was +contributed and grammar-checked by a native speaker in #216/#220, though two developer +edits (the CLDR date forms and `innych`) went in on top of his text. Register was chosen per language rather than uniformly (`fr`/`de`/`it`/`pt` formal, `es`/`nl`/`sv` informal), matching what business booking pages do in each market, but that too is unreviewed. Corrections via PR are welcome and are the expected path to improving them. Do not describe a language as production-quality From c5dd83d87df27275f4c3b58e765e1028bd2b4607 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 5 Nov 2026 07:24:14 +1300 Subject: [PATCH 214/250] ci(docker): only upload standalone binaries when a release will use them Since #112 the build job exports and packages the standalone binaries on every run, then uploads them as an artifact. Only the release job consumes that artifact, and it runs on a version tag or a dry-run dispatch, so every PR and branch push currently stores an archive nobody downloads. Gate just the upload. Export and packaging stay ungated on purpose: they are what proves the `standalone` stage still builds, and moving that check to release time is exactly the trap of a gate that cannot fail until it matters. The condition deliberately mirrors the release job's, including the workflow_dispatch dry run. A bare `startsWith(github.ref, 'refs/tags/v')` would make the dry-run rehearsal fail at download-artifact, which is the one path that exists to prove the release sequence works without cutting a tag. --- .github/workflows/docker-publish.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index dcf3edbe..52beaf75 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -128,7 +128,16 @@ jobs: cd dist/release sha256sum ./*.tar.gz > checksums.txt + # Only upload when a release job will consume the artifact. Exporting and + # packaging above stay ungated on purpose: they prove the `standalone` stage + # still builds on every PR, so a break is caught there rather than during a + # release. This step is the one that costs storage for nothing on PRs and + # branch pushes. + # + # The condition must match the `release` job exactly, including the + # workflow_dispatch dry run, or the rehearsal finds no artifact to download. - name: Upload standalone binaries + if: startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && inputs.dry_run) uses: actions/upload-artifact@v7 with: name: standalone-binaries From 8c88b41fedfc85e0754ae4a828c6976f18264631 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 5 Nov 2026 12:00:05 +1300 Subject: [PATCH 215/250] feat(i18n): allow partial locale catalogues, with a coverage floor A locale file had to be complete before it could merge: TestAllLocalesHaveTheSameKeys asserted exact set equality in both directions. The runtime never needed that - Locale.T already falls back to English per key (i18n.go:161) - so the only thing stopping an in-progress language from landing was the test. That mattered: nobody translates 169 strings in one sitting, and a volunteer who did 60 of them had nothing mergeable to show, which is the practical reason a community language never gets off the ground. The gate is now: no unknown keys, but missing keys are fine. - TestLocalesHaveNoUnknownKeys (was TestAllLocalesHaveTheSameKeys) An unknown key is still an error because it is always a typo or a rename and would render for nobody. A missing key is the fallback working as designed. The floor is the other half of the bargain. A mostly-English "German" booking page is worse for a booker than English, so a locale is offered to visitors - language switcher, Accept-Language matching, public API payload - only at or above MinCoverage (80% of the English keys). Below it the locale still loads and ?lang= still resolves, so whoever is translating it can check their work in place, and startup logs which locales are withheld and why. The floor carries headroom on purpose: the English catalogue grows, and growth can push a complete locale under the line, which should read as "chase the translators", not "lower the floor". TestSupportedLocales had to change too. It asserted len(SupportedLocales()) == len(locales), which only holds while every shipped locale is complete and would have failed the first time a translation landed in stages. No shipped locale changes: all 11 are complete, so offered == loaded == 11, and a test asserts nothing below the floor is ever in `supported`. --- CHANGELOG.md | 17 ++++++++ docs/ARCHITECTURE.md | 24 ++++++++++- internal/i18n/i18n.go | 40 +++++++++++++++++++ internal/i18n/i18n_test.go | 81 ++++++++++++++++++++++++++++++++++---- 4 files changed, 153 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac6426f4..45791e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,23 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Changed + +- **Partial locale catalogues are allowed, so a language can be translated in stages.** A + locale file no longer has to contain every English key before it can merge: a missing key + falls back to English at lookup time (`Locale.T`). This was previously blocked by + `TestAllLocalesHaveTheSameKeys`, which asserted exact set equality in both directions, so a + half-finished locale was unmergeable and a volunteer had to produce all 169 strings before + contributing anything. That is the practical reason community translations stall. + A locale is now offered to visitors - language switcher, `Accept-Language` matching and the + public API payload - only at or above `MinCoverage` (80% of the English keys), so nobody is + served a mostly-English booking page by accident. Below the floor `?lang=` still + resolves, so whoever is translating it can check their work, and startup logs which locales + are withheld and why. The unknown-key check survives as `TestLocalesHaveNoUnknownKeys`, + since a key English does not have is always a typo, and the floor is pinned by + `TestOfferedLocalesMeetCoverageFloor`. No shipped locale changes: all 11 are complete and + remain offered. + ## [0.13.0] - 2026-11-03 ### Added diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 73d63b6a..426cbb39 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -1308,9 +1308,28 @@ you is a key in the JSON instead (`internal/i18n/datetime.go`): `date_format`, ` `dow_short_*`, `month_short_*`. That also makes per-language date shape expressible - German carries its own `date_format` for the ordinal period ("Mo, 22. Jun 2026"). +A locale does **not** have to be complete to merge. Partial catalogues are supported: any +key a locale lacks falls back to English at lookup time (`Locale.T`), so a translation can +land in stages instead of in one block. The practical reason is that nobody translates 169 +strings in one sitting, and requiring completeness made an in-progress language +unmergeable - which is how community translations quietly die. + +The other half of that bargain is `MinCoverage` (80% of the English keys). A locale at or +above it is offered to visitors: the language switcher, `Accept-Language` matching and the +public API payload all read `SupportedLocales()`, which filters on it. A locale below the +floor still exists and `?lang=` still resolves, so whoever is translating it can +check their work in situ, but no visitor is served a mostly-English booking page by +accident. The floor is set with headroom because the English catalogue grows: adding +strings can push a locale under it, and that is the signal to chase the translators. +Startup logs a line for every locale it withholds and why. + Three guards police a new file (`go test ./internal/i18n/`): -- `TestAllLocalesHaveTheSameKeys` - no missing or unknown keys. +- `TestLocalesHaveNoUnknownKeys` - no key that English does not have. A missing key is + fine now (that is the fallback), but an unknown one is always a typo or a renamed key + and would render for nobody. This replaced `TestAllLocalesHaveTheSameKeys`, which + asserted set equality in both directions and therefore rejected the in-progress locales + the floor exists to support. - `TestAllLocalesHaveMatchingFormatVerbs` - uses `fmt` **itself** as the oracle, so a locale that drops or reorders a `%s`/`%d` fails the test instead of emitting `%!(EXTRA…)` to a booker. An earlier hand-rolled parser for this was unsound (it missed indexed verbs like @@ -1320,6 +1339,9 @@ Three guards police a new file (`go test ./internal/i18n/`): only check that can tell `dim.` from `dim`, or catch a 12h/24h call that is wrong for the language. It caught a real drift on first run (`es` had `sep` where CLDR says `sept`). +`TestOfferedLocalesMeetCoverageFloor` pins the invariant the three guards do not: nothing +below `MinCoverage` is ever in `supported`. + Two traps: - **Filenames must be BCP-47 canonical.** `pt-br.json` is wrong - `language.Make("pt-br")` diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go index 44ad0eaa..8c7270a0 100644 --- a/internal/i18n/i18n.go +++ b/internal/i18n/i18n.go @@ -11,6 +11,7 @@ import ( "embed" "encoding/json" "fmt" + "log" "sort" "golang.org/x/text/language" @@ -23,6 +24,23 @@ var localeFS embed.FS // DefaultCode is the fallback locale when nothing else matches. const DefaultCode = "en" +// MinCoverage is the fraction of English keys a locale must carry before it is offered +// to visitors (language switcher, Accept-Language matching, public API payload). +// +// Locales may now be translated incrementally: a locale file does not have to be +// complete to merge, and any key it lacks falls back to English at lookup time (see +// Locale.T). That is what makes an outside contribution worth landing at all - nobody +// completes 169 strings in one sitting, and a half-finished locale used to be +// unmergeable. The floor is the other half of that bargain: a mostly-English "German" +// booking page is worse for a booker than English, so a locale below this is kept out +// of the picker entirely rather than half-offered. Get() still returns it, so an +// explicit ?lang= works for whoever is translating it. +// +// Set with headroom, because the English catalogue grows: at 0.8 a locale survives +// roughly a fifth more English keys before it drops out, which is the signal to chase +// the translators rather than a reason to panic. +const MinCoverage = 0.8 + // Locale holds one language's resolved string table. type Locale struct { Code string @@ -81,12 +99,34 @@ func init() { supportedCodes = append(supportedCodes, DefaultCode) supported = append(supported, language.Make(DefaultCode)) for _, code := range otherCodes { + // A partial catalogue is allowed to exist and to be merged (see MinCoverage), + // but it is not offered to visitors until it is substantially translated. + if !offeredToVisitors(locales[code]) { + log.Printf("i18n: locale %q is %.0f%% translated (floor %.0f%%); not offered to visitors - ?lang=%s still works", + code, Coverage(locales[code])*100, MinCoverage*100, code) + continue + } supportedCodes = append(supportedCodes, code) supported = append(supported, language.Make(code)) } matcher = language.NewMatcher(supported) } +// Coverage reports how much of the English catalogue a locale carries, as a fraction. +// English is 1 by definition; a locale with keys English does not have can exceed 1, +// which TestLocalesHaveNoUnknownKeys prevents in practice. +func Coverage(l *Locale) float64 { + en := Default() + if l == nil || en == nil || len(en.strings) == 0 { + return 0 + } + return float64(len(l.strings)) / float64(len(en.strings)) +} + +// offeredToVisitors is the single place the floor is applied, so init and the tests +// cannot disagree about what "offered" means. +func offeredToVisitors(l *Locale) bool { return Coverage(l) >= MinCoverage } + // Default returns the fallback (English) locale. func Default() *Locale { return locales[DefaultCode] } diff --git a/internal/i18n/i18n_test.go b/internal/i18n/i18n_test.go index e3afc581..7ad6423b 100644 --- a/internal/i18n/i18n_test.go +++ b/internal/i18n/i18n_test.go @@ -93,8 +93,19 @@ func TestJSON_roundTrips(t *testing.T) { func TestSupportedLocales(t *testing.T) { opts := SupportedLocales() - if len(opts) != len(locales) { - t.Fatalf("SupportedLocales() returned %d entries, want %d", len(opts), len(locales)) + // Every locale at or above the coverage floor is offered, and nothing below it is. + // This used to assert len(opts) == len(locales), which is only true while every + // shipped locale is complete; with partial catalogues allowed that invariant is + // wrong, and it would fail the first time a translation landed in stages. + want := 0 + for _, l := range locales { + if offeredToVisitors(l) { + want++ + } + } + if len(opts) != want { + t.Fatalf("SupportedLocales() returned %d entries, want %d (locales at or above the %.0f%% floor)", + len(opts), want, MinCoverage*100) } if opts[0].Code != DefaultCode { t.Errorf("SupportedLocales()[0] = %q, want English (%q) first", opts[0].Code, DefaultCode) @@ -258,17 +269,21 @@ func TestFormatDateTime(t *testing.T) { } } -func TestAllLocalesHaveTheSameKeys(t *testing.T) { +// TestLocalesHaveNoUnknownKeys is the half of the old completeness gate that still +// matters. A locale no longer has to be complete to merge: partial catalogues are +// allowed, and a key a locale lacks falls back to English at lookup time (Locale.T), so +// a translator can land a language in stages instead of in one unmergeable 169-string +// block. What remains an error is a key English does not have - that is always a typo or +// a renamed key, it renders for nobody, and it would otherwise rot silently. +// +// The old test asserted set equality in both directions. Dropping the "missing key" half +// is the point of this change; see MinCoverage for the guard that replaces it. +func TestLocalesHaveNoUnknownKeys(t *testing.T) { en := Default() for code, l := range locales { if code == DefaultCode { continue } - for k := range en.strings { - if _, ok := l.strings[k]; !ok { - t.Errorf("locale %q is missing key %q (present in English)", code, k) - } - } for k := range l.strings { if _, ok := en.strings[k]; !ok { t.Errorf("locale %q has key %q that doesn't exist in English", code, k) @@ -277,6 +292,56 @@ func TestAllLocalesHaveTheSameKeys(t *testing.T) { } } +// TestOfferedLocalesMeetCoverageFloor pins the invariant the language switcher, the +// Accept-Language matcher and the public API payload all rely on: everything in +// `supported` is at or above MinCoverage. A locale below the floor must be reachable +// only by an explicit code (?lang=), never offered to a visitor who did not ask for it. +func TestOfferedLocalesMeetCoverageFloor(t *testing.T) { + if len(supportedCodes) == 0 { + t.Fatal("no supported locales") + } + for _, code := range supportedCodes { + cov := Coverage(locales[code]) + if cov < MinCoverage { + t.Errorf("offered locale %q is %.0f%% translated, below the %.0f%% floor", + code, cov*100, MinCoverage*100) + } + } + if supportedCodes[0] != DefaultCode { + t.Errorf("English must stay first in supported (matcher fallback), got %q", supportedCodes[0]) + } +} + +// TestCoverageFloorHidesPartialLocale exercises the decision itself with synthetic +// locales, so it does not depend on shipping a half-translated file to prove the rule. +func TestCoverageFloorHidesPartialLocale(t *testing.T) { + en := Default() + total := len(en.strings) + + partial := &Locale{Code: "xx", strings: make(map[string]string, total)} + for k := range en.strings { + if len(partial.strings) >= int(float64(total)*MinCoverage)-1 { + break + } + partial.strings[k] = "translated" + } + if offeredToVisitors(partial) { + t.Errorf("a locale just below the floor (%d/%d keys) must not be offered", len(partial.strings), total) + } + + full := &Locale{Code: "xy", strings: make(map[string]string, total)} + for k, v := range en.strings { + full.strings[k] = v + } + if !offeredToVisitors(full) { + t.Error("a complete locale must be offered") + } + + if got := Coverage(nil); got != 0 { + t.Errorf("Coverage(nil) = %v, want 0", got) + } +} + // enFormatArgs derives probe arguments for an English format string by walking its // printf verbs. It only ever parses ENGLISH — the strings we author and control, which // use plain %s/%d/%q or clean %[n]-indexed forms. Translations are never parsed; they're From 5047429d4f63d7f780edba4d95faa95277104336 Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 5 Nov 2026 13:14:10 +1300 Subject: [PATCH 216/250] feat(i18n): coverage report, a translator guide, and a glossary The gate change removes the barrier; this is what makes it usable without a platform. - `cmd/i18n-coverage` (also `make i18n-coverage`) prints, per catalogue and per language, how many keys are present, the coverage percentage and whether the language is offered or withheld. It reads both catalogues and skips the admin one until it exists, so it works today and keeps working after #217. Informational only: the tests in internal/i18n remain the gate. CI runs it so a translation PR shows its progress in the log. - CONTRIBUTING now says a language does not have to be complete, what the 80% floor means, and what passing tests does not prove (wording, agreement, spliced sentences). It also points at the glossary. - docs/i18n-glossary.md fixes one word per concept per language, filled from the shipped catalogues rather than invented, and marks the places where the booker and admin French currently disagree so they are decisions rather than drift. --- .github/workflows/ci.yml | 6 ++ CONTRIBUTING.md | 47 ++++++++---- Makefile | 7 +- cmd/i18n-coverage/main.go | 154 ++++++++++++++++++++++++++++++++++++++ docs/i18n-glossary.md | 64 ++++++++++++++++ 5 files changed, 261 insertions(+), 17 deletions(-) create mode 100644 cmd/i18n-coverage/main.go create mode 100644 docs/i18n-glossary.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1305c115..57f1756d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -128,3 +128,9 @@ jobs: - name: go test run: go test ./... + + # Informational, never fails: the tests in internal/i18n are the gate. This prints + # per-language coverage so a translation PR shows up in the log with its progress, + # and so a language falling under the floor is visible before a user meets it. + - name: Translation coverage + run: go run ./cmd/i18n-coverage diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb3fcad8..86538c89 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -74,9 +74,9 @@ prefer additive, nullable/defaulted columns. ## Translations -Calnode ships 11 locales (`en es fr fr-CA de el it nl pl pt sv`) across the booker-facing surfaces: +Calnode ships 11 locales (`en es fr fr-CA de el it nl pl pt sv`) on the booker-facing surfaces: booking page, manage/reschedule page, embed widget, the four emails, and the calendar -invite. The admin UI and the built-in video room are English-only. +invite. The admin SPA has its own catalogue, in progress. **Translation PRs are very welcome** - both new languages and corrections to existing ones. **Most non-English locales are machine drafts with no native review, and none has @@ -84,24 +84,39 @@ had a full native read** (Polish was contributed and grammar-checked by a native speaker), so if you speak one of them, fixes are genuinely valuable and will be merged readily. Small, single-language PRs are easier to review than sweeping ones. -**Adding a language is adding one file:** `internal/i18n/locales/.json`. No Go, -template, or frontend change is needed - `init()` globs the directory, and the language -switcher, the fallback-language setting and the public API payload all read -`SupportedLocales()`. - -1. Copy `internal/i18n/locales/en.json` and translate the values. Keep every key, keep - the key order (it keeps diffs readable), and keep printf verbs (`%s`, `%d`, `%q`) - intact - reordering them is fine with indexed verbs (`%[2]s`), dropping them is not. -2. Name the file **BCP-47 canonical**: `pt-BR.json`, never `pt-br.json`. -3. `dow_short_*`, `month_short_*`, `date_format` and `clock_format` are data, not code - +A language is **one file, and it does not have to be complete.** + +1. Copy `internal/i18n/locales/en.json` to `internal/i18n/locales/.json` and translate + the values. Delete the keys you have not got to yet if that helps; a missing key falls + back to English at lookup time, so a partial file is mergeable and useful. +2. Keep the keys spelled exactly as English has them. A key that is not in `en.json` fails + the build (`TestLocalesHaveNoUnknownKeys`), because it is always a typo and renders for + nobody. +3. Keep printf verbs intact: `%s`, `%d`, `%q`. Reordering is fine with indexed verbs + (`%[2]s`); dropping one is not. In the admin catalogue the placeholders are `{name}`. +4. Name the file **BCP-47 canonical**: `pt-BR.json`, never `pt-br.json`. +5. `dow_short_*`, `month_short_*`, `date_format` and `clock_format` are data, not code - Go has no locale date tables. Match CLDR; the test below checks you against `Intl`. -4. Run `go test ./internal/i18n/`. Three guards will tell you exactly what is wrong: - key parity, printf-verb parity (with `fmt` as the oracle), and a CLDR cross-check of - the date tables (needs `node` on PATH; skipped if absent). -5. Eyeball the result: `go run ./cmd/calnode`, then +6. Run `go test ./internal/i18n/` and `make i18n-coverage` to see where you stand. +7. Eyeball the result: `go run ./cmd/calnode`, then `http://localhost:3000/book/?lang=` and the manage page. Long words overflowing buttons is the usual surprise; check mobile width too. +**When a language is offered.** A language appears in the switcher, and is matched from +`Accept-Language`, only at or above 80% of the English keys (`i18n.MinCoverage`). Below the +floor it still resolves with `?lang=`, so you can check your work in place, and +startup logs which languages are withheld. The floor exists because a mostly-English +booking page is worse for a booker than English is. + +**What passing tests does not prove.** They check structure, not wording. Before a language +is advertised, a speaker should read the booking page, the manage page and the four emails +end to end. The usual misses are literal calques, agreement when two translated sentences +are spliced together, and plurals written as flat strings. + +Terminology is agreed in [`docs/i18n-glossary.md`](docs/i18n-glossary.md). Add your +language's column there rather than inventing a second word for something that already has +one. + Background and the full list of limitations (2-form plurals, no RTL) are in [ARCHITECTURE.md §23](docs/ARCHITECTURE.md). diff --git a/Makefile b/Makefile index b2975719..63930971 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: frontend backend build +.PHONY: frontend backend build i18n-coverage frontend: cd frontend && pnpm install && pnpm build @@ -7,3 +7,8 @@ backend: frontend go build -o calnode ./cmd/calnode build: backend + +# Per-language translation coverage, for both catalogues. Informational; the tests in +# internal/i18n are the gate. +i18n-coverage: + go run ./cmd/i18n-coverage diff --git a/cmd/i18n-coverage/main.go b/cmd/i18n-coverage/main.go new file mode 100644 index 00000000..f5e0886e --- /dev/null +++ b/cmd/i18n-coverage/main.go @@ -0,0 +1,154 @@ +// Command i18n-coverage prints how much of each catalogue every shipped language +// carries. +// +// It is a progress report, not a gate: the tests in internal/i18n are what fail a +// build. This exists because a translator needs to see 512/1324 rather than guess, and +// a reviewer needs to see whether a language is close enough to offer before reading it. +// +// Run it from the repository root: +// +// go run ./cmd/i18n-coverage +// make i18n-coverage +package main + +import ( + "encoding/json" + "flag" + "fmt" + "os" + "path/filepath" + "sort" + "strings" + + "github.com/calnode/calnode/internal/i18n" +) + +type catalogue struct { + name string + dir string + // floor is the coverage below which the language is not offered to visitors. + // Zero means "no floor for this catalogue yet". + floor float64 +} + +const sourceCode = "en" + +func main() { + root := flag.String("root", ".", "repository root") + flag.Parse() + + catalogues := []catalogue{ + {name: "booker (public surfaces)", dir: "internal/i18n/locales", floor: i18n.MinCoverage}, + {name: "admin (SPA)", dir: "frontend/src/lib/i18n", floor: 0}, + } + + for _, c := range catalogues { + if err := report(*root, c); err != nil { + fmt.Fprintf(os.Stderr, "i18n-coverage: %s: %v\n", c.dir, err) + os.Exit(1) + } + } +} + +func report(root string, c catalogue) error { + dir := filepath.Join(root, c.dir) + entries, err := os.ReadDir(dir) + if os.IsNotExist(err) { + fmt.Printf("%s\n %s does not exist yet, skipped\n\n", c.name, c.dir) + return nil + } + if err != nil { + return err + } + + source, err := load(filepath.Join(dir, sourceCode+".json")) + if err != nil { + return err + } + if len(source) == 0 { + return fmt.Errorf("%s has no strings", filepath.Join(dir, sourceCode+".json")) + } + + type row struct { + code string + keys int + cover float64 + unknown int + } + var rows []row + for _, e := range entries { + if e.IsDir() || !strings.HasSuffix(e.Name(), ".json") { + continue + } + code := strings.TrimSuffix(e.Name(), ".json") + strings_, err := load(filepath.Join(dir, e.Name())) + if err != nil { + return err + } + r := row{code: code, keys: len(strings_)} + for k := range strings_ { + if _, ok := source[k]; ok { + r.cover++ + } else { + r.unknown++ + } + } + r.cover = float64(r.cover) / float64(len(source)) + rows = append(rows, r) + } + sort.Slice(rows, func(i, j int) bool { return rows[i].code < rows[j].code }) + + fmt.Printf("%s\n %s (source %s.json, %d keys)\n\n", c.name, c.dir, sourceCode, len(source)) + fmt.Printf(" %-7s %6s %8s %10s %8s\n", "code", "keys", "coverage", "status", "unknown") + for _, r := range rows { + status := "source" + switch { + case r.code == sourceCode: + case r.unknown > 0: + status = "has unknown keys" + case c.floor > 0 && r.cover < c.floor: + status = "withheld" + default: + status = "offered" + } + fmt.Printf(" %-7s %6d %7.0f%% %10s %8d\n", r.code, r.keys, r.cover*100, status, r.unknown) + } + if c.floor > 0 { + fmt.Printf("\n floor: %.0f%% (below it a language is not offered; ?lang= still works)\n", c.floor*100) + } + fmt.Println() + return nil +} + +// load reads one catalogue file and returns its flattened key set. Nested objects are +// joined with dots, so the admin catalogue's plural members count individually +// ("common.save", "teams.memberCount.one", ...). Arrays are not used in either +// catalogue and are skipped rather than guessed at. +func load(path string) (map[string]struct{}, error) { + b, err := os.ReadFile(path) + if err != nil { + return nil, err + } + var raw map[string]any + if err := json.Unmarshal(b, &raw); err != nil { + return nil, fmt.Errorf("%s: %w", path, err) + } + out := map[string]struct{}{} + flatten("", raw, out) + return out, nil +} + +func flatten(prefix string, v any, out map[string]struct{}) { + switch t := v.(type) { + case map[string]any: + for k, child := range t { + key := k + if prefix != "" { + key = prefix + "." + k + } + flatten(key, child, out) + } + case string: + out[prefix] = struct{}{} + } +} diff --git a/docs/i18n-glossary.md b/docs/i18n-glossary.md new file mode 100644 index 00000000..2ee884b5 --- /dev/null +++ b/docs/i18n-glossary.md @@ -0,0 +1,64 @@ +# Translation glossary + +One concept, one word, per language. The point is that a booking does not become a +"rendez-vous" on one screen and a "réservation" on the next, and that a new translator does +not have to invent terminology that is already decided. + +**How to use it** + +- Before translating a term, look it up here. If it is missing, add it with its key. +- The values below were read from the shipped catalogues, not invented. If a catalogue + disagrees with this table, the table is wrong and should be fixed in the same PR. +- **Adding a language means adding a column.** Do not introduce a second word for a concept + that already has one. +- Two catalogues exist: the **booker** surfaces (`internal/i18n/locales`) and the **admin** + SPA (`frontend/src/lib/i18n`). They are separate systems with separate registers, and they + currently disagree in places. Those rows are marked **divergent** and are decisions, not + accidents. + +## Core terms + +| Concept | English | French (booker) | French (admin) | Notes | +|---|---|---|---|---| +| booking (the object) | booking | réservation | réservation | Never "rendez-vous" for the object. | +| to book (verb) | book | réserver | réserver | | +| event type | event type | - | type de rendez-vous | **divergent**: the booker has no public name for it. | +| host | host | - | hôte | The booker addresses the booker, not the host. | +| attendee / booker | attendee | - | participant | Use "participant" in admin; the booker is "vous". | +| team | team | équipe | équipe | | +| team member | team member | membre de l'équipe | membre | | +| availability | availability | disponibilités | disponibilités | Plural in French. | +| slot / time slot | slot | créneau | créneau | | +| timezone | timezone | fuseau horaire | fuseau horaire | | +| reschedule | reschedule | reprogrammer | reprogrammer | Noun: "reprogrammation". | +| cancel | cancel | annuler | annuler | Noun: "annulation". | +| round robin | round robin | - | tourniquet | French admin uses "tourniquet"; do not calque "tourner entre eux". | +| reminder | reminder | rappel | rappel | | +| directory | directory | - | annuaire | Only the person and team pages. | + +## Register + +| Surface | Register | Reason | +|---|---|---| +| Booker | Formal, second person plural (`vous`) | A customer booking a call from a business page. | +| Admin | Formal (`vous`), terse | An operator working in the tool all day. | + +The existing booker locales are deliberately split by market: `fr`/`de`/`it`/`pt` formal, +`es`/`nl`/`sv` informal. Match the language, not the English. + +## Things that are not translated + +Brand names, URLs, protocol tokens (`STARTTLS`, `RSVP`, `PII`), third-party console labels +("APIs & Services", "Authorised redirect URIs"), and code identifiers. Translating those is +almost always a mistake; leave them byte-identical. + +## Placeholders + +Never translate a placeholder. `%s`, `%d`, `%q` (booker) and `{name}` (admin) must survive +verbatim, and a missing one is a runtime bug rather than a stylistic choice. The tests check +this, but a test cannot see that you moved a word into the wrong place. + +## Cross-references + +- `CONTRIBUTING.md` - how to add or extend a language +- `docs/ARCHITECTURE.md` §23 - how the catalogue system works and its limitations From 5ce4d71d7c53e78fa79d2a2bd2402bf9be11e0bd Mon Sep 17 00:00:00 2001 From: Wynne Pirini Date: Thu, 5 Nov 2026 13:23:13 +1300 Subject: [PATCH 217/250] chore(i18n): annotate the coverage tool's file reads for gosec gosec flags os.ReadFile with a variable path as G304 (file inclusion). Here the path is the repository root the tool was invoked from plus a fixed catalogue name: a developer report, never served, with no untrusted input. Annotated with the reason, matching the repo's convention that every finding carries a #nosec justification. Verified locally: gosec reports 0 issues for the package. --- cmd/i18n-coverage/main.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/i18n-coverage/main.go b/cmd/i18n-coverage/main.go index f5e0886e..0f13662c 100644 --- a/cmd/i18n-coverage/main.go +++ b/cmd/i18n-coverage/main.go @@ -125,6 +125,9 @@ func report(root string, c catalogue) error { // ("common.save", "teams.memberCount.one", ...). Arrays are not used in either // catalogue and are skipped rather than guessed at. func load(path string) (map[string]struct{}, error) { + // #nosec G304 -- path is the repository root this developer tool was invoked from + // plus a fixed catalogue name; there is no untrusted input, and this binary is never + // served. It reports on files a contributor is already editing. b, err := os.ReadFile(path) if err != nil { return nil, err From 1bf5a7eb0a3a0d03d68727281a61432482d617c7 Mon Sep 17 00:00:00 2001 From: Michel EDIGHOFFER Date: Tue, 3 Nov 2026 00:21:40 +0000 Subject: [PATCH 218/250] feat(admin): add French localization of the admin UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The SvelteKit admin is no longer English-only. A small client-side catalog (English source of truth, French by a native speaker) drives chrome, list pages, the event-type editor, settings, and auth screens. Locale is chosen in Settings → Profile (localStorage) with a navigator.languages fallback; missing keys fall back to English. Dates and times follow the admin locale. The LiveKit room and booker-facing catalogs are unchanged. --- CHANGELOG.md | 9 + CONTRIBUTING.md | 24 +- docs/ARCHITECTURE.md | 27 +- .../src/lib/components/demo-banner.svelte | 18 +- .../components/event-types/EmbedPanel.svelte | 20 +- .../event-types/QuestionsPanel.svelte | 99 +- .../components/ui/calendar/calendar.svelte | 11 +- .../components/ui/combobox/combobox.svelte | 14 +- .../ui/confirm-dialog/confirm-dialog.svelte | 17 +- .../ui/date-picker/date-picker.svelte | 9 +- .../ui/dialog/dialog-content.svelte | 3 +- frontend/src/lib/i18n/catalog.test.ts | 99 + frontend/src/lib/i18n/catalog.ts | 97 + frontend/src/lib/i18n/en.json | 1889 +++++++++++++++++ frontend/src/lib/i18n/fr.json | 1889 +++++++++++++++++ frontend/src/lib/i18n/i18n.test.ts | 99 + frontend/src/lib/i18n/index.ts | 84 + frontend/src/lib/prefs.ts | 10 +- frontend/src/routes/+layout.svelte | 81 +- frontend/src/routes/+page.svelte | 43 +- frontend/src/routes/api-keys/+page.svelte | 45 +- frontend/src/routes/availability/+page.svelte | 143 +- frontend/src/routes/bookings/+page.svelte | 172 +- frontend/src/routes/calendar/+page.svelte | 157 +- frontend/src/routes/claim/+page.svelte | 19 +- frontend/src/routes/connections/+page.svelte | 44 +- frontend/src/routes/event-types/+page.svelte | 97 +- .../routes/event-types/[slug]/+page.svelte | 516 +++-- .../src/routes/forgot-password/+page.svelte | 23 +- .../src/routes/invite/[token]/+page.svelte | 24 +- frontend/src/routes/login/+page.svelte | 63 +- frontend/src/routes/members/+page.svelte | 174 +- frontend/src/routes/recordings/+page.svelte | 121 +- .../src/routes/reset-password/+page.svelte | 25 +- frontend/src/routes/settings/+layout.svelte | 33 +- frontend/src/routes/settings/ai/+page.svelte | 80 +- .../src/routes/settings/branding/+page.svelte | 118 +- .../src/routes/settings/email/+page.svelte | 157 +- .../src/routes/settings/google/+page.svelte | 87 +- .../settings/notifications/+page.svelte | 33 +- .../src/routes/settings/payments/+page.svelte | 70 +- .../src/routes/settings/profile/+page.svelte | 109 +- .../src/routes/settings/storage/+page.svelte | 72 +- .../src/routes/settings/tracking/+page.svelte | 118 +- .../src/routes/settings/video/+page.svelte | 104 +- .../src/routes/settings/zoom/+page.svelte | 72 +- frontend/src/routes/teams/+page.svelte | 81 +- frontend/src/routes/webhooks/+page.svelte | 152 +- frontend/tsconfig.json | 3 +- frontend/vitest.config.ts | 1 + 50 files changed, 5805 insertions(+), 1650 deletions(-) create mode 100644 frontend/src/lib/i18n/catalog.test.ts create mode 100644 frontend/src/lib/i18n/catalog.ts create mode 100644 frontend/src/lib/i18n/en.json create mode 100644 frontend/src/lib/i18n/fr.json create mode 100644 frontend/src/lib/i18n/i18n.test.ts create mode 100644 frontend/src/lib/i18n/index.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 45791e8d..8fab0761 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,15 @@ exact tag (`ghcr.io/calnode/calnode:0.1.0`) if you need stability between upgrad ## [Unreleased] +### Added +- **French localization of the admin UI.** The SvelteKit admin (`frontend/`) now has a + lightweight i18n layer (`frontend/src/lib/i18n/`) with English as the source of truth + and a complete French catalog written by a native speaker. The language is chosen in + Settings → Profile (remembered in the browser) and falls back to the browser language, + then to English. Dates and times in the admin follow that locale. Public booking pages + and emails still use the existing 11-locale booker catalogs; the LiveKit room stays + English. + ### Changed - **Partial locale catalogues are allowed, so a language can be translated in stages.** A diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 86538c89..afa1b8e6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,15 +76,21 @@ prefer additive, nullable/defaulted columns. Calnode ships 11 locales (`en es fr fr-CA de el it nl pl pt sv`) on the booker-facing surfaces: booking page, manage/reschedule page, embed widget, the four emails, and the calendar -invite. The admin SPA has its own catalogue, in progress. +invite. The admin SPA is translated separately (`en` + `fr` today). The built-in video +room is still English-only. **Translation PRs are very welcome** - both new languages and corrections to existing ones. **Most non-English locales are machine drafts with no native review, and none has had a full native read** (Polish was contributed and grammar-checked by a native speaker), so if you speak one of them, fixes are genuinely valuable and will be merged -readily. Small, single-language PRs are easier to review than sweeping ones. +readily. Small, single-language PRs are easier to review than sweeping ones. The admin +French catalog was written by a native speaker. -A language is **one file, and it does not have to be complete.** +**Adding a booker-facing language is adding one file, and it does not have to be complete:** +`internal/i18n/locales/.json`. No Go, template, or frontend change is needed - +`init()` globs the directory. The language switcher, the fallback-language setting and the +public API payload all read `SupportedLocales()`, which only lists locales at or above the +coverage floor (see below). 1. Copy `internal/i18n/locales/en.json` to `internal/i18n/locales/.json` and translate the values. Delete the keys you have not got to yet if that helps; a missing key falls @@ -117,6 +123,18 @@ Terminology is agreed in [`docs/i18n-glossary.md`](docs/i18n-glossary.md). Add y language's column there rather than inventing a second word for something that already has one. +**Adding an admin-UI language** is a small frontend change (the catalogs are not globbed): + +1. Copy `frontend/src/lib/i18n/en.json` to `.json` and translate the values. Keep + every key and any `{placeholders}`. English is the source of truth; missing keys fall + back to English at runtime. +2. Register the new file in `frontend/src/lib/i18n/catalog.ts` (`catalogs` + `ADMIN_LOCALES`). +3. Name the code the same way as booker locales: BCP-47 primary tag (`fr`, `de`). +4. The operator picks the language in Settings → Profile → Preferences (stored in + `localStorage`, with `navigator.languages` as the first-visit fallback). +5. Run the catalog tests (`node --experimental-strip-types --test src/lib/i18n/catalog.test.ts` + from `frontend/`). `pnpm test:visual` also runs the same assertions via Vitest. + Background and the full list of limitations (2-form plurals, no RTL) are in [ARCHITECTURE.md §23](docs/ARCHITECTURE.md). diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 426cbb39..1982ee6d 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -1247,7 +1247,8 @@ picks the exact tag first (pinned in `TestResolve`). ### What is translated, and what is not -Translation covers the surfaces a **booker** sees. It deliberately stops there. +Translation covers the surfaces a **booker** sees, and the admin SPA through its own +catalog. It deliberately stops at the LiveKit room and at content the operator wrote. | Surface | Translated? | |---|---| @@ -1257,12 +1258,22 @@ Translation covers the surfaces a **booker** sees. It deliberately stops there. | The four emails (confirm / cancel / reschedule / reminder) | yes | | Calendar invite title + description | yes | | Conversational booking assistant | yes (replies in the visitor's language) | -| **Admin SPA** (`frontend/`) | **no** - English only, by design | +| **Admin SPA** (`frontend/`) | **yes** - `en` + `fr` (`frontend/src/lib/i18n/`); English is source of truth | | **LiveKit room** (`livekit-room.html` + `livekit-room.js`) | **no** - see below | | **Admin-authored content** (event names, descriptions, intake questions, custom email copy) | **no** - stored as the operator typed it | | IANA timezone identifiers | no - shown as `Europe/Berlin`, not localized | -**The LiveKit room is the one real hole.** ~45 strings in the in-browser meeting UI +The admin SPA is a separate catalog from the booker locales. `frontend/src/lib/i18n/` +ships nested JSON (`en.json` source of truth, `fr.json` a native-speaker translation). +`t` / `tr` look up a dotted key, interpolate `{placeholders}`, and fall back to English +then to the key itself. Locale resolution is client-side: a stored preference +(`localStorage` key `calnode-admin-locale`, set from Settings → Profile → Preferences) +wins, then `navigator.languages` (`fr-CA` → `fr`), then English. Dates and times in the +admin use `Intl` with that tag; the operator's existing `date_format` / `time_format` / +`week_start` prefs still apply. Adding an admin locale is copy-the-JSON plus two +registrations in `catalog.ts` — see CONTRIBUTING.md. + +**The LiveKit room is the remaining hole.** ~45 strings in the in-browser meeting UI (join/leave, mute, screen share, recording banner, consent prompts, chat) are hardcoded English. It was excluded because the room is vanilla JS with its own asset pipeline (`go:embed`-ed in the handler package, not the SPA build) and shares no template or string @@ -1383,6 +1394,13 @@ emails end to end. This doc tracks the code; when you change behaviour in an area above, update the matching section in the same PR. Notable rounds: +- **2026-11-02 — Admin SPA i18n (`en` + `fr`).** The SvelteKit admin (`frontend/`) is no + longer English-only. A small client-side catalog in `frontend/src/lib/i18n/` drives + chrome, list pages, the event-type editor, settings, and auth screens. Locale comes + from Settings → Profile (stored in `localStorage`) with a browser-language fallback; + missing keys fall back to English. Booker-facing locales (`internal/i18n/locales`) + are unchanged. The LiveKit room stays English (§18). + - **2026-08-20 — Multi-language public surfaces (8 locales).** Booking page, manage page, embed widget, the four emails, the calendar invite and the booking assistant now render in `en es fr de it pt nl sv` (new §23). Locale is negotiated from `Accept-Language` with a @@ -1390,7 +1408,8 @@ matching section in the same PR. Notable rounds: (migration 00051) so reminders match the language the booker used. Adding a language is adding one JSON file - proven by adding six at once with no code change. Go has no locale date data, so the date tables are keys in the JSON, cross-checked against `Intl`/CLDR by a - node-backed test. **Not translated: the admin SPA and the LiveKit room** (§18). + node-backed test. **Not translated at the time: the admin SPA and the LiveKit room** + (§18). The admin SPA gained `en`/`fr` in 2026-11; the room is still English. - **2026-06-30 — Cookie consent + legal links + shared book/manage partials.** Native GA4/GTM (Settings → Tracking) is now consent-gated on book.html **and** manage.html: diff --git a/frontend/src/lib/components/demo-banner.svelte b/frontend/src/lib/components/demo-banner.svelte index 8ee0fb3b..2a95b5d3 100644 --- a/frontend/src/lib/components/demo-banner.svelte +++ b/frontend/src/lib/components/demo-banner.svelte @@ -4,6 +4,7 @@ import { authStatus } from '$lib/stores'; import { Button } from '$lib/components/ui/button'; import { ConfirmDialog } from '$lib/components/ui/confirm-dialog'; + import { t, tr } from '$lib/i18n'; let resetOpen = $state(false); let resetting = $state(false); @@ -12,10 +13,10 @@ resetting = true; try { await api.post('/v1/demo/reset'); - toast.success('Demo reset — reloading…'); + toast.success(tr('demo.toast.resetSuccess')); window.location.href = '/admin/'; } catch (e: any) { - toast.error(e.message ?? 'Reset failed'); + toast.error(e.message ?? tr('demo.toast.resetFailed')); } finally { resetting = false; } @@ -24,23 +25,22 @@

    - Public demo — data here is visible to everyone and resets - automatically. Don't enter anything private. + {$t('demo.banner.title')} — {$t('demo.banner.body')} - View source + {$t('demo.banner.viewSource')}

    diff --git a/frontend/src/lib/components/event-types/EmbedPanel.svelte b/frontend/src/lib/components/event-types/EmbedPanel.svelte index a19312f2..0bb161c5 100644 --- a/frontend/src/lib/components/event-types/EmbedPanel.svelte +++ b/frontend/src/lib/components/event-types/EmbedPanel.svelte @@ -2,6 +2,7 @@ import { page } from '$app/stores'; import { Button } from '$lib/components/ui/button'; import { toast } from 'svelte-sonner'; + import { t, tr } from '$lib/i18n'; let { slug }: { slug: string } = $props(); @@ -12,23 +13,28 @@ `
    -

    Embed

    -

    Drop this booking widget on your website — it renders inline, no iframe. Paste before </body>.

    +

    {$t('eventTypeEditor.embed.title')}

    +

    {$t('eventTypeEditor.embed.subtitle')}

    - {#each [{ key: 'inline', label: 'Inline', hint: 'Embeds the booking calendar directly in the page.', code: inlineSnippet }, { key: 'popup', label: 'Popup button', hint: 'A button that opens the booking widget in a modal.', code: popupSnippet }] as snip} + {#each snippets as snip}
    @@ -36,12 +42,12 @@ {snip.hint}
    {snip.code}
    {/each} -

    The widget calls this instance's public booking API. To restrict which sites may embed it, set EMBED_ALLOWED_ORIGINS.

    +

    {$t('eventTypeEditor.embed.footer')}

    diff --git a/frontend/src/lib/components/event-types/QuestionsPanel.svelte b/frontend/src/lib/components/event-types/QuestionsPanel.svelte index 910016ac..8036ff9b 100644 --- a/frontend/src/lib/components/event-types/QuestionsPanel.svelte +++ b/frontend/src/lib/components/event-types/QuestionsPanel.svelte @@ -10,14 +10,15 @@ import * as Select from '$lib/components/ui/select'; import * as Tooltip from '$lib/components/ui/tooltip'; import { toast } from 'svelte-sonner'; + import { t, tr } from '$lib/i18n'; let { slug }: { slug: string } = $props(); - const QUESTION_TYPES = [ - { value: 'text', label: 'Text' }, - { value: 'checkbox', label: 'Checkbox (yes/no)' }, - { value: 'select', label: 'Dropdown' }, - ]; + const QUESTION_TYPES = $derived([ + { value: 'text', label: $t('eventTypeEditor.questions.types.text') }, + { value: 'checkbox', label: $t('eventTypeEditor.questions.types.checkbox') }, + { value: 'select', label: $t('eventTypeEditor.questions.types.select') }, + ]); let questions: Question[] = $state([]); let qLoading = $state(true); @@ -36,7 +37,7 @@ const res = await api.get<{ items: Question[] }>(`/v1/event-types/${slug}/questions/admin`); questions = (res.items ?? []).sort((a, b) => a.position - b.position); } catch (e: any) { - toast.error(e.message || 'Could not load questions'); + toast.error(e.message || tr('eventTypeEditor.questions.error.load')); } finally { qLoading = false; } @@ -55,9 +56,9 @@ } async function addQuestion() { - if (!qForm.label.trim()) { toast.error('Label is required.'); return; } + if (!qForm.label.trim()) { toast.error(tr('eventTypeEditor.questions.validation.label')); return; } if (qForm.type === 'select' && optionsArray(qForm.options).length === 0) { - toast.error('At least one option is required for dropdown questions.'); return; + toast.error(tr('eventTypeEditor.questions.validation.options')); return; } qAdding = true; try { @@ -70,7 +71,7 @@ qForm = { label: '', type: 'text', options: '', required: false }; await loadQuestions(); } catch (e: any) { - toast.error(e.message || 'Could not add question'); + toast.error(e.message || tr('eventTypeEditor.questions.error.add')); } finally { qAdding = false; } @@ -84,9 +85,9 @@ function cancelEditQ() { editingQId = null; } async function saveQuestion(q: Question) { - if (!editQForm.label.trim()) { toast.error('Label is required.'); return; } + if (!editQForm.label.trim()) { toast.error(tr('eventTypeEditor.questions.validation.label')); return; } if (editQForm.type === 'select' && optionsArray(editQForm.options).length === 0) { - toast.error('At least one option is required.'); return; + toast.error(tr('eventTypeEditor.questions.validation.optionsShort')); return; } qSaving = true; try { @@ -99,7 +100,7 @@ editingQId = null; await loadQuestions(); } catch (e: any) { - toast.error(e.message || 'Could not save question'); + toast.error(e.message || tr('eventTypeEditor.questions.error.save')); } finally { qSaving = false; } @@ -116,36 +117,40 @@ await api.del(`/v1/event-types/${slug}/questions/${pendingQ.id}`); await loadQuestions(); } catch (e: any) { - toast.error(e.message || 'Could not delete question'); + toast.error(e.message || tr('eventTypeEditor.questions.error.delete')); } } + + function typeLabel(value: string): string { + return QUESTION_TYPES.find((t) => t.value === value)?.label ?? value; + }
    -

    Intake Questions

    -

    Collect information from attendees when they book.

    +

    {$t('eventTypeEditor.questions.title')}

    +

    {$t('eventTypeEditor.questions.subtitle')}

    {#if qLoading} -

    Loading…

    +

    {$t('common.loading')}

    {:else if questions.length > 0} - - - - + + + + @@ -157,40 +162,40 @@
    #QuestionTypeRequired{$t('eventTypeEditor.questions.table.number')}{$t('eventTypeEditor.questions.table.question')}{$t('eventTypeEditor.questions.table.type')}{$t('eventTypeEditor.questions.table.required')}
    - +
    - + { if (v) editQForm.type = v as 'text'|'select'|'checkbox'; }}> - {QUESTION_TYPES.find((t) => t.value === editQForm.type)?.label ?? 'Select…'} + {QUESTION_TYPES.find((t) => t.value === editQForm.type)?.label ?? $t('common.select')} - {#each QUESTION_TYPES as t} - {t.label} + {#each QUESTION_TYPES as qt} + {qt.label} {/each}
    {#if editQForm.type === 'select'}
    - +