Compare commits

..

1 Commits

Author SHA1 Message Date
9184e76845 feat: add pre-commit hook for oxfmt
Set up husky and lint-staged to run oxfmt on staged files
before each commit.

Co-authored-by: Ona <no-reply@ona.com>
2026-04-12 17:46:08 +00:00
287 changed files with 865 additions and 7760 deletions

View File

@@ -0,0 +1,43 @@
---
name: gpg-commit-signing
description: Sign git commits with GPG in non-interactive environments. Use when committing code and the `GPG_PRIVATE_KEY_PASSPHRASE` environment variable is available. Triggers on "commit", "sign commit", "GPG", "git commit -S", or any git operation requiring signed commits.
---
# GPG Commit Signing
Sign commits in headless/non-interactive environments where `/dev/tty` is unavailable.
## Workflow
1. Check whether `GPG_PRIVATE_KEY_PASSPHRASE` is set:
```bash
test -n "$GPG_PRIVATE_KEY_PASSPHRASE" && echo "available" || echo "not set"
```
If not set, skip signing — commit without `-S`.
2. Try a direct signed commit first — the environment may already have loopback pinentry configured:
```bash
git commit -S -m "message"
```
If this succeeds, no further steps are needed.
3. If step 2 fails with a `/dev/tty` error, use `--pinentry-mode loopback` via a wrapper script:
```bash
printf '#!/bin/sh\ngpg --batch --pinentry-mode loopback --passphrase "$GPG_PRIVATE_KEY_PASSPHRASE" "$@"\n' > /tmp/gpg-sign.sh
chmod +x /tmp/gpg-sign.sh
git -c gpg.program=/tmp/gpg-sign.sh commit -S -m "message"
rm /tmp/gpg-sign.sh
```
This passes the passphrase directly to gpg on each signing invocation, bypassing the need for a configured gpg-agent.
## Anti-patterns
- Do not echo or log `GPG_PRIVATE_KEY_PASSPHRASE`.
- Do not commit without `-S` when the passphrase is available — the project expects signed commits.
- Do not leave wrapper scripts on disk after committing.

View File

@@ -11,7 +11,7 @@ on:
env: env:
REGISTRY: cr.nym.sh REGISTRY: cr.nym.sh
IMAGE_NAME: freya-waitlist-website IMAGE_NAME: aelis-waitlist-website
jobs: jobs:
build: build:

1
.husky/pre-commit Normal file
View File

@@ -0,0 +1 @@
bunx lint-staged

45
.ona/automations.yaml Normal file
View File

@@ -0,0 +1,45 @@
services:
expo:
name: Expo Dev Server
description: Expo development server for aelis-client
triggeredBy:
- postDevcontainerStart
commands:
start: cd apps/aelis-client && ./scripts/run-dev-server.sh
drizzle-studio:
name: Drizzle Studio
description: Drizzle Studio database browser for aelis-backend
triggeredBy:
- manual
commands:
start: |
FORWARD_URL=$(gitpod environment port open 4983 --name drizzle-studio-server | sed 's|https://||')
echo "Drizzle Studio: https://local.drizzle.studio/?host=${FORWARD_URL}&port=443"
cd apps/aelis-backend && bunx drizzle-kit studio --host 0.0.0.0 --port 4983
aelis-backend:
name: Aelis Backend
description: Hono API server for aelis-backend (port 3000)
triggeredBy:
- manual
commands:
start: |
gitpod --context environment environment port open 3000 --name "Aelis Backend" --protocol http
TS_IP=$(tailscale ip -4)
echo ""
echo "------------------ Bun Debugger ------------------"
echo "https://debug.bun.sh/#${TS_IP}:6499"
echo "------------------ Bun Debugger ------------------"
echo ""
cd apps/aelis-backend && bun run dev
admin-dashboard:
name: Admin Dashboard
description: Vite dev server for admin-dashboard (port 5174)
triggeredBy:
- manual
commands:
start: |
gitpod --context environment environment port open 5174 --name "Admin Dashboard" --protocol http
cd apps/admin-dashboard && bun run dev --host

View File

@@ -2,7 +2,7 @@
## Project ## Project
FREYA is an AI-powered personal assistant that aggregates data from various sources into a contextual feed. Monorepo with `packages/` (shared libraries) and `apps/` (applications). AELIS is an AI-powered personal assistant that aggregates data from various sources into a contextual feed. Monorepo with `packages/` (shared libraries) and `apps/` (applications).
## Commands ## Commands

View File

@@ -1,4 +1,4 @@
# freya # aelis
To install dependencies: To install dependencies:
@@ -8,14 +8,14 @@ bun install
## Packages ## Packages
### @freya/source-tfl ### @aelis/source-tfl
TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts. TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.
#### Testing #### Testing
```bash ```bash
cd packages/freya-source-tfl cd packages/aelis-source-tfl
bun run test bun run test
``` ```

View File

@@ -71,7 +71,7 @@ export function LoginPage({ onLogin }: LoginPageProps) {
type="email" type="email"
value={email} value={email}
onChange={(e) => setEmail(e.target.value)} onChange={(e) => setEmail(e.target.value)}
placeholder="admin@freya.local" placeholder="admin@aelis.local"
required required
/> />
</div> </div>

View File

@@ -1,639 +0,0 @@
import type { Dispatch, FormEvent, SetStateAction } from "react"
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
import { Check, Loader2, Pencil, Plus, RefreshCw, RotateCcw, Save, Trash2, X } from "lucide-react"
import { useMemo, useState } from "react"
import { toast } from "sonner"
import type { FeedItem } from "@/lib/api"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select"
import { Switch } from "@/components/ui/switch"
import { executeSourceAction, fetchFeed } from "@/lib/api"
const REMINDER_SOURCE_ID = "freya.reminders"
type ReminderPriority = "low" | "normal" | "high"
type ReminderFrequency = "daily" | "weekly" | "monthly" | "yearly"
type ReminderEditScope = "this-occurrence" | "this-and-future" | "entire-series"
interface ReminderRecurrence {
frequency: ReminderFrequency
interval: number
count?: number
until?: string
}
interface ReminderFeedData extends Record<string, unknown> {
reminderId: string
occurrenceId: string
title: string
notes: string | null
originalDueAt: string
dueAt: string
timeZone: string
recurrence: ReminderRecurrence | null
priority: ReminderPriority
completedAt: string | null
}
interface ReminderFormState {
title: string
notes: string
dueAt: string
priority: ReminderPriority
scope: ReminderEditScope
recurs: boolean
frequency: ReminderFrequency
interval: string
count: string
until: string
}
const emptyForm: ReminderFormState = {
title: "",
notes: "",
dueAt: toLocalInput(new Date()),
priority: "normal",
scope: "entire-series",
recurs: false,
frequency: "daily",
interval: "1",
count: "",
until: "",
}
export function ReminderCrudPanel() {
const queryClient = useQueryClient()
const [form, setForm] = useState<ReminderFormState>(emptyForm)
const [editing, setEditing] = useState<ReminderFeedData | null>(null)
const [deleteScopes, setDeleteScopes] = useState<Record<string, ReminderEditScope>>({})
const {
data: feed,
isFetching,
refetch,
} = useQuery({
queryKey: ["feed"],
queryFn: fetchFeed,
})
const reminders = useMemo(
() => (feed?.items ?? []).filter(isReminderItem).map((item) => item.data),
[feed],
)
const actionMutation = useMutation({
mutationFn: (input: { actionId: string; params: unknown }) =>
executeSourceAction(REMINDER_SOURCE_ID, input.actionId, input.params),
})
const busy = actionMutation.isPending
const canConfigureRecurrence = !editing || form.scope !== "this-occurrence"
async function runAction(actionId: string, params: unknown, success: string): Promise<boolean> {
try {
await actionMutation.mutateAsync({ actionId, params })
await queryClient.invalidateQueries({ queryKey: ["feed"] })
toast.success(success)
return true
} catch (err) {
toast.error(err instanceof Error ? err.message : String(err))
return false
}
}
async function handleSubmit(event: FormEvent<HTMLFormElement>) {
event.preventDefault()
if (editing) {
const patch = formToPatch(formFromReminder(editing), form)
if (Object.keys(patch).length === 0) {
toast.info("No changes to save")
return
}
const saved = await runAction(
"update-reminder",
{
reminderId: editing.reminderId,
scope: form.scope,
occurrenceDueAt: editing.originalDueAt,
patch,
},
"Reminder updated",
)
if (saved) resetForm()
return
} else {
const created = await runAction(
"create-reminder",
formToCreatePayload(form),
"Reminder created",
)
if (created) resetForm()
}
}
function startEdit(reminder: ReminderFeedData) {
setEditing(reminder)
setForm(formFromReminder(reminder))
}
function resetForm() {
setEditing(null)
setForm({ ...emptyForm, dueAt: toLocalInput(new Date()) })
}
function getDeleteScope(reminder: ReminderFeedData): ReminderEditScope {
return (
deleteScopes[reminderKey(reminder)] ??
(reminder.recurrence ? "this-occurrence" : "entire-series")
)
}
function setDeleteScope(reminder: ReminderFeedData, scope: ReminderEditScope) {
setDeleteScopes((prev) => ({ ...prev, [reminderKey(reminder)]: scope }))
}
return (
<Card className="-mx-4">
<CardHeader className="pb-4">
<div className="flex items-center justify-between gap-3">
<CardTitle className="text-sm">Reminders</CardTitle>
<Button size="sm" variant="outline" onClick={() => refetch()} disabled={isFetching}>
{isFetching ? (
<Loader2 className="size-3.5 animate-spin" />
) : (
<RefreshCw className="size-3.5" />
)}
Refresh
</Button>
</div>
</CardHeader>
<CardContent className="space-y-5">
<form className="grid gap-4" onSubmit={handleSubmit}>
<div className="grid gap-3 sm:grid-cols-2">
<div className="space-y-2 sm:col-span-2">
<Label htmlFor="reminder-title" className="text-xs font-medium">
Title
</Label>
<Input
id="reminder-title"
value={form.title}
onChange={(event) => setFormField(setForm, "title", event.target.value)}
disabled={busy}
required
/>
</div>
<div className="space-y-2 sm:col-span-2">
<Label htmlFor="reminder-notes" className="text-xs font-medium">
Notes
</Label>
<Input
id="reminder-notes"
value={form.notes}
onChange={(event) => setFormField(setForm, "notes", event.target.value)}
disabled={busy}
/>
</div>
<div className="space-y-2">
<Label htmlFor="reminder-due-at" className="text-xs font-medium">
Due
</Label>
<Input
id="reminder-due-at"
type="datetime-local"
value={form.dueAt}
onChange={(event) => setFormField(setForm, "dueAt", event.target.value)}
disabled={busy}
required
/>
</div>
<div className="space-y-2">
<Label htmlFor="reminder-priority" className="text-xs font-medium">
Priority
</Label>
<Select
value={form.priority}
onValueChange={(value) =>
setFormField(setForm, "priority", value as ReminderPriority)
}
disabled={busy}
>
<SelectTrigger id="reminder-priority">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="low">Low</SelectItem>
<SelectItem value="normal">Normal</SelectItem>
<SelectItem value="high">High</SelectItem>
</SelectContent>
</Select>
</div>
{editing?.recurrence && (
<div className="space-y-2 sm:col-span-2">
<Label htmlFor="reminder-edit-scope" className="text-xs font-medium">
Edit scope
</Label>
<Select
value={form.scope}
onValueChange={(value) =>
setFormField(setForm, "scope", value as ReminderEditScope)
}
disabled={busy}
>
<SelectTrigger id="reminder-edit-scope">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="this-occurrence">This occurrence</SelectItem>
<SelectItem value="this-and-future">This and future</SelectItem>
<SelectItem value="entire-series">Entire series</SelectItem>
</SelectContent>
</Select>
</div>
)}
</div>
{canConfigureRecurrence && (
<div className="grid gap-3 rounded-md border p-3 sm:grid-cols-4">
<div className="flex items-center justify-between gap-3 sm:col-span-4">
<Label htmlFor="reminder-recurs" className="text-xs font-medium">
Recurring
</Label>
<Switch
id="reminder-recurs"
checked={form.recurs}
onCheckedChange={(checked) => setFormField(setForm, "recurs", checked)}
disabled={busy}
/>
</div>
{form.recurs && (
<>
<div className="space-y-2 sm:col-span-2">
<Label htmlFor="reminder-frequency" className="text-xs font-medium">
Frequency
</Label>
<Select
value={form.frequency}
onValueChange={(value) =>
setFormField(setForm, "frequency", value as ReminderFrequency)
}
disabled={busy}
>
<SelectTrigger id="reminder-frequency">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="daily">Daily</SelectItem>
<SelectItem value="weekly">Weekly</SelectItem>
<SelectItem value="monthly">Monthly</SelectItem>
<SelectItem value="yearly">Yearly</SelectItem>
</SelectContent>
</Select>
</div>
<div className="space-y-2">
<Label htmlFor="reminder-interval" className="text-xs font-medium">
Interval
</Label>
<Input
id="reminder-interval"
type="number"
min={1}
value={form.interval}
onChange={(event) => setFormField(setForm, "interval", event.target.value)}
disabled={busy}
/>
</div>
<div className="space-y-2">
<Label htmlFor="reminder-count" className="text-xs font-medium">
Count
</Label>
<Input
id="reminder-count"
type="number"
min={1}
value={form.count}
onChange={(event) => setFormField(setForm, "count", event.target.value)}
disabled={busy}
/>
</div>
<div className="space-y-2 sm:col-span-4">
<Label htmlFor="reminder-until" className="text-xs font-medium">
Until
</Label>
<Input
id="reminder-until"
type="datetime-local"
value={form.until}
onChange={(event) => setFormField(setForm, "until", event.target.value)}
disabled={busy}
/>
</div>
</>
)}
</div>
)}
<div className="flex justify-end gap-2">
{editing && (
<Button type="button" variant="outline" onClick={resetForm} disabled={busy}>
<X className="size-3.5" />
Cancel
</Button>
)}
<Button type="submit" disabled={busy || !form.title || !form.dueAt}>
{busy ? <Loader2 className="size-3.5 animate-spin" /> : <Save className="size-3.5" />}
{editing ? "Update" : "Create"}
</Button>
</div>
</form>
<div className="space-y-2">
<div className="flex items-center justify-between text-xs text-muted-foreground">
<span>
{reminders.length} {reminders.length === 1 ? "occurrence" : "occurrences"}
</span>
{!editing && (
<Button size="sm" variant="ghost" onClick={resetForm} disabled={busy}>
<Plus className="size-3.5" />
New
</Button>
)}
</div>
{reminders.length === 0 && (
<div className="rounded-md border border-dashed px-3 py-6 text-center text-sm text-muted-foreground">
No reminders in the current feed.
</div>
)}
{reminders.map((reminder) => {
const deleteScope = getDeleteScope(reminder)
return (
<ReminderRow
key={reminderKey(reminder)}
reminder={reminder}
busy={busy}
deleteScope={deleteScope}
onDeleteScopeChange={(scope) => setDeleteScope(reminder, scope)}
onEdit={() => startEdit(reminder)}
onComplete={() =>
runAction(
reminder.completedAt ? "uncomplete-reminder" : "complete-reminder",
{
reminderId: reminder.reminderId,
occurrenceDueAt: reminder.originalDueAt,
},
reminder.completedAt ? "Reminder reopened" : "Reminder completed",
)
}
onDelete={() => {
if (
!confirm(
`Delete ${formatScope(deleteScope).toLowerCase()} for "${reminder.title}"?`,
)
) {
return
}
void runAction(
"delete-reminder",
{
reminderId: reminder.reminderId,
scope: deleteScope,
occurrenceDueAt: reminder.originalDueAt,
},
"Reminder deleted",
).then((deleted) => {
if (deleted && editing?.reminderId === reminder.reminderId) resetForm()
})
}}
/>
)
})}
</div>
</CardContent>
</Card>
)
}
function ReminderRow({
reminder,
busy,
deleteScope,
onDeleteScopeChange,
onEdit,
onComplete,
onDelete,
}: {
reminder: ReminderFeedData
busy: boolean
deleteScope: ReminderEditScope
onDeleteScopeChange: (scope: ReminderEditScope) => void
onEdit: () => void
onComplete: () => void
onDelete: () => void
}) {
return (
<div className="flex items-start justify-between gap-3 rounded-md border px-3 py-2">
<div className="min-w-0 space-y-1">
<div className="flex flex-wrap items-center gap-2">
<span className="truncate text-sm font-medium">{reminder.title}</span>
<Badge variant={reminder.completedAt ? "secondary" : "outline"} className="text-xs">
{reminder.completedAt ? "Done" : reminder.priority}
</Badge>
{reminder.recurrence && (
<Badge variant="secondary" className="text-xs">
{formatRecurrence(reminder.recurrence)}
</Badge>
)}
</div>
<div className="text-xs text-muted-foreground">{formatDate(reminder.dueAt)}</div>
{reminder.notes && <div className="text-xs text-muted-foreground">{reminder.notes}</div>}
</div>
<div className="flex shrink-0 flex-wrap items-center justify-end gap-1">
{reminder.recurrence && (
<Select
value={deleteScope}
onValueChange={(value) => onDeleteScopeChange(value as ReminderEditScope)}
disabled={busy}
>
<SelectTrigger className="h-8 w-[86px] text-xs">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="this-occurrence">This</SelectItem>
<SelectItem value="this-and-future">Future</SelectItem>
<SelectItem value="entire-series">All</SelectItem>
</SelectContent>
</Select>
)}
<Button size="sm" variant="ghost" onClick={onComplete} disabled={busy}>
{reminder.completedAt ? (
<RotateCcw className="size-3.5" />
) : (
<Check className="size-3.5" />
)}
</Button>
<Button size="sm" variant="ghost" onClick={onEdit} disabled={busy}>
<Pencil className="size-3.5" />
</Button>
<Button size="sm" variant="ghost" onClick={onDelete} disabled={busy}>
<Trash2 className="size-3.5 text-destructive" />
</Button>
</div>
</div>
)
}
function formToCreatePayload(form: ReminderFormState): Record<string, unknown> {
return {
title: form.title.trim(),
notes: form.notes.trim() || null,
dueAt: toIsoString(form.dueAt),
timeZone: localTimeZone(),
priority: form.priority,
recurrence: recurrenceValueFromForm(form),
}
}
function formToPatch(initial: ReminderFormState, form: ReminderFormState): Record<string, unknown> {
const patch: Record<string, unknown> = {}
const title = form.title.trim()
const notes = form.notes.trim() || null
const initialNotes = initial.notes.trim() || null
if (title !== initial.title.trim()) patch.title = title
if (notes !== initialNotes) patch.notes = notes
if (form.dueAt !== initial.dueAt) {
patch.dueAt = toIsoString(form.dueAt)
patch.timeZone = localTimeZone()
}
if (form.priority !== initial.priority) patch.priority = form.priority
if (form.scope !== "this-occurrence" && recurrenceChanged(initial, form)) {
patch.recurrence = recurrenceValueFromForm(form)
}
return patch
}
function recurrenceValueFromForm(form: ReminderFormState): ReminderRecurrence | null {
return form.recurs ? recurrenceFromForm(form) : null
}
function recurrenceFromForm(form: ReminderFormState): ReminderRecurrence {
const recurrence: ReminderRecurrence = {
frequency: form.frequency,
interval: Math.max(1, Number(form.interval) || 1),
}
const count = Number(form.count)
if (Number.isInteger(count) && count > 0) recurrence.count = count
if (form.until) recurrence.until = toIsoString(form.until)
return recurrence
}
function formFromReminder(reminder: ReminderFeedData): ReminderFormState {
return {
title: reminder.title,
notes: reminder.notes ?? "",
dueAt: toLocalInput(new Date(reminder.dueAt)),
priority: reminder.priority,
scope: reminder.recurrence ? "this-occurrence" : "entire-series",
recurs: reminder.recurrence !== null,
frequency: reminder.recurrence?.frequency ?? "daily",
interval: String(reminder.recurrence?.interval ?? 1),
count: reminder.recurrence?.count ? String(reminder.recurrence.count) : "",
until: reminder.recurrence?.until ? toLocalInput(new Date(reminder.recurrence.until)) : "",
}
}
function setFormField<TKey extends keyof ReminderFormState>(
setForm: Dispatch<SetStateAction<ReminderFormState>>,
key: TKey,
value: ReminderFormState[TKey],
) {
setForm((prev) => ({ ...prev, [key]: value }))
}
function recurrenceChanged(initial: ReminderFormState, form: ReminderFormState): boolean {
return (
JSON.stringify(recurrenceValueFromForm(initial)) !==
JSON.stringify(recurrenceValueFromForm(form))
)
}
function reminderKey(reminder: ReminderFeedData): string {
return `${reminder.reminderId}:${reminder.occurrenceId}`
}
function isReminderItem(item: FeedItem): item is FeedItem & { data: ReminderFeedData } {
return (
item.sourceId === REMINDER_SOURCE_ID &&
typeof item.data.reminderId === "string" &&
typeof item.data.occurrenceId === "string" &&
typeof item.data.title === "string" &&
typeof item.data.originalDueAt === "string" &&
typeof item.data.dueAt === "string"
)
}
function toLocalInput(date: Date): string {
const offsetMs = date.getTimezoneOffset() * 60 * 1000
return new Date(date.getTime() - offsetMs).toISOString().slice(0, 16)
}
function toIsoString(value: string): string {
return new Date(value).toISOString()
}
function localTimeZone(): string {
return Intl.DateTimeFormat().resolvedOptions().timeZone
}
function formatDate(value: string): string {
return new Date(value).toLocaleString(undefined, {
month: "short",
day: "numeric",
hour: "numeric",
minute: "2-digit",
})
}
function formatRecurrence(recurrence: ReminderRecurrence): string {
return recurrence.interval === 1
? recurrence.frequency
: `${recurrence.frequency} / ${recurrence.interval}`
}
function formatScope(scope: ReminderEditScope): string {
switch (scope) {
case "this-occurrence":
return "this occurrence"
case "this-and-future":
return "this and future"
case "entire-series":
return "entire series"
}
}

View File

@@ -5,7 +5,6 @@ import { toast } from "sonner"
import type { ConfigFieldDef, SourceDefinition } from "@/lib/api" import type { ConfigFieldDef, SourceDefinition } from "@/lib/api"
import { ReminderCrudPanel } from "@/components/reminder-crud-panel"
import { Badge } from "@/components/ui/badge" import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card" import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
@@ -67,20 +66,6 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
return creds return creds
} }
function hasUserConfigFields(): boolean {
return Object.values(source.fields).some((field) => !isCredentialField(field))
}
function buildReplaceBody(enabledValue: boolean): Parameters<typeof replaceSource>[1] {
const body: Parameters<typeof replaceSource>[1] = { enabled: enabledValue }
if (hasUserConfigFields()) {
body.config = getUserConfig()
}
return body
}
function invalidate() { function invalidate() {
queryClient.invalidateQueries({ queryKey: ["sourceConfig", source.id] }) queryClient.invalidateQueries({ queryKey: ["sourceConfig", source.id] })
queryClient.invalidateQueries({ queryKey: ["configs"] }) queryClient.invalidateQueries({ queryKey: ["configs"] })
@@ -94,7 +79,10 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
(v) => typeof v === "string" && v.length > 0, (v) => typeof v === "string" && v.length > 0,
) )
const body = buildReplaceBody(enabled) const body: Parameters<typeof replaceSource>[1] = {
enabled,
config: getUserConfig(),
}
if (hasCredentials && source.perUserCredentials) { if (hasCredentials && source.perUserCredentials) {
body.credentials = credentialFields body.credentials = credentialFields
} }
@@ -116,7 +104,8 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
}) })
const toggleMutation = useMutation({ const toggleMutation = useMutation({
mutationFn: (checked: boolean) => replaceSource(source.id, buildReplaceBody(checked)), mutationFn: (checked: boolean) =>
replaceSource(source.id, { enabled: checked, config: getUserConfig() }),
onSuccess(_data, checked) { onSuccess(_data, checked) {
invalidate() invalidate()
toast.success(`Source ${checked ? "enabled" : "disabled"}`) toast.success(`Source ${checked ? "enabled" : "disabled"}`)
@@ -127,7 +116,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
}) })
const deleteMutation = useMutation({ const deleteMutation = useMutation({
mutationFn: () => replaceSource(source.id, buildReplaceBody(false)), mutationFn: () => replaceSource(source.id, { enabled: false, config: {} }),
onSuccess() { onSuccess() {
setDirty({}) setDirty({})
invalidate() invalidate()
@@ -258,7 +247,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
)} )}
{/* Always-on sources */} {/* Always-on sources */}
{source.alwaysEnabled && source.id !== "freya.location" && ( {source.alwaysEnabled && source.id !== "aelis.location" && (
<> <>
<Separator /> <Separator />
<p className="text-sm text-muted-foreground"> <p className="text-sm text-muted-foreground">
@@ -267,9 +256,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
</> </>
)} )}
{source.id === "freya.location" && <LocationCard />} {source.id === "aelis.location" && <LocationCard />}
{source.id === "freya.reminders" && enabled && <ReminderCrudPanel />}
</div> </div>
) )
} }
@@ -480,17 +467,6 @@ function FieldInput({
) )
} }
if (field.type === "boolean") {
return (
<div className="flex items-center justify-between gap-3 rounded-md border px-3 py-2">
<Label htmlFor={name} className="text-xs font-medium">
{labelContent}
</Label>
<Switch id={name} checked={value === true} onCheckedChange={onChange} disabled={disabled} />
</div>
)
}
return ( return (
<div className="space-y-2"> <div className="space-y-2">
<Label htmlFor={name} className="text-xs font-medium"> <Label htmlFor={name} className="text-xs font-medium">
@@ -518,8 +494,6 @@ function buildInitialValues(
values[name] = saved[name] values[name] = saved[name]
} else if (field.defaultValue !== undefined) { } else if (field.defaultValue !== undefined) {
values[name] = field.defaultValue values[name] = field.defaultValue
} else if (field.type === "boolean") {
values[name] = false
} else if (field.type === "multiselect") { } else if (field.type === "multiselect") {
values[name] = [] values[name] = []
} else { } else {

View File

@@ -9,12 +9,12 @@ function serverBase() {
} }
export interface ConfigFieldDef { export interface ConfigFieldDef {
type: "string" | "number" | "select" | "multiselect" | "boolean" type: "string" | "number" | "select" | "multiselect"
label: string label: string
required?: boolean required?: boolean
description?: string description?: string
secret?: boolean secret?: boolean
defaultValue?: string | number | string[] | boolean defaultValue?: string | number | string[]
options?: { label: string; value: string }[] options?: { label: string; value: string }[]
} }
@@ -36,14 +36,14 @@ export interface SourceConfig {
const sourceDefinitions: SourceDefinition[] = [ const sourceDefinitions: SourceDefinition[] = [
{ {
id: "freya.location", id: "aelis.location",
name: "Location", name: "Location",
description: "Device location provider. Always enabled as a dependency for other sources.", description: "Device location provider. Always enabled as a dependency for other sources.",
alwaysEnabled: true, alwaysEnabled: true,
fields: {}, fields: {},
}, },
{ {
id: "freya.weather", id: "aelis.weather",
name: "WeatherKit", name: "WeatherKit",
description: "Apple WeatherKit weather data. Requires Apple Developer credentials.", description: "Apple WeatherKit weather data. Requires Apple Developer credentials.",
fields: { fields: {
@@ -81,7 +81,7 @@ const sourceDefinitions: SourceDefinition[] = [
}, },
}, },
{ {
id: "freya.caldav", id: "aelis.caldav",
name: "CalDAV", name: "CalDAV",
description: "Calendar events from any CalDAV server (Nextcloud, Radicale, Baikal, etc.).", description: "Calendar events from any CalDAV server (Nextcloud, Radicale, Baikal, etc.).",
perUserCredentials: true, perUserCredentials: true,
@@ -119,7 +119,7 @@ const sourceDefinitions: SourceDefinition[] = [
}, },
}, },
{ {
id: "freya.tfl", id: "aelis.tfl",
name: "TfL", name: "TfL",
description: "Transport for London tube line status alerts.", description: "Transport for London tube line status alerts.",
fields: { fields: {
@@ -151,49 +151,6 @@ const sourceDefinitions: SourceDefinition[] = [
}, },
}, },
}, },
{
id: "freya.reminders",
name: "Reminders",
description: "One-off and recurring reminders in the contextual feed.",
fields: {
lookAheadMs: {
type: "number",
label: "Look-ahead Milliseconds",
defaultValue: 24 * 60 * 60 * 1000,
description: "How far into the future reminders should appear in the feed.",
},
lookBackMs: {
type: "number",
label: "Look-back Milliseconds",
defaultValue: 24 * 60 * 60 * 1000,
description: "How far into the past due reminders should remain visible.",
},
includeCompleted: {
type: "boolean",
label: "Include Completed",
defaultValue: false,
description: "Show completed reminder occurrences in the feed.",
},
defaultTimeZone: {
type: "string",
label: "Default Timezone",
defaultValue: "UTC",
description: "IANA timezone used when new reminders omit a timezone.",
},
},
},
{
id: "freya.web-search",
name: "Web Search",
description: "Exa web search action. Requires EXA_API_KEY on the backend.",
fields: {},
},
{
id: "freya.google-maps",
name: "Google Maps",
description: "Google Maps Grounding Lite MCP tools for places, weather, routes, and Place IDs.",
fields: {},
},
] ]
export function fetchSources(): Promise<SourceDefinition[]> { export function fetchSources(): Promise<SourceDefinition[]> {
@@ -217,7 +174,7 @@ export async function fetchConfigs(): Promise<SourceConfig[]> {
export async function replaceSource( export async function replaceSource(
sourceId: string, sourceId: string,
body: { enabled: boolean; config?: unknown; credentials?: Record<string, unknown> }, body: { enabled: boolean; config: unknown; credentials?: Record<string, unknown> },
): Promise<void> { ): Promise<void> {
const res = await fetch(`${serverBase()}/sources/${sourceId}`, { const res = await fetch(`${serverBase()}/sources/${sourceId}`, {
method: "PUT", method: "PUT",
@@ -263,25 +220,6 @@ export async function updateSourceCredentials(
} }
} }
export async function executeSourceAction(
sourceId: string,
actionId: string,
params: unknown,
): Promise<unknown> {
const res = await fetch(`${serverBase()}/sources/${sourceId}/actions/${actionId}`, {
method: "POST",
headers: { "Content-Type": "application/json" },
credentials: "include",
body: JSON.stringify(params),
})
if (!res.ok) {
const data = (await res.json()) as { error?: string }
throw new Error(data.error ?? `Failed to execute source action: ${res.status}`)
}
const data = (await res.json()) as { result: unknown }
return data.result
}
export interface LocationInput { export interface LocationInput {
lat: number lat: number
lng: number lng: number

View File

@@ -1,4 +1,4 @@
const STORAGE_KEY = "freya-server-url" const STORAGE_KEY = "aelis-server-url"
const DEFAULT_URL = "https://3000--019cf276-6ed6-7529-a425-210182693908.eu-runner.flex.doptig.cloud" const DEFAULT_URL = "https://3000--019cf276-6ed6-7529-a425-210182693908.eu-runner.flex.doptig.cloud"
export function getServerUrl(): string { export function getServerUrl(): string {

View File

@@ -8,7 +8,6 @@ import {
Link, Link,
} from "@tanstack/react-router" } from "@tanstack/react-router"
import { import {
Bell,
Calendar, Calendar,
CalendarDays, CalendarDays,
CircleDot, CircleDot,
@@ -16,7 +15,6 @@ import {
Loader2, Loader2,
TrainFront, TrainFront,
LogOut, LogOut,
Map as MapIcon,
MapPin, MapPin,
Rss, Rss,
Server, Server,
@@ -47,13 +45,11 @@ import { getSession, signOut } from "@/lib/auth"
import { Route as rootRoute } from "./__root" import { Route as rootRoute } from "./__root"
const SOURCE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = { const SOURCE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
"freya.location": MapPin, "aelis.location": MapPin,
"freya.weather": CloudSun, "aelis.weather": CloudSun,
"freya.caldav": CalendarDays, "aelis.caldav": CalendarDays,
"freya.google-calendar": Calendar, "aelis.google-calendar": Calendar,
"freya.google-maps": MapIcon, "aelis.tfl": TrainFront,
"freya.reminders": Bell,
"freya.tfl": TrainFront,
} }
export const Route = createRoute({ export const Route = createRoute({

View File

@@ -12,7 +12,6 @@ export default defineConfig({
}, },
}, },
server: { server: {
host: "0.0.0.0",
port: 5174, port: 5174,
allowedHosts: true, allowedHosts: true,
}, },

View File

@@ -49,33 +49,6 @@ CREATE TABLE "user_sources" (
CONSTRAINT "user_sources_user_id_source_id_unique" UNIQUE("user_id","source_id") CONSTRAINT "user_sources_user_id_source_id_unique" UNIQUE("user_id","source_id")
); );
--> statement-breakpoint --> statement-breakpoint
CREATE TABLE "reminders" (
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"user_id" text NOT NULL,
"title" text NOT NULL,
"notes" text,
"due_at" timestamp NOT NULL,
"time_zone" text DEFAULT 'UTC' NOT NULL,
"recurrence" jsonb,
"priority" text DEFAULT 'normal' NOT NULL,
"created_at" timestamp DEFAULT now() NOT NULL,
"updated_at" timestamp DEFAULT now() NOT NULL
);
--> statement-breakpoint
CREATE TABLE "reminder_occurrence_overrides" (
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"user_id" text NOT NULL,
"reminder_id" uuid NOT NULL,
"occurrence_id" text NOT NULL,
"original_due_at" timestamp NOT NULL,
"patch" jsonb,
"completed_at" timestamp,
"deleted_at" timestamp,
"created_at" timestamp DEFAULT now() NOT NULL,
"updated_at" timestamp DEFAULT now() NOT NULL,
CONSTRAINT "reminder_occurrence_overrides_reminder_id_occurrence_id_unique" UNIQUE("reminder_id","occurrence_id")
);
--> statement-breakpoint
CREATE TABLE "verification" ( CREATE TABLE "verification" (
"id" text PRIMARY KEY NOT NULL, "id" text PRIMARY KEY NOT NULL,
"identifier" text NOT NULL, "identifier" text NOT NULL,
@@ -88,13 +61,6 @@ CREATE TABLE "verification" (
ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "user_sources" ADD CONSTRAINT "user_sources_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint ALTER TABLE "user_sources" ADD CONSTRAINT "user_sources_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "reminders" ADD CONSTRAINT "reminders_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "reminder_occurrence_overrides" ADD CONSTRAINT "reminder_occurrence_overrides_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "reminder_occurrence_overrides" ADD CONSTRAINT "reminder_occurrence_overrides_reminder_id_reminders_id_fk" FOREIGN KEY ("reminder_id") REFERENCES "public"."reminders"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
CREATE INDEX "account_userId_idx" ON "account" USING btree ("user_id");--> statement-breakpoint CREATE INDEX "account_userId_idx" ON "account" USING btree ("user_id");--> statement-breakpoint
CREATE INDEX "session_userId_idx" ON "session" USING btree ("user_id");--> statement-breakpoint CREATE INDEX "session_userId_idx" ON "session" USING btree ("user_id");--> statement-breakpoint
CREATE INDEX "reminders_user_id_due_at_idx" ON "reminders" USING btree ("user_id","due_at");--> statement-breakpoint CREATE INDEX "verification_identifier_idx" ON "verification" USING btree ("identifier");
CREATE INDEX "reminders_user_id_updated_at_idx" ON "reminders" USING btree ("user_id","updated_at");--> statement-breakpoint
CREATE INDEX "reminder_occurrence_overrides_user_id_reminder_id_idx" ON "reminder_occurrence_overrides" USING btree ("user_id","reminder_id");--> statement-breakpoint
CREATE INDEX "reminder_occurrence_overrides_user_id_original_due_at_idx" ON "reminder_occurrence_overrides" USING btree ("user_id","original_due_at");--> statement-breakpoint
CREATE INDEX "verification_identifier_idx" ON "verification" USING btree ("identifier");

View File

@@ -1,6 +1,6 @@
{ {
"id": "d963322c-77e2-4ac9-bd3c-ca544c85ae35", "id": "d8c59ec7-b686-41a7-a472-da29f3ab6727",
"prevId": "d8c59ec7-b686-41a7-a472-da29f3ab6727", "prevId": "00000000-0000-0000-0000-000000000000",
"version": "7", "version": "7",
"dialect": "postgresql", "dialect": "postgresql",
"tables": { "tables": {
@@ -346,29 +346,7 @@
"default": "now()" "default": "now()"
} }
}, },
"indexes": { "indexes": {},
"user_sources_user_id_enabled_idx": {
"name": "user_sources_user_id_enabled_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "enabled",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": { "foreignKeys": {
"user_sources_user_id_user_id_fk": { "user_sources_user_id_user_id_fk": {
"name": "user_sources_user_id_user_id_fk", "name": "user_sources_user_id_user_id_fk",
@@ -463,296 +441,6 @@
"policies": {}, "policies": {},
"checkConstraints": {}, "checkConstraints": {},
"isRLSEnabled": false "isRLSEnabled": false
},
"public.reminders": {
"name": "reminders",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"title": {
"name": "title",
"type": "text",
"primaryKey": false,
"notNull": true
},
"notes": {
"name": "notes",
"type": "text",
"primaryKey": false,
"notNull": false
},
"due_at": {
"name": "due_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true
},
"time_zone": {
"name": "time_zone",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'UTC'"
},
"recurrence": {
"name": "recurrence",
"type": "jsonb",
"primaryKey": false,
"notNull": false
},
"priority": {
"name": "priority",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'normal'"
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"reminders_user_id_due_at_idx": {
"name": "reminders_user_id_due_at_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "due_at",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
},
"reminders_user_id_updated_at_idx": {
"name": "reminders_user_id_updated_at_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "updated_at",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"reminders_user_id_user_id_fk": {
"name": "reminders_user_id_user_id_fk",
"tableFrom": "reminders",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.reminder_occurrence_overrides": {
"name": "reminder_occurrence_overrides",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"reminder_id": {
"name": "reminder_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"occurrence_id": {
"name": "occurrence_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"original_due_at": {
"name": "original_due_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true
},
"patch": {
"name": "patch",
"type": "jsonb",
"primaryKey": false,
"notNull": false
},
"completed_at": {
"name": "completed_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"deleted_at": {
"name": "deleted_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"reminder_occurrence_overrides_user_id_reminder_id_idx": {
"name": "reminder_occurrence_overrides_user_id_reminder_id_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "reminder_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
},
"reminder_occurrence_overrides_user_id_original_due_at_idx": {
"name": "reminder_occurrence_overrides_user_id_original_due_at_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "original_due_at",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"reminder_occurrence_overrides_user_id_user_id_fk": {
"name": "reminder_occurrence_overrides_user_id_user_id_fk",
"tableFrom": "reminder_occurrence_overrides",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"reminder_occurrence_overrides_reminder_id_reminders_id_fk": {
"name": "reminder_occurrence_overrides_reminder_id_reminders_id_fk",
"tableFrom": "reminder_occurrence_overrides",
"tableTo": "reminders",
"columnsFrom": [
"reminder_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {
"reminder_occurrence_overrides_reminder_id_occurrence_id_unique": {
"name": "reminder_occurrence_overrides_reminder_id_occurrence_id_unique",
"nullsNotDistinct": false,
"columns": [
"reminder_id",
"occurrence_id"
]
}
},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
} }
}, },
"enums": {}, "enums": {},
@@ -766,4 +454,4 @@
"schemas": {}, "schemas": {},
"tables": {} "tables": {}
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"id": "d8c59ec7-b686-41a7-a472-da29f3ab6727", "id": "d963322c-77e2-4ac9-bd3c-ca544c85ae35",
"prevId": "00000000-0000-0000-0000-000000000000", "prevId": "d8c59ec7-b686-41a7-a472-da29f3ab6727",
"version": "7", "version": "7",
"dialect": "postgresql", "dialect": "postgresql",
"tables": { "tables": {
@@ -346,7 +346,29 @@
"default": "now()" "default": "now()"
} }
}, },
"indexes": {}, "indexes": {
"user_sources_user_id_enabled_idx": {
"name": "user_sources_user_id_enabled_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "enabled",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": { "foreignKeys": {
"user_sources_user_id_user_id_fk": { "user_sources_user_id_user_id_fk": {
"name": "user_sources_user_id_user_id_fk", "name": "user_sources_user_id_user_id_fk",
@@ -441,296 +463,6 @@
"policies": {}, "policies": {},
"checkConstraints": {}, "checkConstraints": {},
"isRLSEnabled": false "isRLSEnabled": false
},
"public.reminders": {
"name": "reminders",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"title": {
"name": "title",
"type": "text",
"primaryKey": false,
"notNull": true
},
"notes": {
"name": "notes",
"type": "text",
"primaryKey": false,
"notNull": false
},
"due_at": {
"name": "due_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true
},
"time_zone": {
"name": "time_zone",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'UTC'"
},
"recurrence": {
"name": "recurrence",
"type": "jsonb",
"primaryKey": false,
"notNull": false
},
"priority": {
"name": "priority",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'normal'"
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"reminders_user_id_due_at_idx": {
"name": "reminders_user_id_due_at_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "due_at",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
},
"reminders_user_id_updated_at_idx": {
"name": "reminders_user_id_updated_at_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "updated_at",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"reminders_user_id_user_id_fk": {
"name": "reminders_user_id_user_id_fk",
"tableFrom": "reminders",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.reminder_occurrence_overrides": {
"name": "reminder_occurrence_overrides",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"reminder_id": {
"name": "reminder_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"occurrence_id": {
"name": "occurrence_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"original_due_at": {
"name": "original_due_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true
},
"patch": {
"name": "patch",
"type": "jsonb",
"primaryKey": false,
"notNull": false
},
"completed_at": {
"name": "completed_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"deleted_at": {
"name": "deleted_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"reminder_occurrence_overrides_user_id_reminder_id_idx": {
"name": "reminder_occurrence_overrides_user_id_reminder_id_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "reminder_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
},
"reminder_occurrence_overrides_user_id_original_due_at_idx": {
"name": "reminder_occurrence_overrides_user_id_original_due_at_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "original_due_at",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"reminder_occurrence_overrides_user_id_user_id_fk": {
"name": "reminder_occurrence_overrides_user_id_user_id_fk",
"tableFrom": "reminder_occurrence_overrides",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"reminder_occurrence_overrides_reminder_id_reminders_id_fk": {
"name": "reminder_occurrence_overrides_reminder_id_reminders_id_fk",
"tableFrom": "reminder_occurrence_overrides",
"tableTo": "reminders",
"columnsFrom": [
"reminder_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {
"reminder_occurrence_overrides_reminder_id_occurrence_id_unique": {
"name": "reminder_occurrence_overrides_reminder_id_occurrence_id_unique",
"nullsNotDistinct": false,
"columns": [
"reminder_id",
"occurrence_id"
]
}
},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
} }
}, },
"enums": {}, "enums": {},
@@ -744,4 +476,4 @@
"schemas": {}, "schemas": {},
"tables": {} "tables": {}
} }
} }

View File

@@ -17,4 +17,4 @@
"breakpoints": true "breakpoints": true
} }
] ]
} }

View File

@@ -1,5 +1,5 @@
{ {
"name": "@freya/backend", "name": "@aelis/backend",
"version": "0.0.0", "version": "0.0.0",
"type": "module", "type": "module",
"main": "src/server.ts", "main": "src/server.ts",
@@ -15,15 +15,12 @@
"create-admin": "bun run src/scripts/create-admin.ts" "create-admin": "bun run src/scripts/create-admin.ts"
}, },
"dependencies": { "dependencies": {
"@freya/core": "workspace:*", "@aelis/core": "workspace:*",
"@freya/source-caldav": "workspace:*", "@aelis/source-caldav": "workspace:*",
"@freya/source-google-calendar": "workspace:*", "@aelis/source-google-calendar": "workspace:*",
"@freya/source-google-maps": "workspace:*", "@aelis/source-location": "workspace:*",
"@freya/source-location": "workspace:*", "@aelis/source-tfl": "workspace:*",
"@freya/source-reminders": "workspace:*", "@aelis/source-weatherkit": "workspace:*",
"@freya/source-tfl": "workspace:*",
"@freya/source-weatherkit": "workspace:*",
"@freya/source-web-search": "workspace:*",
"@openrouter/sdk": "^0.9.11", "@openrouter/sdk": "^0.9.11",
"arktype": "^2.1.29", "arktype": "^2.1.29",
"better-auth": "^1", "better-auth": "^1",

View File

@@ -1,4 +1,4 @@
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
import { describe, expect, mock, test } from "bun:test" import { describe, expect, mock, test } from "bun:test"
import { Hono } from "hono" import { Hono } from "hono"
@@ -118,9 +118,9 @@ const validWeatherConfig = {
describe("PUT /api/admin/:sourceId/config", () => { describe("PUT /api/admin/:sourceId/config", () => {
test("returns 404 for unknown provider", async () => { test("returns 404 for unknown provider", async () => {
const { app } = createApp([createStubProvider("freya.location")]) const { app } = createApp([createStubProvider("aelis.location")])
const res = await app.request("/api/admin/freya.nonexistent/config", { const res = await app.request("/api/admin/aelis.nonexistent/config", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify({ key: "value" }), body: JSON.stringify({ key: "value" }),
@@ -132,9 +132,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
}) })
test("returns 404 for provider without runtime config support", async () => { test("returns 404 for provider without runtime config support", async () => {
const { app } = createApp([createStubProvider("freya.location")]) const { app } = createApp([createStubProvider("aelis.location")])
const res = await app.request("/api/admin/freya.location/config", { const res = await app.request("/api/admin/aelis.location/config", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify({ key: "value" }), body: JSON.stringify({ key: "value" }),
@@ -146,9 +146,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
}) })
test("returns 400 for invalid JSON body", async () => { test("returns 400 for invalid JSON body", async () => {
const { app } = createApp([createStubProvider("freya.weather")]) const { app } = createApp([createStubProvider("aelis.weather")])
const res = await app.request("/api/admin/freya.weather/config", { const res = await app.request("/api/admin/aelis.weather/config", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: "not json", body: "not json",
@@ -160,9 +160,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
}) })
test("returns 400 when weather config fails validation", async () => { test("returns 400 when weather config fails validation", async () => {
const { app } = createApp([createStubProvider("freya.weather")]) const { app } = createApp([createStubProvider("aelis.weather")])
const res = await app.request("/api/admin/freya.weather/config", { const res = await app.request("/api/admin/aelis.weather/config", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify({ credentials: { privateKey: 123 } }), body: JSON.stringify({ credentials: { privateKey: 123 } }),
@@ -174,11 +174,11 @@ describe("PUT /api/admin/:sourceId/config", () => {
}) })
test("returns 204 and applies valid weather config", async () => { test("returns 204 and applies valid weather config", async () => {
const { app, sessionManager } = createApp([createStubProvider("freya.weather")]) const { app, sessionManager } = createApp([createStubProvider("aelis.weather")])
const originalProvider = sessionManager.getProvider("freya.weather") const originalProvider = sessionManager.getProvider("aelis.weather")
const res = await app.request("/api/admin/freya.weather/config", { const res = await app.request("/api/admin/aelis.weather/config", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify(validWeatherConfig), body: JSON.stringify(validWeatherConfig),
@@ -187,9 +187,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
expect(res.status).toBe(204) expect(res.status).toBe(204)
// Provider was replaced with a new instance // Provider was replaced with a new instance
const provider = sessionManager.getProvider("freya.weather") const provider = sessionManager.getProvider("aelis.weather")
expect(provider).toBeDefined() expect(provider).toBeDefined()
expect(provider!.sourceId).toBe("freya.weather") expect(provider!.sourceId).toBe("aelis.weather")
expect(provider).not.toBe(originalProvider) expect(provider).not.toBe(originalProvider)
}) })
}) })

View File

@@ -60,7 +60,7 @@ async function handleUpdateProviderConfig(c: Context<Env>) {
} }
switch (sourceId) { switch (sourceId) {
case "freya.weather": { case "aelis.weather": {
const parsed = WeatherKitSourceProviderConfig(body) const parsed = WeatherKitSourceProviderConfig(body)
if (parsed instanceof type.errors) { if (parsed instanceof type.errors) {
return c.json({ error: parsed.summary }, 400) return c.json({ error: parsed.summary }, 400)

View File

@@ -79,7 +79,7 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
const user: AuthUser = { const user: AuthUser = {
id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn", id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
name: "Dev User", name: "Dev User",
email: "dev@freya.local", email: "dev@aelis.local",
emailVerified: true, emailVerified: true,
image: null, image: null,
createdAt: now, createdAt: now,
@@ -96,7 +96,7 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4", token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4",
expiresAt, expiresAt,
ipAddress: "127.0.0.1", ipAddress: "127.0.0.1",
userAgent: "freya-dev", userAgent: "aelis-dev",
createdAt: now, createdAt: now,
updatedAt: now, updatedAt: now,
} }

View File

@@ -5,8 +5,8 @@ import { CalDavSourceProvider } from "./provider.ts"
describe("CalDavSourceProvider", () => { describe("CalDavSourceProvider", () => {
const provider = new CalDavSourceProvider() const provider = new CalDavSourceProvider()
test("sourceId is freya.caldav", () => { test("sourceId is aelis.caldav", () => {
expect(provider.sourceId).toBe("freya.caldav") expect(provider.sourceId).toBe("aelis.caldav")
}) })
test("throws when credentials are null", async () => { test("throws when credentials are null", async () => {
@@ -68,7 +68,7 @@ describe("CalDavSourceProvider", () => {
const source = await provider.feedSourceForUser("user-1", config, credentials) const source = await provider.feedSourceForUser("user-1", config, credentials)
expect(source).toBeDefined() expect(source).toBeDefined()
expect(source.id).toBe("freya.caldav") expect(source.id).toBe("aelis.caldav")
}) })
test("returns CalDavSource with minimal config", async () => { test("returns CalDavSource with minimal config", async () => {
@@ -80,6 +80,6 @@ describe("CalDavSourceProvider", () => {
const source = await provider.feedSourceForUser("user-1", config, credentials) const source = await provider.feedSourceForUser("user-1", config, credentials)
expect(source).toBeDefined() expect(source).toBeDefined()
expect(source.id).toBe("freya.caldav") expect(source.id).toBe("aelis.caldav")
}) })
}) })

View File

@@ -1,4 +1,4 @@
import { CalDavSource } from "@freya/source-caldav" import { CalDavSource } from "@aelis/source-caldav"
import { type } from "arktype" import { type } from "arktype"
import type { FeedSourceProvider } from "../session/feed-source-provider.ts" import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
@@ -19,7 +19,7 @@ const caldavCredentials = type({
}) })
export class CalDavSourceProvider implements FeedSourceProvider { export class CalDavSourceProvider implements FeedSourceProvider {
readonly sourceId = "freya.caldav" readonly sourceId = "aelis.caldav"
readonly configSchema = caldavConfig readonly configSchema = caldavConfig
async feedSourceForUser( async feedSourceForUser(
@@ -33,12 +33,12 @@ export class CalDavSourceProvider implements FeedSourceProvider {
} }
if (!credentials) { if (!credentials) {
throw new InvalidSourceCredentialsError("freya.caldav", "No CalDAV credentials configured") throw new InvalidSourceCredentialsError("aelis.caldav", "No CalDAV credentials configured")
} }
const creds = caldavCredentials(credentials) const creds = caldavCredentials(credentials)
if (creds instanceof type.errors) { if (creds instanceof type.errors) {
throw new InvalidSourceCredentialsError("freya.caldav", creds.summary) throw new InvalidSourceCredentialsError("aelis.caldav", creds.summary)
} }
return new CalDavSource({ return new CalDavSource({

View File

@@ -0,0 +1,62 @@
import {
boolean,
customType,
index,
jsonb,
pgTable,
text,
timestamp,
unique,
uuid,
} from "drizzle-orm/pg-core"
// ---------------------------------------------------------------------------
// Better Auth core tables
// Re-exported from CLI-generated schema.
// Regenerate with: bunx --bun auth@latest generate --config auth.ts --output src/db/auth-schema.ts
// ---------------------------------------------------------------------------
export {
user,
session,
account,
verification,
userRelations,
sessionRelations,
accountRelations,
} from "./auth-schema.ts"
import { user } from "./auth-schema.ts"
// ---------------------------------------------------------------------------
// AELIS — per-user source configuration
// ---------------------------------------------------------------------------
const bytea = customType<{ data: Buffer }>({
dataType() {
return "bytea"
},
})
export const userSources = pgTable(
"user_sources",
{
id: uuid("id").primaryKey().defaultRandom(),
userId: text("user_id")
.notNull()
.references(() => user.id, { onDelete: "cascade" }),
sourceId: text("source_id").notNull(),
enabled: boolean("enabled").notNull().default(true),
config: jsonb("config").default({}),
credentials: bytea("credentials"),
createdAt: timestamp("created_at").notNull().defaultNow(),
updatedAt: timestamp("updated_at")
.notNull()
.defaultNow()
.$onUpdate(() => new Date()),
},
(t) => [
unique("user_sources_user_id_source_id_unique").on(t.userId, t.sourceId),
index("user_sources_user_id_enabled_idx").on(t.userId, t.enabled),
],
)

View File

@@ -1,6 +1,6 @@
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
import { contextKey } from "@freya/core" import { contextKey } from "@aelis/core"
import { describe, expect, mock, spyOn, test } from "bun:test" import { describe, expect, mock, spyOn, test } from "bun:test"
import { Hono } from "hono" import { Hono } from "hono"
@@ -244,7 +244,7 @@ describe("GET /api/feed", () => {
}) })
describe("GET /api/context", () => { describe("GET /api/context", () => {
const weatherKey = contextKey("freya.weather", "weather") const weatherKey = contextKey("aelis.weather", "weather")
const weatherData = { temperature: 20, condition: "Clear" } const weatherData = { temperature: 20, condition: "Clear" }
const contextEntries: readonly ContextEntry[] = [[weatherKey, weatherData]] const contextEntries: readonly ContextEntry[] = [[weatherKey, weatherData]]
@@ -274,7 +274,7 @@ describe("GET /api/context", () => {
const manager = new UserSessionManager({ db: fakeDb, providers: [] }) const manager = new UserSessionManager({ db: fakeDb, providers: [] })
const app = buildTestApp(manager) const app = buildTestApp(manager)
const res = await app.request('/api/context?key=["freya.weather","weather"]') const res = await app.request('/api/context?key=["aelis.weather","weather"]')
expect(res.status).toBe(401) expect(res.status).toBe(401)
}) })
@@ -332,7 +332,7 @@ describe("GET /api/context", () => {
test("returns 400 when match param is invalid", async () => { test("returns 400 when match param is invalid", async () => {
const { app } = await buildContextApp("user-1") const { app } = await buildContextApp("user-1")
const res = await app.request('/api/context?key=["freya.weather"]&match=invalid') const res = await app.request('/api/context?key=["aelis.weather"]&match=invalid')
expect(res.status).toBe(400) expect(res.status).toBe(400)
const body = (await res.json()) as { error: string } const body = (await res.json()) as { error: string }
@@ -343,7 +343,7 @@ describe("GET /api/context", () => {
const { app, session } = await buildContextApp("user-1") const { app, session } = await buildContextApp("user-1")
await session.engine.refresh() await session.engine.refresh()
const res = await app.request('/api/context?key=["freya.weather","weather"]&match=exact') const res = await app.request('/api/context?key=["aelis.weather","weather"]&match=exact')
expect(res.status).toBe(200) expect(res.status).toBe(200)
const body = (await res.json()) as { match: string; value: unknown } const body = (await res.json()) as { match: string; value: unknown }
@@ -355,7 +355,7 @@ describe("GET /api/context", () => {
const { app, session } = await buildContextApp("user-1") const { app, session } = await buildContextApp("user-1")
await session.engine.refresh() await session.engine.refresh()
const res = await app.request('/api/context?key=["freya.weather"]&match=exact') const res = await app.request('/api/context?key=["aelis.weather"]&match=exact')
expect(res.status).toBe(404) expect(res.status).toBe(404)
}) })
@@ -364,7 +364,7 @@ describe("GET /api/context", () => {
const { app, session } = await buildContextApp("user-1") const { app, session } = await buildContextApp("user-1")
await session.engine.refresh() await session.engine.refresh()
const res = await app.request('/api/context?key=["freya.weather"]&match=prefix') const res = await app.request('/api/context?key=["aelis.weather"]&match=prefix')
expect(res.status).toBe(200) expect(res.status).toBe(200)
const body = (await res.json()) as { const body = (await res.json()) as {
@@ -373,7 +373,7 @@ describe("GET /api/context", () => {
} }
expect(body.match).toBe("prefix") expect(body.match).toBe("prefix")
expect(body.entries).toHaveLength(1) expect(body.entries).toHaveLength(1)
expect(body.entries[0]!.key).toEqual(["freya.weather", "weather"]) expect(body.entries[0]!.key).toEqual(["aelis.weather", "weather"])
expect(body.entries[0]!.value).toEqual(weatherData) expect(body.entries[0]!.value).toEqual(weatherData)
}) })
@@ -381,7 +381,7 @@ describe("GET /api/context", () => {
const { app, session } = await buildContextApp("user-1") const { app, session } = await buildContextApp("user-1")
await session.engine.refresh() await session.engine.refresh()
const res = await app.request('/api/context?key=["freya.weather","weather"]') const res = await app.request('/api/context?key=["aelis.weather","weather"]')
expect(res.status).toBe(200) expect(res.status).toBe(200)
const body = (await res.json()) as { match: string; value: unknown } const body = (await res.json()) as { match: string; value: unknown }
@@ -393,7 +393,7 @@ describe("GET /api/context", () => {
const { app, session } = await buildContextApp("user-1") const { app, session } = await buildContextApp("user-1")
await session.engine.refresh() await session.engine.refresh()
const res = await app.request('/api/context?key=["freya.weather"]') const res = await app.request('/api/context?key=["aelis.weather"]')
expect(res.status).toBe(200) expect(res.status).toBe(200)
const body = (await res.json()) as { const body = (await res.json()) as {

View File

@@ -1,6 +1,6 @@
import type { Context, Hono } from "hono" import type { Context, Hono } from "hono"
import { contextKey } from "@freya/core" import { contextKey } from "@aelis/core"
import { createMiddleware } from "hono/factory" import { createMiddleware } from "hono/factory"
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts" import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"

View File

@@ -1,4 +1,4 @@
import type { FeedItem } from "@freya/core" import type { FeedItem } from "@aelis/core"
import type { LlmClient } from "./llm-client.ts" import type { LlmClient } from "./llm-client.ts"

View File

@@ -1,4 +1,4 @@
import type { FeedItem } from "@freya/core" import type { FeedItem } from "@aelis/core"
import { describe, expect, test } from "bun:test" import { describe, expect, test } from "bun:test"

View File

@@ -1,8 +1,8 @@
import type { FeedItem } from "@freya/core" import type { FeedItem } from "@aelis/core"
import type { EnhancementResult } from "./schema.ts" import type { EnhancementResult } from "./schema.ts"
const ENHANCEMENT_SOURCE_ID = "freya.enhancement" const ENHANCEMENT_SOURCE_ID = "aelis.enhancement"
/** /**
* Merges an EnhancementResult into feed items. * Merges an EnhancementResult into feed items.

View File

@@ -1,4 +1,4 @@
import type { FeedItem } from "@freya/core" import type { FeedItem } from "@aelis/core"
import { describe, expect, test } from "bun:test" import { describe, expect, test } from "bun:test"

View File

@@ -1,7 +1,7 @@
import type { FeedItem } from "@freya/core" import type { FeedItem } from "@aelis/core"
import { CalDavFeedItemType } from "@freya/source-caldav" import { CalDavFeedItemType } from "@aelis/source-caldav"
import { CalendarFeedItemType } from "@freya/source-google-calendar" import { CalendarFeedItemType } from "@aelis/source-google-calendar"
import systemPromptBase from "./prompts/system.txt" import systemPromptBase from "./prompts/system.txt"

View File

@@ -1,4 +1,4 @@
You are FREYA, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items. You are AELIS, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
The user message is a JSON object with: The user message is a JSON object with:
- "items": feed items with data and named slots to fill. Each slot has a description of what to write. - "items": feed items with data and named slots to fill. Each slot has a description of what to write.

View File

@@ -57,7 +57,7 @@ async function handleUpdateLocation(c: Context<Env>) {
return c.json({ error: "Service unavailable" }, 503) return c.json({ error: "Service unavailable" }, 503)
} }
await session.engine.executeAction("freya.location", "update-location", { await session.engine.executeAction("aelis.location", "update-location", {
lat: result.lat, lat: result.lat,
lng: result.lng, lng: result.lng,
accuracy: result.accuracy, accuracy: result.accuracy,

View File

@@ -1,9 +1,9 @@
import { LocationSource } from "@freya/source-location" import { LocationSource } from "@aelis/source-location"
import type { FeedSourceProvider } from "../session/feed-source-provider.ts" import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
export class LocationSourceProvider implements FeedSourceProvider { export class LocationSourceProvider implements FeedSourceProvider {
readonly sourceId = "freya.location" readonly sourceId = "aelis.location"
async feedSourceForUser( async feedSourceForUser(
_userId: string, _userId: string,

View File

@@ -11,16 +11,13 @@ import { createDatabase } from "./db/index.ts"
import { registerFeedHttpHandlers } from "./engine/http.ts" import { registerFeedHttpHandlers } from "./engine/http.ts"
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts" import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
import { createLlmClient } from "./enhancement/llm-client.ts" import { createLlmClient } from "./enhancement/llm-client.ts"
import { GoogleMapsSourceProvider } from "./google-maps/provider.ts"
import { CredentialEncryptor } from "./lib/crypto.ts" import { CredentialEncryptor } from "./lib/crypto.ts"
import { registerLocationHttpHandlers } from "./location/http.ts" import { registerLocationHttpHandlers } from "./location/http.ts"
import { LocationSourceProvider } from "./location/provider.ts" import { LocationSourceProvider } from "./location/provider.ts"
import { ReminderSourceProvider } from "./reminders/provider.ts"
import { UserSessionManager } from "./session/index.ts" import { UserSessionManager } from "./session/index.ts"
import { registerSourcesHttpHandlers } from "./sources/http.ts" import { registerSourcesHttpHandlers } from "./sources/http.ts"
import { TflSourceProvider } from "./tfl/provider.ts" import { TflSourceProvider } from "./tfl/provider.ts"
import { WeatherSourceProvider } from "./weather/provider.ts" import { WeatherSourceProvider } from "./weather/provider.ts"
import { WebSearchSourceProvider } from "./web-search/provider.ts"
function main() { function main() {
const { db, close: closeDb } = createDatabase(process.env.DATABASE_URL!) const { db, close: closeDb } = createDatabase(process.env.DATABASE_URL!)
@@ -49,17 +46,11 @@ function main() {
) )
} }
const googleMapsApiKey = process.env.GOOGLE_MAPS_API_KEY ?? process.env.GOOGLE_MAPS_MCP_API_KEY
if (!googleMapsApiKey) {
throw new Error("GOOGLE_MAPS_API_KEY or GOOGLE_MAPS_MCP_API_KEY must be set")
}
const sessionManager = new UserSessionManager({ const sessionManager = new UserSessionManager({
db, db,
providers: [ providers: [
new CalDavSourceProvider(), new CalDavSourceProvider(),
new LocationSourceProvider(), new LocationSourceProvider(),
new ReminderSourceProvider({ db }),
new WeatherSourceProvider({ new WeatherSourceProvider({
credentials: { credentials: {
privateKey: process.env.WEATHERKIT_PRIVATE_KEY!, privateKey: process.env.WEATHERKIT_PRIVATE_KEY!,
@@ -69,10 +60,6 @@ function main() {
}, },
}), }),
new TflSourceProvider({ apiKey: process.env.TFL_API_KEY! }), new TflSourceProvider({ apiKey: process.env.TFL_API_KEY! }),
new WebSearchSourceProvider({ apiKey: process.env.EXA_API_KEY }),
new GoogleMapsSourceProvider({
apiKey: googleMapsApiKey,
}),
], ],
feedEnhancer, feedEnhancer,
credentialEncryptor, credentialEncryptor,
@@ -135,6 +122,5 @@ const app = main()
export default { export default {
port: 3000, port: 3000,
hostname: "0.0.0.0",
fetch: app.fetch, fetch: app.fetch,
} }

View File

@@ -1,10 +1,10 @@
import type { FeedSource } from "@freya/core" import type { FeedSource } from "@aelis/core"
import type { type } from "arktype" import type { type } from "arktype"
export type ConfigSchema = ReturnType<typeof type> export type ConfigSchema = ReturnType<typeof type>
export interface FeedSourceProvider { export interface FeedSourceProvider {
/** The source ID this provider is responsible for (e.g., "freya.location"). */ /** The source ID this provider is responsible for (e.g., "aelis.location"). */
readonly sourceId: string readonly sourceId: string
/** Arktype schema for validating user-provided config. Omit if the source has no config. */ /** Arktype schema for validating user-provided config. Omit if the source has no config. */
readonly configSchema?: ConfigSchema readonly configSchema?: ConfigSchema

View File

@@ -1,7 +1,7 @@
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
import { LocationSource } from "@freya/source-location" import { LocationSource } from "@aelis/source-location"
import { WeatherSource } from "@freya/source-weatherkit" import { WeatherSource } from "@aelis/source-weatherkit"
import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test" import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
import type { Database } from "../db/index.ts" import type { Database } from "../db/index.ts"
@@ -145,14 +145,14 @@ function createStubProvider(
} }
const locationProvider: FeedSourceProvider = { const locationProvider: FeedSourceProvider = {
sourceId: "freya.location", sourceId: "aelis.location",
async feedSourceForUser() { async feedSourceForUser() {
return new LocationSource() return new LocationSource()
}, },
} }
const weatherProvider: FeedSourceProvider = { const weatherProvider: FeedSourceProvider = {
sourceId: "freya.weather", sourceId: "aelis.weather",
async feedSourceForUser() { async feedSourceForUser() {
return new WeatherSource({ client: { fetch: async () => ({}) as never } }) return new WeatherSource({ client: { fetch: async () => ({}) as never } })
}, },
@@ -167,7 +167,7 @@ beforeEach(() => {
describe("UserSessionManager", () => { describe("UserSessionManager", () => {
test("getOrCreate creates session on first call", async () => { test("getOrCreate creates session on first call", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const session = await manager.getOrCreate("user-1") const session = await manager.getOrCreate("user-1")
@@ -177,7 +177,7 @@ describe("UserSessionManager", () => {
}) })
test("getOrCreate returns same session for same user", async () => { test("getOrCreate returns same session for same user", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const session1 = await manager.getOrCreate("user-1") const session1 = await manager.getOrCreate("user-1")
@@ -187,7 +187,7 @@ describe("UserSessionManager", () => {
}) })
test("getOrCreate returns different sessions for different users", async () => { test("getOrCreate returns different sessions for different users", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const session1 = await manager.getOrCreate("user-1") const session1 = await manager.getOrCreate("user-1")
@@ -197,20 +197,20 @@ describe("UserSessionManager", () => {
}) })
test("each user gets independent source instances", async () => { test("each user gets independent source instances", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const session1 = await manager.getOrCreate("user-1") const session1 = await manager.getOrCreate("user-1")
const session2 = await manager.getOrCreate("user-2") const session2 = await manager.getOrCreate("user-2")
const source1 = session1.getSource<LocationSource>("freya.location") const source1 = session1.getSource<LocationSource>("aelis.location")
const source2 = session2.getSource<LocationSource>("freya.location") const source2 = session2.getSource<LocationSource>("aelis.location")
expect(source1).not.toBe(source2) expect(source1).not.toBe(source2)
}) })
test("remove destroys session and allows re-creation", async () => { test("remove destroys session and allows re-creation", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const session1 = await manager.getOrCreate("user-1") const session1 = await manager.getOrCreate("user-1")
@@ -221,14 +221,14 @@ describe("UserSessionManager", () => {
}) })
test("remove is no-op for unknown user", () => { test("remove is no-op for unknown user", () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
expect(() => manager.remove("unknown")).not.toThrow() expect(() => manager.remove("unknown")).not.toThrow()
}) })
test("registers multiple providers", async () => { test("registers multiple providers", async () => {
setEnabledSources(["freya.location", "freya.weather"]) setEnabledSources(["aelis.location", "aelis.weather"])
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [locationProvider, weatherProvider], providers: [locationProvider, weatherProvider],
@@ -236,12 +236,12 @@ describe("UserSessionManager", () => {
const session = await manager.getOrCreate("user-1") const session = await manager.getOrCreate("user-1")
expect(session.getSource("freya.location")).toBeDefined() expect(session.getSource("aelis.location")).toBeDefined()
expect(session.getSource("freya.weather")).toBeDefined() expect(session.getSource("aelis.weather")).toBeDefined()
}) })
test("refresh returns feed result through session", async () => { test("refresh returns feed result through session", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const session = await manager.getOrCreate("user-1") const session = await manager.getOrCreate("user-1")
@@ -254,30 +254,30 @@ describe("UserSessionManager", () => {
}) })
test("location update via executeAction works", async () => { test("location update via executeAction works", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const session = await manager.getOrCreate("user-1") const session = await manager.getOrCreate("user-1")
await session.engine.executeAction("freya.location", "update-location", { await session.engine.executeAction("aelis.location", "update-location", {
lat: 51.5074, lat: 51.5074,
lng: -0.1278, lng: -0.1278,
accuracy: 10, accuracy: 10,
timestamp: new Date(), timestamp: new Date(),
}) })
const source = session.getSource<LocationSource>("freya.location") const source = session.getSource<LocationSource>("aelis.location")
expect(source?.lastLocation?.lat).toBe(51.5074) expect(source?.lastLocation?.lat).toBe(51.5074)
}) })
test("subscribe receives updates after location push", async () => { test("subscribe receives updates after location push", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const callback = mock() const callback = mock()
const session = await manager.getOrCreate("user-1") const session = await manager.getOrCreate("user-1")
session.engine.subscribe(callback) session.engine.subscribe(callback)
await session.engine.executeAction("freya.location", "update-location", { await session.engine.executeAction("aelis.location", "update-location", {
lat: 51.5074, lat: 51.5074,
lng: -0.1278, lng: -0.1278,
accuracy: 10, accuracy: 10,
@@ -291,7 +291,7 @@ describe("UserSessionManager", () => {
}) })
test("remove stops reactive updates", async () => { test("remove stops reactive updates", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const callback = mock() const callback = mock()
@@ -302,7 +302,7 @@ describe("UserSessionManager", () => {
// Create new session and push location — old callback should not fire // Create new session and push location — old callback should not fire
const session2 = await manager.getOrCreate("user-1") const session2 = await manager.getOrCreate("user-1")
await session2.engine.executeAction("freya.location", "update-location", { await session2.engine.executeAction("aelis.location", "update-location", {
lat: 51.5074, lat: 51.5074,
lng: -0.1278, lng: -0.1278,
accuracy: 10, accuracy: 10,
@@ -315,9 +315,9 @@ describe("UserSessionManager", () => {
}) })
test("creates session with successful providers when some fail", async () => { test("creates session with successful providers when some fail", async () => {
setEnabledSources(["freya.location", "freya.failing"]) setEnabledSources(["aelis.location", "aelis.failing"])
const failingProvider: FeedSourceProvider = { const failingProvider: FeedSourceProvider = {
sourceId: "freya.failing", sourceId: "aelis.failing",
async feedSourceForUser() { async feedSourceForUser() {
throw new Error("provider failed") throw new Error("provider failed")
}, },
@@ -333,25 +333,25 @@ describe("UserSessionManager", () => {
const session = await manager.getOrCreate("user-1") const session = await manager.getOrCreate("user-1")
expect(session).toBeDefined() expect(session).toBeDefined()
expect(session.getSource("freya.location")).toBeDefined() expect(session.getSource("aelis.location")).toBeDefined()
expect(spy).toHaveBeenCalled() expect(spy).toHaveBeenCalled()
spy.mockRestore() spy.mockRestore()
}) })
test("throws AggregateError when all providers fail", async () => { test("throws AggregateError when all providers fail", async () => {
setEnabledSources(["freya.fail-1", "freya.fail-2"]) setEnabledSources(["aelis.fail-1", "aelis.fail-2"])
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [ providers: [
{ {
sourceId: "freya.fail-1", sourceId: "aelis.fail-1",
async feedSourceForUser() { async feedSourceForUser() {
throw new Error("first failed") throw new Error("first failed")
}, },
}, },
{ {
sourceId: "freya.fail-2", sourceId: "aelis.fail-2",
async feedSourceForUser() { async feedSourceForUser() {
throw new Error("second failed") throw new Error("second failed")
}, },
@@ -363,13 +363,13 @@ describe("UserSessionManager", () => {
}) })
test("concurrent getOrCreate for same user returns same session", async () => { test("concurrent getOrCreate for same user returns same session", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
let callCount = 0 let callCount = 0
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [ providers: [
{ {
sourceId: "freya.location", sourceId: "aelis.location",
async feedSourceForUser() { async feedSourceForUser() {
callCount++ callCount++
await new Promise((resolve) => setTimeout(resolve, 10)) await new Promise((resolve) => setTimeout(resolve, 10))
@@ -389,7 +389,7 @@ describe("UserSessionManager", () => {
}) })
test("remove during in-flight getOrCreate prevents session from being stored", async () => { test("remove during in-flight getOrCreate prevents session from being stored", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
let resolveProvider: () => void let resolveProvider: () => void
const providerGate = new Promise<void>((r) => { const providerGate = new Promise<void>((r) => {
resolveProvider = r resolveProvider = r
@@ -399,7 +399,7 @@ describe("UserSessionManager", () => {
db: fakeDb, db: fakeDb,
providers: [ providers: [
{ {
sourceId: "freya.location", sourceId: "aelis.location",
async feedSourceForUser() { async feedSourceForUser() {
await providerGate await providerGate
return new LocationSource() return new LocationSource()
@@ -425,15 +425,15 @@ describe("UserSessionManager", () => {
}) })
test("only invokes providers for sources enabled for the user", async () => { test("only invokes providers for sources enabled for the user", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const locationFactory = mock(async () => createStubSource("freya.location")) const locationFactory = mock(async () => createStubSource("aelis.location"))
const weatherFactory = mock(async () => createStubSource("freya.weather")) const weatherFactory = mock(async () => createStubSource("aelis.weather"))
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [ providers: [
{ sourceId: "freya.location", feedSourceForUser: locationFactory }, { sourceId: "aelis.location", feedSourceForUser: locationFactory },
{ sourceId: "freya.weather", feedSourceForUser: weatherFactory }, { sourceId: "aelis.weather", feedSourceForUser: weatherFactory },
], ],
}) })
@@ -441,43 +441,43 @@ describe("UserSessionManager", () => {
expect(locationFactory).toHaveBeenCalledTimes(1) expect(locationFactory).toHaveBeenCalledTimes(1)
expect(weatherFactory).not.toHaveBeenCalled() expect(weatherFactory).not.toHaveBeenCalled()
expect(session.getSource("freya.location")).toBeDefined() expect(session.getSource("aelis.location")).toBeDefined()
expect(session.getSource("freya.weather")).toBeUndefined() expect(session.getSource("aelis.weather")).toBeUndefined()
}) })
test("creates empty session when no sources are enabled", async () => { test("creates empty session when no sources are enabled", async () => {
setEnabledSources([]) setEnabledSources([])
const factory = mock(async () => createStubSource("freya.location")) const factory = mock(async () => createStubSource("aelis.location"))
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [{ sourceId: "freya.location", feedSourceForUser: factory }], providers: [{ sourceId: "aelis.location", feedSourceForUser: factory }],
}) })
const session = await manager.getOrCreate("user-1") const session = await manager.getOrCreate("user-1")
expect(factory).not.toHaveBeenCalled() expect(factory).not.toHaveBeenCalled()
expect(session).toBeDefined() expect(session).toBeDefined()
expect(session.getSource("freya.location")).toBeUndefined() expect(session.getSource("aelis.location")).toBeUndefined()
}) })
test("per-user enabled sources are respected", async () => { test("per-user enabled sources are respected", async () => {
enabledByUser.clear() enabledByUser.clear()
setEnabledSourcesForUser("user-1", ["freya.location"]) setEnabledSourcesForUser("user-1", ["aelis.location"])
setEnabledSourcesForUser("user-2", ["freya.weather"]) setEnabledSourcesForUser("user-2", ["aelis.weather"])
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [createStubProvider("freya.location"), createStubProvider("freya.weather")], providers: [createStubProvider("aelis.location"), createStubProvider("aelis.weather")],
}) })
const session1 = await manager.getOrCreate("user-1") const session1 = await manager.getOrCreate("user-1")
const session2 = await manager.getOrCreate("user-2") const session2 = await manager.getOrCreate("user-2")
expect(session1.getSource("freya.location")).toBeDefined() expect(session1.getSource("aelis.location")).toBeDefined()
expect(session1.getSource("freya.weather")).toBeUndefined() expect(session1.getSource("aelis.weather")).toBeUndefined()
expect(session2.getSource("freya.location")).toBeUndefined() expect(session2.getSource("aelis.location")).toBeUndefined()
expect(session2.getSource("freya.weather")).toBeDefined() expect(session2.getSource("aelis.weather")).toBeDefined()
}) })
}) })
@@ -525,10 +525,10 @@ describe("UserSessionManager.replaceProvider", () => {
}) })
test("throws for unknown provider sourceId", async () => { test("throws for unknown provider sourceId", async () => {
setEnabledSources(["freya.location"]) setEnabledSources(["aelis.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const unknownProvider = createStubProvider("freya.unknown") const unknownProvider = createStubProvider("aelis.unknown")
await expect(manager.replaceProvider(unknownProvider)).rejects.toThrow( await expect(manager.replaceProvider(unknownProvider)).rejects.toThrow(
"no existing provider with that sourceId", "no existing provider with that sourceId",

View File

@@ -1,4 +1,4 @@
import type { FeedSource } from "@freya/core" import type { FeedSource } from "@aelis/core"
import { type } from "arktype" import { type } from "arktype"
import merge from "lodash.merge" import merge from "lodash.merge"

View File

@@ -1,6 +1,6 @@
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
import { LocationSource } from "@freya/source-location" import { LocationSource } from "@aelis/source-location"
import { describe, expect, spyOn, test } from "bun:test" import { describe, expect, spyOn, test } from "bun:test"
import { UserSession } from "./user-session.ts" import { UserSession } from "./user-session.ts"
@@ -39,7 +39,7 @@ describe("UserSession", () => {
const location = new LocationSource() const location = new LocationSource()
const session = new UserSession("test-user", [location]) const session = new UserSession("test-user", [location])
const result = session.getSource<LocationSource>("freya.location") const result = session.getSource<LocationSource>("aelis.location")
expect(result).toBe(location) expect(result).toBe(location)
}) })
@@ -62,7 +62,7 @@ describe("UserSession", () => {
const location = new LocationSource() const location = new LocationSource()
const session = new UserSession("test-user", [location]) const session = new UserSession("test-user", [location])
await session.engine.executeAction("freya.location", "update-location", { await session.engine.executeAction("aelis.location", "update-location", {
lat: 51.5, lat: 51.5,
lng: -0.1, lng: -0.1,
accuracy: 10, accuracy: 10,

View File

@@ -1,4 +1,4 @@
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@freya/core" import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts" import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"

View File

@@ -1,4 +1,4 @@
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
import { describe, expect, mock, spyOn, test } from "bun:test" import { describe, expect, mock, spyOn, test } from "bun:test"
import { Hono } from "hono" import { Hono } from "hono"
@@ -186,18 +186,6 @@ function put(app: Hono, sourceId: string, body: unknown) {
}) })
} }
function listActions(app: Hono, sourceId: string) {
return app.request(`/api/sources/${sourceId}/actions`, { method: "GET" })
}
function executeAction(app: Hono, sourceId: string, actionId: string, body: unknown) {
return app.request(`/api/sources/${sourceId}/actions/${actionId}`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(body),
})
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Tests // Tests
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -205,16 +193,16 @@ function executeAction(app: Hono, sourceId: string, actionId: string, body: unkn
describe("GET /api/sources/:sourceId", () => { describe("GET /api/sources/:sourceId", () => {
test("returns 401 without auth", async () => { test("returns 401 without auth", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)]) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
const res = await get(app, "freya.weather") const res = await get(app, "aelis.weather")
expect(res.status).toBe(401) expect(res.status).toBe(401)
}) })
test("returns 404 for unknown source", async () => { test("returns 404 for unknown source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "unknown.source") const res = await get(app, "unknown.source")
@@ -225,13 +213,13 @@ describe("GET /api/sources/:sourceId", () => {
test("returns enabled and config for existing source", async () => { test("returns enabled and config for existing source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "freya.weather") const res = await get(app, "aelis.weather")
expect(res.status).toBe(200) expect(res.status).toBe(200)
const body = (await res.json()) as { enabled: boolean; config: unknown } const body = (await res.json()) as { enabled: boolean; config: unknown }
@@ -241,9 +229,9 @@ describe("GET /api/sources/:sourceId", () => {
test("returns defaults when user has no row for source", async () => { test("returns defaults when user has no row for source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "freya.weather") const res = await get(app, "aelis.weather")
expect(res.status).toBe(200) expect(res.status).toBe(200)
const body = (await res.json()) as { enabled: boolean; config: unknown } const body = (await res.json()) as { enabled: boolean; config: unknown }
@@ -253,13 +241,13 @@ describe("GET /api/sources/:sourceId", () => {
test("returns disabled source", async () => { test("returns disabled source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
enabled: false, enabled: false,
config: { units: "imperial" }, config: { units: "imperial" },
}) })
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "freya.weather") const res = await get(app, "aelis.weather")
expect(res.status).toBe(200) expect(res.status).toBe(200)
const body = (await res.json()) as { enabled: boolean; config: unknown } const body = (await res.json()) as { enabled: boolean; config: unknown }
@@ -271,16 +259,16 @@ describe("GET /api/sources/:sourceId", () => {
describe("PATCH /api/sources/:sourceId", () => { describe("PATCH /api/sources/:sourceId", () => {
test("returns 401 without auth", async () => { test("returns 401 without auth", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)]) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
const res = await patch(app, "freya.weather", { enabled: true }) const res = await patch(app, "aelis.weather", { enabled: true })
expect(res.status).toBe(401) expect(res.status).toBe(401)
}) })
test("returns 404 for unknown source", async () => { test("returns 404 for unknown source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "unknown.source", { enabled: true }) const res = await patch(app, "unknown.source", { enabled: true })
@@ -291,9 +279,9 @@ describe("PATCH /api/sources/:sourceId", () => {
test("returns 404 when user has no existing row for source", async () => { test("returns 404 when user has no existing row for source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", { enabled: true }) const res = await patch(app, "aelis.weather", { enabled: true })
expect(res.status).toBe(404) expect(res.status).toBe(404)
const body = (await res.json()) as { error: string } const body = (await res.json()) as { error: string }
@@ -302,29 +290,29 @@ describe("PATCH /api/sources/:sourceId", () => {
test("returns 204 when body is empty object (no-op) on existing source", async () => { test("returns 204 when body is empty object (no-op) on existing source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather") activeStore.seed(MOCK_USER_ID, "aelis.weather")
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", {}) const res = await patch(app, "aelis.weather", {})
expect(res.status).toBe(204) expect(res.status).toBe(204)
}) })
test("returns 404 when body is empty object on nonexistent user source", async () => { test("returns 404 when body is empty object on nonexistent user source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", {}) const res = await patch(app, "aelis.weather", {})
expect(res.status).toBe(404) expect(res.status).toBe(404)
}) })
test("returns 400 for invalid JSON body", async () => { test("returns 400 for invalid JSON body", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather") activeStore.seed(MOCK_USER_ID, "aelis.weather")
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await app.request("/api/sources/freya.weather", { const res = await app.request("/api/sources/aelis.weather", {
method: "PATCH", method: "PATCH",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: "not json", body: "not json",
@@ -337,10 +325,10 @@ describe("PATCH /api/sources/:sourceId", () => {
test("returns 400 when request body contains unknown fields", async () => { test("returns 400 when request body contains unknown fields", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather") activeStore.seed(MOCK_USER_ID, "aelis.weather")
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", { const res = await patch(app, "aelis.weather", {
enabled: true, enabled: true,
unknownField: "hello", unknownField: "hello",
}) })
@@ -350,10 +338,10 @@ describe("PATCH /api/sources/:sourceId", () => {
test("returns 400 when weather config contains unknown fields", async () => { test("returns 400 when weather config contains unknown fields", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather") activeStore.seed(MOCK_USER_ID, "aelis.weather")
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", { const res = await patch(app, "aelis.weather", {
config: { units: "metric", unknownField: "hello" }, config: { units: "metric", unknownField: "hello" },
}) })
@@ -362,10 +350,10 @@ describe("PATCH /api/sources/:sourceId", () => {
test("returns 400 when weather config fails validation", async () => { test("returns 400 when weather config fails validation", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather") activeStore.seed(MOCK_USER_ID, "aelis.weather")
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", { const res = await patch(app, "aelis.weather", {
config: { units: "invalid" }, config: { units: "invalid" },
}) })
@@ -374,65 +362,65 @@ describe("PATCH /api/sources/:sourceId", () => {
test("returns 204 and updates enabled", async () => { test("returns 204 and updates enabled", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", { enabled: false }) const res = await patch(app, "aelis.weather", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
expect(row!.enabled).toBe(false) expect(row!.enabled).toBe(false)
expect(row!.config).toEqual({ units: "metric" }) expect(row!.config).toEqual({ units: "metric" })
}) })
test("returns 204 and updates config", async () => { test("returns 204 and updates config", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", { const res = await patch(app, "aelis.weather", {
config: { units: "imperial" }, config: { units: "imperial" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
expect(row!.config).toEqual({ units: "imperial" }) expect(row!.config).toEqual({ units: "imperial" })
}) })
test("preserves config when only updating enabled", async () => { test("preserves config when only updating enabled", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.tfl", { activeStore.seed(MOCK_USER_ID, "aelis.tfl", {
enabled: true, enabled: true,
config: { lines: ["bakerloo"] }, config: { lines: ["bakerloo"] },
}) })
const { app } = createApp([createStubProvider("freya.tfl", tflConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.tfl", tflConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.tfl", { enabled: false }) const res = await patch(app, "aelis.tfl", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.tfl`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.tfl`)
expect(row!.enabled).toBe(false) expect(row!.enabled).toBe(false)
expect(row!.config).toEqual({ lines: ["bakerloo"] }) expect(row!.config).toEqual({ lines: ["bakerloo"] })
}) })
test("deep-merges config on update", async () => { test("deep-merges config on update", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
config: { units: "metric", hourlyLimit: 12 }, config: { units: "metric", hourlyLimit: 12 },
}) })
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "freya.weather", { const res = await patch(app, "aelis.weather", {
config: { dailyLimit: 5 }, config: { dailyLimit: 5 },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
expect(row!.config).toEqual({ expect(row!.config).toEqual({
units: "metric", units: "metric",
hourlyLimit: 12, hourlyLimit: 12,
@@ -442,18 +430,18 @@ describe("PATCH /api/sources/:sourceId", () => {
test("refreshes source in active session after config update", async () => { test("refreshes source in active session after config update", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("freya.weather", weatherConfig)], [createStubProvider("aelis.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
const session = await sessionManager.getOrCreate(MOCK_USER_ID) const session = await sessionManager.getOrCreate(MOCK_USER_ID)
const replaceSpy = spyOn(session, "replaceSource") const replaceSpy = spyOn(session, "replaceSource")
const res = await patch(app, "freya.weather", { const res = await patch(app, "aelis.weather", {
config: { units: "imperial" }, config: { units: "imperial" },
}) })
@@ -464,31 +452,31 @@ describe("PATCH /api/sources/:sourceId", () => {
test("removes source from session when disabled", async () => { test("removes source from session when disabled", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("freya.weather", weatherConfig)], [createStubProvider("aelis.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
const session = await sessionManager.getOrCreate(MOCK_USER_ID) const session = await sessionManager.getOrCreate(MOCK_USER_ID)
const removeSpy = spyOn(session, "removeSource") const removeSpy = spyOn(session, "removeSource")
const res = await patch(app, "freya.weather", { enabled: false }) const res = await patch(app, "aelis.weather", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
expect(removeSpy).toHaveBeenCalledWith("freya.weather") expect(removeSpy).toHaveBeenCalledWith("aelis.weather")
removeSpy.mockRestore() removeSpy.mockRestore()
}) })
test("returns 400 when config is provided for source without schema", async () => { test("returns 400 when config is provided for source without schema", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location") activeStore.seed(MOCK_USER_ID, "aelis.location")
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await patch(app, "freya.location", { const res = await patch(app, "aelis.location", {
config: { something: "value" }, config: { something: "value" },
}) })
@@ -497,10 +485,10 @@ describe("PATCH /api/sources/:sourceId", () => {
test("returns 400 when empty config is provided for source without schema", async () => { test("returns 400 when empty config is provided for source without schema", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location") activeStore.seed(MOCK_USER_ID, "aelis.location")
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await patch(app, "freya.location", { const res = await patch(app, "aelis.location", {
config: {}, config: {},
}) })
@@ -509,13 +497,13 @@ describe("PATCH /api/sources/:sourceId", () => {
test("updates enabled on location source", async () => { test("updates enabled on location source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true }) activeStore.seed(MOCK_USER_ID, "aelis.location", { enabled: true })
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await patch(app, "freya.location", { enabled: false }) const res = await patch(app, "aelis.location", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.location`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.location`)
expect(row!.enabled).toBe(false) expect(row!.enabled).toBe(false)
}) })
}) })
@@ -527,16 +515,16 @@ describe("PATCH /api/sources/:sourceId", () => {
describe("PUT /api/sources/:sourceId", () => { describe("PUT /api/sources/:sourceId", () => {
test("returns 401 without auth", async () => { test("returns 401 without auth", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)]) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
const res = await put(app, "freya.weather", { enabled: true, config: {} }) const res = await put(app, "aelis.weather", { enabled: true, config: {} })
expect(res.status).toBe(401) expect(res.status).toBe(401)
}) })
test("returns 404 for unknown source", async () => { test("returns 404 for unknown source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "unknown.source", { enabled: true, config: {} }) const res = await put(app, "unknown.source", { enabled: true, config: {} })
@@ -547,9 +535,9 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 400 for invalid JSON", async () => { test("returns 400 for invalid JSON", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await app.request("/api/sources/freya.weather", { const res = await app.request("/api/sources/aelis.weather", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: "not json", body: "not json",
@@ -562,27 +550,27 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 400 when enabled is missing", async () => { test("returns 400 when enabled is missing", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { config: {} }) const res = await put(app, "aelis.weather", { config: {} })
expect(res.status).toBe(400) expect(res.status).toBe(400)
}) })
test("returns 400 when config is missing", async () => { test("returns 400 when config is missing", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { enabled: true }) const res = await put(app, "aelis.weather", { enabled: true })
expect(res.status).toBe(400) expect(res.status).toBe(400)
}) })
test("returns 400 when request body contains unknown fields", async () => { test("returns 400 when request body contains unknown fields", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
unknownField: "hello", unknownField: "hello",
@@ -593,9 +581,9 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 400 when weather config contains unknown fields", async () => { test("returns 400 when weather config contains unknown fields", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric", unknownField: "hello" }, config: { units: "metric", unknownField: "hello" },
}) })
@@ -605,9 +593,9 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 400 when config fails schema validation", async () => { test("returns 400 when config fails schema validation", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "invalid" }, config: { units: "invalid" },
}) })
@@ -617,15 +605,15 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 204 and inserts when row does not exist", async () => { test("returns 204 and inserts when row does not exist", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
expect(row).toBeDefined() expect(row).toBeDefined()
expect(row!.enabled).toBe(true) expect(row!.enabled).toBe(true)
expect(row!.config).toEqual({ units: "metric" }) expect(row!.config).toEqual({ units: "metric" })
@@ -633,19 +621,19 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 204 and fully replaces existing row", async () => { test("returns 204 and fully replaces existing row", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric", hourlyLimit: 12 }, config: { units: "metric", hourlyLimit: 12 },
}) })
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: false, enabled: false,
config: { units: "imperial" }, config: { units: "imperial" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
expect(row!.enabled).toBe(false) expect(row!.enabled).toBe(false)
// hourlyLimit should be gone — full replace, not merge // hourlyLimit should be gone — full replace, not merge
expect(row!.config).toEqual({ units: "imperial" }) expect(row!.config).toEqual({ units: "imperial" })
@@ -653,18 +641,18 @@ describe("PUT /api/sources/:sourceId", () => {
test("refreshes source in active session after upsert", async () => { test("refreshes source in active session after upsert", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("freya.weather", weatherConfig)], [createStubProvider("aelis.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
const session = await sessionManager.getOrCreate(MOCK_USER_ID) const session = await sessionManager.getOrCreate(MOCK_USER_ID)
const replaceSpy = spyOn(session, "replaceSource") const replaceSpy = spyOn(session, "replaceSource")
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "imperial" }, config: { units: "imperial" },
}) })
@@ -676,56 +664,56 @@ describe("PUT /api/sources/:sourceId", () => {
test("removes source from session when disabled via upsert", async () => { test("removes source from session when disabled via upsert", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.weather", { activeStore.seed(MOCK_USER_ID, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("freya.weather", weatherConfig)], [createStubProvider("aelis.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
const session = await sessionManager.getOrCreate(MOCK_USER_ID) const session = await sessionManager.getOrCreate(MOCK_USER_ID)
const removeSpy = spyOn(session, "removeSource") const removeSpy = spyOn(session, "removeSource")
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: false, enabled: false,
config: { units: "metric" }, config: { units: "metric" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
expect(removeSpy).toHaveBeenCalledWith("freya.weather") expect(removeSpy).toHaveBeenCalledWith("aelis.weather")
removeSpy.mockRestore() removeSpy.mockRestore()
}) })
test("adds source to active session when inserting a new source", async () => { test("adds source to active session when inserting a new source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
// Seed a different source so the session can be created // Seed a different source so the session can be created
activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true }) activeStore.seed(MOCK_USER_ID, "aelis.location", { enabled: true })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("freya.location"), createStubProvider("freya.weather", weatherConfig)], [createStubProvider("aelis.location"), createStubProvider("aelis.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
// Create session — only has freya.location // Create session — only has aelis.location
const session = await sessionManager.getOrCreate(MOCK_USER_ID) const session = await sessionManager.getOrCreate(MOCK_USER_ID)
expect(session.hasSource("freya.weather")).toBe(false) expect(session.hasSource("aelis.weather")).toBe(false)
// PUT a new source that didn't exist before // PUT a new source that didn't exist before
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
expect(session.hasSource("freya.weather")).toBe(true) expect(session.hasSource("aelis.weather")).toBe(true)
}) })
test("returns 400 when config is provided for source without schema", async () => { test("returns 400 when config is provided for source without schema", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await put(app, "freya.location", { const res = await put(app, "aelis.location", {
enabled: true, enabled: true,
config: { something: "value" }, config: { something: "value" },
}) })
@@ -735,9 +723,9 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 400 when empty config is provided for source without schema", async () => { test("returns 400 when empty config is provided for source without schema", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await put(app, "freya.location", { const res = await put(app, "aelis.location", {
enabled: true, enabled: true,
config: {}, config: {},
}) })
@@ -747,9 +735,9 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 204 without config field for source without schema", async () => { test("returns 204 without config field for source without schema", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await put(app, "freya.location", { const res = await put(app, "aelis.location", {
enabled: true, enabled: true,
}) })
@@ -759,18 +747,18 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 204 when credentials are included alongside config", async () => { test("returns 204 when credentials are included alongside config", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createAppWithEncryptor( const { app } = createAppWithEncryptor(
[createStubProvider("freya.weather", weatherConfig)], [createStubProvider("aelis.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
credentials: { apiKey: "secret123" }, credentials: { apiKey: "secret123" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
expect(row).toBeDefined() expect(row).toBeDefined()
expect(row!.enabled).toBe(true) expect(row!.enabled).toBe(true)
expect(row!.config).toEqual({ units: "metric" }) expect(row!.config).toEqual({ units: "metric" })
@@ -779,9 +767,9 @@ describe("PUT /api/sources/:sourceId", () => {
test("returns 503 when credentials are provided but no encryptor is configured", async () => { test("returns 503 when credentials are provided but no encryptor is configured", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
// createApp does NOT configure an encryptor // createApp does NOT configure an encryptor
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "freya.weather", { const res = await put(app, "aelis.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
credentials: { apiKey: "secret123" }, credentials: { apiKey: "secret123" },
@@ -793,181 +781,19 @@ describe("PUT /api/sources/:sourceId", () => {
}) })
}) })
describe("GET /api/sources/:sourceId/actions", () => {
test("returns 401 without auth", async () => {
activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.location")])
const res = await listActions(app, "freya.location")
expect(res.status).toBe(401)
})
test("returns 404 for source that is not enabled in the user session", async () => {
activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await listActions(app, "freya.location")
expect(res.status).toBe(404)
})
test("returns serializable action definitions", async () => {
activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "test.actions")
const provider: FeedSourceProvider = {
sourceId: "test.actions",
async feedSourceForUser() {
return {
id: "test.actions",
async listActions() {
return {
search: {
id: "search",
description: "Search something",
input: tflConfig,
},
}
},
async executeAction() {
return undefined
},
async fetchContext() {
return null
},
}
},
}
const { app } = createApp([provider], MOCK_USER_ID)
const res = await listActions(app, "test.actions")
expect(res.status).toBe(200)
const body = (await res.json()) as {
actions: Record<string, { id: string; description?: string; input?: unknown }>
}
expect(body.actions.search).toEqual({
id: "search",
description: "Search something",
})
})
})
describe("POST /api/sources/:sourceId/actions/:actionId", () => {
test("returns 401 without auth", async () => {
activeStore = createInMemoryStore()
const { app } = createApp([createStubProvider("freya.location")])
const res = await executeAction(app, "freya.location", "update-location", {})
expect(res.status).toBe(401)
})
test("executes source action with request body as params", async () => {
activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "test.actions")
let receivedParams: unknown
const provider: FeedSourceProvider = {
sourceId: "test.actions",
async feedSourceForUser() {
return {
id: "test.actions",
async listActions() {
return {
search: { id: "search", description: "Search something" },
}
},
async executeAction(_actionId: string, params: unknown) {
receivedParams = params
return { ok: true, count: 2 }
},
async fetchContext() {
return null
},
}
},
}
const { app } = createApp([provider], MOCK_USER_ID)
const res = await executeAction(app, "test.actions", "search", { query: "exa" })
expect(res.status).toBe(200)
expect(receivedParams).toEqual({ query: "exa" })
const body = (await res.json()) as { result: unknown }
expect(body.result).toEqual({ ok: true, count: 2 })
})
test("returns 404 for unknown action", async () => {
activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location")
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await executeAction(app, "freya.location", "missing", {})
expect(res.status).toBe(404)
})
test("returns 400 for invalid JSON", async () => {
activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location")
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await app.request("/api/sources/freya.location/actions/search", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: "not-json",
})
expect(res.status).toBe(400)
const body = (await res.json()) as { error: string }
expect(body.error).toBe("Invalid JSON")
})
test("returns 400 when source rejects params", async () => {
activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "test.actions")
const provider: FeedSourceProvider = {
sourceId: "test.actions",
async feedSourceForUser() {
return {
id: "test.actions",
async listActions() {
return {
search: { id: "search" },
}
},
async executeAction() {
throw new Error("query must not be empty")
},
async fetchContext() {
return null
},
}
},
}
const { app } = createApp([provider], MOCK_USER_ID)
const res = await executeAction(app, "test.actions", "search", { query: "" })
expect(res.status).toBe(400)
const body = (await res.json()) as { error: string }
expect(body.error).toBe("query must not be empty")
})
})
describe("PUT /api/sources/:sourceId/credentials", () => { describe("PUT /api/sources/:sourceId/credentials", () => {
test("returns 401 without auth", async () => { test("returns 401 without auth", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createAppWithEncryptor([createStubProvider("freya.location")]) const { app } = createAppWithEncryptor([createStubProvider("aelis.location")])
const res = await putCredentials(app, "freya.location", { token: "x" }) const res = await putCredentials(app, "aelis.location", { token: "x" })
expect(res.status).toBe(401) expect(res.status).toBe(401)
}) })
test("returns 404 for unknown source", async () => { test("returns 404 for unknown source", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await putCredentials(app, "unknown.source", { token: "x" }) const res = await putCredentials(app, "unknown.source", { token: "x" })
@@ -976,10 +802,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
test("returns 400 for invalid JSON", async () => { test("returns 400 for invalid JSON", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location") activeStore.seed(MOCK_USER_ID, "aelis.location")
const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await app.request("/api/sources/freya.location/credentials", { const res = await app.request("/api/sources/aelis.location/credentials", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: "not-json", body: "not-json",
@@ -992,10 +818,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
test("returns 204 and persists credentials", async () => { test("returns 204 and persists credentials", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location") activeStore.seed(MOCK_USER_ID, "aelis.location")
const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await putCredentials(app, "freya.location", { token: "secret" }) const res = await putCredentials(app, "aelis.location", { token: "secret" })
expect(res.status).toBe(204) expect(res.status).toBe(204)
}) })
@@ -1027,10 +853,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
test("returns 503 when credential encryption is not configured", async () => { test("returns 503 when credential encryption is not configured", async () => {
activeStore = createInMemoryStore() activeStore = createInMemoryStore()
activeStore.seed(MOCK_USER_ID, "freya.location") activeStore.seed(MOCK_USER_ID, "aelis.location")
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
const res = await putCredentials(app, "freya.location", { token: "x" }) const res = await putCredentials(app, "aelis.location", { token: "x" })
expect(res.status).toBe(503) expect(res.status).toBe(503)
const body = (await res.json()) as { error: string } const body = (await res.json()) as { error: string }

View File

@@ -1,4 +1,3 @@
import type { ActionDefinition } from "@freya/core"
import type { Context, Hono } from "hono" import type { Context, Hono } from "hono"
import { type } from "arktype" import { type } from "arktype"
@@ -56,13 +55,6 @@ export function registerSourcesHttpHandlers(
app.get("/api/sources/:sourceId", inject, authSessionMiddleware, handleGetSource) app.get("/api/sources/:sourceId", inject, authSessionMiddleware, handleGetSource)
app.patch("/api/sources/:sourceId", inject, authSessionMiddleware, handleUpdateSource) app.patch("/api/sources/:sourceId", inject, authSessionMiddleware, handleUpdateSource)
app.put("/api/sources/:sourceId", inject, authSessionMiddleware, handleReplaceSource) app.put("/api/sources/:sourceId", inject, authSessionMiddleware, handleReplaceSource)
app.get("/api/sources/:sourceId/actions", inject, authSessionMiddleware, handleListActions)
app.post(
"/api/sources/:sourceId/actions/:actionId",
inject,
authSessionMiddleware,
handleExecuteAction,
)
app.put( app.put(
"/api/sources/:sourceId/credentials", "/api/sources/:sourceId/credentials",
inject, inject,
@@ -197,71 +189,6 @@ async function handleReplaceSource(c: Context<Env>) {
return c.body(null, 204) return c.body(null, 204)
} }
async function handleListActions(c: Context<Env>) {
const sourceId = c.req.param("sourceId")
if (!sourceId) {
return c.body(null, 404)
}
const user = c.get("user")!
const sessionManager = c.get("sessionManager")
let session
try {
session = await sessionManager.getOrCreate(user.id)
} catch (err) {
console.error("[handleListActions] Failed to create session:", err)
return c.json({ error: "Service unavailable" }, 503)
}
try {
const actions = await session.engine.listActions(sourceId)
return c.json({ actions: serializeActions(actions) })
} catch (err) {
if (isActionNotFoundError(err)) {
return c.json({ error: err.message }, 404)
}
console.error(`[handleListActions] Failed to list actions for "${sourceId}":`, err)
return c.json({ error: "Failed to list actions" }, 500)
}
}
async function handleExecuteAction(c: Context<Env>) {
const sourceId = c.req.param("sourceId")
const actionId = c.req.param("actionId")
if (!sourceId || !actionId) {
return c.body(null, 404)
}
let params: unknown
try {
params = await c.req.json()
} catch {
return c.json({ error: "Invalid JSON" }, 400)
}
const user = c.get("user")!
const sessionManager = c.get("sessionManager")
let session
try {
session = await sessionManager.getOrCreate(user.id)
} catch (err) {
console.error("[handleExecuteAction] Failed to create session:", err)
return c.json({ error: "Service unavailable" }, 503)
}
try {
const result = await session.engine.executeAction(sourceId, actionId, params)
return c.json({ result })
} catch (err) {
if (isActionNotFoundError(err)) {
return c.json({ error: err.message }, 404)
}
return c.json({ error: err instanceof Error ? err.message : String(err) }, 400)
}
}
async function handleUpdateCredentials(c: Context<Env>) { async function handleUpdateCredentials(c: Context<Env>) {
const sourceId = c.req.param("sourceId") const sourceId = c.req.param("sourceId")
if (!sourceId) { if (!sourceId) {
@@ -301,21 +228,3 @@ async function handleUpdateCredentials(c: Context<Env>) {
return c.body(null, 204) return c.body(null, 204)
} }
function serializeActions(actions: Record<string, ActionDefinition>) {
const serialized: Record<string, { id: string; description?: string }> = {}
for (const [key, action] of Object.entries(actions)) {
serialized[key] = {
id: action.id,
...(action.description ? { description: action.description } : {}),
}
}
return serialized
}
function isActionNotFoundError(err: unknown): err is Error {
if (!(err instanceof Error)) {
return false
}
return err.message.startsWith("Source not found:") || err.message.startsWith("Action ")
}

View File

@@ -1,4 +1,4 @@
import { TflSource, type ITflApi, type TflLineId } from "@freya/source-tfl" import { TflSource, type ITflApi, type TflLineId } from "@aelis/source-tfl"
import { type } from "arktype" import { type } from "arktype"
import type { FeedSourceProvider } from "../session/feed-source-provider.ts" import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
@@ -13,7 +13,7 @@ export const tflConfig = type({
}) })
export class TflSourceProvider implements FeedSourceProvider { export class TflSourceProvider implements FeedSourceProvider {
readonly sourceId = "freya.tfl" readonly sourceId = "aelis.tfl"
readonly configSchema = tflConfig readonly configSchema = tflConfig
private readonly apiKey: string | undefined private readonly apiKey: string | undefined
private readonly client: ITflApi | undefined private readonly client: ITflApi | undefined

View File

@@ -1,4 +1,4 @@
import { WeatherSource, type WeatherSourceOptions } from "@freya/source-weatherkit" import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
import { type } from "arktype" import { type } from "arktype"
import type { FeedSourceProvider } from "../session/feed-source-provider.ts" import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
@@ -16,7 +16,7 @@ export const weatherConfig = type({
}) })
export class WeatherSourceProvider implements FeedSourceProvider { export class WeatherSourceProvider implements FeedSourceProvider {
readonly sourceId = "freya.weather" readonly sourceId = "aelis.weather"
readonly configSchema = weatherConfig readonly configSchema = weatherConfig
private readonly credentials: WeatherSourceOptions["credentials"] private readonly credentials: WeatherSourceOptions["credentials"]
private readonly client: WeatherSourceOptions["client"] private readonly client: WeatherSourceOptions["client"]

View File

@@ -1,11 +1,11 @@
{ {
"expo": { "expo": {
"name": "Freya", "name": "Aelis",
"slug": "freya-client", "slug": "aelis-client",
"version": "1.0.0", "version": "1.0.0",
"orientation": "portrait", "orientation": "portrait",
"icon": "./assets/images/icon.png", "icon": "./assets/images/icon.png",
"scheme": "freya", "scheme": "aelis",
"userInterfaceStyle": "automatic", "userInterfaceStyle": "automatic",
"newArchEnabled": true, "newArchEnabled": true,
"ios": { "ios": {
@@ -15,7 +15,7 @@
}, },
"ITSAppUsesNonExemptEncryption": false "ITSAppUsesNonExemptEncryption": false
}, },
"bundleIdentifier": "sh.nym.freya" "bundleIdentifier": "sh.nym.aelis"
}, },
"android": { "android": {
"adaptiveIcon": { "adaptiveIcon": {
@@ -26,7 +26,7 @@
}, },
"edgeToEdgeEnabled": true, "edgeToEdgeEnabled": true,
"predictiveBackGestureEnabled": false, "predictiveBackGestureEnabled": false,
"package": "sh.nym.freya" "package": "sh.nym.aelis"
}, },
"web": { "web": {
"output": "static", "output": "static",

Some files were not shown because too many files have changed in this diff Show More