Compare commits

..

7 Commits

Author SHA1 Message Date
ac90d46c2a feat: add google maps mcp source 2026-06-13 01:18:26 +01:00
ef7301ab18 feat: add exa web search source (#124) 2026-06-13 00:46:53 +01:00
877b955493 feat: add mcp source primitive (#123) 2026-06-12 22:50:42 +01:00
6b1db0b3d3 chore: rename aelis to freya (#122) 2026-06-12 17:35:26 +01:00
7e77870c13 chore: move services to package scripts (#121) 2026-06-12 16:31:28 +01:00
c95c730533 fix: add .ona and drizzle to oxfmt ignore (#119)
oxfmt was reformatting generated drizzle migration snapshots and
crashing on .ona/review/comments.json. Also runs the formatter
across the full codebase.

Co-authored-by: Ona <no-reply@ona.com>
2026-04-12 18:33:46 +01:00
62c8dfe0b1 feat: wrap multi-step DB writes in transactions (#118)
- saveSourceConfig: upsert + credential update run atomically
- updateSourceConfig: SELECT FOR UPDATE prevents lost updates
- Widen Database type to accept transaction handles

Co-authored-by: Ona <no-reply@ona.com>
2026-04-12 15:46:30 +01:00
279 changed files with 5383 additions and 1028 deletions

View File

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

View File

@@ -1,45 +0,0 @@
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

@@ -8,5 +8,5 @@
"ignoreCase": true, "ignoreCase": true,
"newlinesBetween": true "newlinesBetween": true
}, },
"ignorePatterns": [".claude", "fixtures"] "ignorePatterns": [".claude", ".ona", "drizzle", "fixtures"]
} }

View File

@@ -2,7 +2,7 @@
## Project ## Project
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). 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).
## Commands ## Commands

View File

@@ -1,4 +1,4 @@
# aelis # freya
To install dependencies: To install dependencies:
@@ -8,14 +8,14 @@ bun install
## Packages ## Packages
### @aelis/source-tfl ### @freya/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/aelis-source-tfl cd packages/freya-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@aelis.local" placeholder="admin@freya.local"
required required
/> />
</div> </div>

View File

@@ -66,6 +66,20 @@ 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"] })
@@ -79,10 +93,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
(v) => typeof v === "string" && v.length > 0, (v) => typeof v === "string" && v.length > 0,
) )
const body: Parameters<typeof replaceSource>[1] = { const body = buildReplaceBody(enabled)
enabled,
config: getUserConfig(),
}
if (hasCredentials && source.perUserCredentials) { if (hasCredentials && source.perUserCredentials) {
body.credentials = credentialFields body.credentials = credentialFields
} }
@@ -104,8 +115,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
}) })
const toggleMutation = useMutation({ const toggleMutation = useMutation({
mutationFn: (checked: boolean) => mutationFn: (checked: boolean) => replaceSource(source.id, buildReplaceBody(checked)),
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"}`)
@@ -116,7 +126,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
}) })
const deleteMutation = useMutation({ const deleteMutation = useMutation({
mutationFn: () => replaceSource(source.id, { enabled: false, config: {} }), mutationFn: () => replaceSource(source.id, buildReplaceBody(false)),
onSuccess() { onSuccess() {
setDirty({}) setDirty({})
invalidate() invalidate()
@@ -247,7 +257,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
)} )}
{/* Always-on sources */} {/* Always-on sources */}
{source.alwaysEnabled && source.id !== "aelis.location" && ( {source.alwaysEnabled && source.id !== "freya.location" && (
<> <>
<Separator /> <Separator />
<p className="text-sm text-muted-foreground"> <p className="text-sm text-muted-foreground">
@@ -256,7 +266,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
</> </>
)} )}
{source.id === "aelis.location" && <LocationCard />} {source.id === "freya.location" && <LocationCard />}
</div> </div>
) )
} }

View File

@@ -36,14 +36,14 @@ export interface SourceConfig {
const sourceDefinitions: SourceDefinition[] = [ const sourceDefinitions: SourceDefinition[] = [
{ {
id: "aelis.location", id: "freya.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: "aelis.weather", id: "freya.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: "aelis.caldav", id: "freya.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: "aelis.tfl", id: "freya.tfl",
name: "TfL", name: "TfL",
description: "Transport for London tube line status alerts.", description: "Transport for London tube line status alerts.",
fields: { fields: {
@@ -151,6 +151,18 @@ const sourceDefinitions: SourceDefinition[] = [
}, },
}, },
}, },
{
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[]> {
@@ -174,7 +186,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",

View File

@@ -1,4 +1,4 @@
const STORAGE_KEY = "aelis-server-url" const STORAGE_KEY = "freya-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

@@ -15,6 +15,7 @@ import {
Loader2, Loader2,
TrainFront, TrainFront,
LogOut, LogOut,
Map as MapIcon,
MapPin, MapPin,
Rss, Rss,
Server, Server,
@@ -45,11 +46,12 @@ 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 }>> = {
"aelis.location": MapPin, "freya.location": MapPin,
"aelis.weather": CloudSun, "freya.weather": CloudSun,
"aelis.caldav": CalendarDays, "freya.caldav": CalendarDays,
"aelis.google-calendar": Calendar, "freya.google-calendar": Calendar,
"aelis.tfl": TrainFront, "freya.google-maps": MapIcon,
"freya.tfl": TrainFront,
} }
export const Route = createRoute({ export const Route = createRoute({

View File

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

View File

@@ -1,5 +1,5 @@
{ {
"name": "@aelis/backend", "name": "@freya/backend",
"version": "0.0.0", "version": "0.0.0",
"type": "module", "type": "module",
"main": "src/server.ts", "main": "src/server.ts",
@@ -15,12 +15,14 @@
"create-admin": "bun run src/scripts/create-admin.ts" "create-admin": "bun run src/scripts/create-admin.ts"
}, },
"dependencies": { "dependencies": {
"@aelis/core": "workspace:*", "@freya/core": "workspace:*",
"@aelis/source-caldav": "workspace:*", "@freya/source-caldav": "workspace:*",
"@aelis/source-google-calendar": "workspace:*", "@freya/source-google-calendar": "workspace:*",
"@aelis/source-location": "workspace:*", "@freya/source-google-maps": "workspace:*",
"@aelis/source-tfl": "workspace:*", "@freya/source-location": "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 "@aelis/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/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("aelis.location")]) const { app } = createApp([createStubProvider("freya.location")])
const res = await app.request("/api/admin/aelis.nonexistent/config", { const res = await app.request("/api/admin/freya.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("aelis.location")]) const { app } = createApp([createStubProvider("freya.location")])
const res = await app.request("/api/admin/aelis.location/config", { const res = await app.request("/api/admin/freya.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("aelis.weather")]) const { app } = createApp([createStubProvider("freya.weather")])
const res = await app.request("/api/admin/aelis.weather/config", { const res = await app.request("/api/admin/freya.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("aelis.weather")]) const { app } = createApp([createStubProvider("freya.weather")])
const res = await app.request("/api/admin/aelis.weather/config", { const res = await app.request("/api/admin/freya.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("aelis.weather")]) const { app, sessionManager } = createApp([createStubProvider("freya.weather")])
const originalProvider = sessionManager.getProvider("aelis.weather") const originalProvider = sessionManager.getProvider("freya.weather")
const res = await app.request("/api/admin/aelis.weather/config", { const res = await app.request("/api/admin/freya.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("aelis.weather") const provider = sessionManager.getProvider("freya.weather")
expect(provider).toBeDefined() expect(provider).toBeDefined()
expect(provider!.sourceId).toBe("aelis.weather") expect(provider!.sourceId).toBe("freya.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 "aelis.weather": { case "freya.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

@@ -1,5 +1,5 @@
import { Hono } from "hono"
import { describe, expect, test } from "bun:test" import { describe, expect, test } from "bun:test"
import { Hono } from "hono"
import type { Auth } from "./index.ts" import type { Auth } from "./index.ts"
import type { AuthSession, AuthUser } from "./session.ts" import type { AuthSession, AuthUser } from "./session.ts"

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@aelis.local", email: "dev@freya.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: "aelis-dev", userAgent: "freya-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 aelis.caldav", () => { test("sourceId is freya.caldav", () => {
expect(provider.sourceId).toBe("aelis.caldav") expect(provider.sourceId).toBe("freya.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("aelis.caldav") expect(source.id).toBe("freya.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("aelis.caldav") expect(source.id).toBe("freya.caldav")
}) })
}) })

View File

@@ -1,4 +1,4 @@
import { CalDavSource } from "@aelis/source-caldav" import { CalDavSource } from "@freya/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 = "aelis.caldav" readonly sourceId = "freya.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("aelis.caldav", "No CalDAV credentials configured") throw new InvalidSourceCredentialsError("freya.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("aelis.caldav", creds.summary) throw new InvalidSourceCredentialsError("freya.caldav", creds.summary)
} }
return new CalDavSource({ return new CalDavSource({

View File

@@ -29,7 +29,7 @@ export {
import { user } from "./auth-schema.ts" import { user } from "./auth-schema.ts"
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// AELIS — per-user source configuration // FREYA — per-user source configuration
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
const bytea = customType<{ data: Buffer }>({ const bytea = customType<{ data: Buffer }>({

View File

@@ -1,6 +1,6 @@
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
import { contextKey } from "@aelis/core" import { contextKey } from "@freya/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("aelis.weather", "weather") const weatherKey = contextKey("freya.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=["aelis.weather","weather"]') const res = await app.request('/api/context?key=["freya.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=["aelis.weather"]&match=invalid') const res = await app.request('/api/context?key=["freya.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=["aelis.weather","weather"]&match=exact') const res = await app.request('/api/context?key=["freya.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=["aelis.weather"]&match=exact') const res = await app.request('/api/context?key=["freya.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=["aelis.weather"]&match=prefix') const res = await app.request('/api/context?key=["freya.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(["aelis.weather", "weather"]) expect(body.entries[0]!.key).toEqual(["freya.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=["aelis.weather","weather"]') const res = await app.request('/api/context?key=["freya.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=["aelis.weather"]') const res = await app.request('/api/context?key=["freya.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 "@aelis/core" import { contextKey } from "@freya/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 "@aelis/core" import type { FeedItem } from "@freya/core"
import type { LlmClient } from "./llm-client.ts" import type { LlmClient } from "./llm-client.ts"
@@ -47,5 +47,3 @@ export function createFeedEnhancer(config: FeedEnhancerConfig): FeedEnhancer {
return mergeEnhancement(items, result, currentTime) return mergeEnhancement(items, result, currentTime)
} }
} }

View File

@@ -1,4 +1,4 @@
import type { FeedItem } from "@aelis/core" import type { FeedItem } from "@freya/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 "@aelis/core" import type { FeedItem } from "@freya/core"
import type { EnhancementResult } from "./schema.ts" import type { EnhancementResult } from "./schema.ts"
const ENHANCEMENT_SOURCE_ID = "aelis.enhancement" const ENHANCEMENT_SOURCE_ID = "freya.enhancement"
/** /**
* Merges an EnhancementResult into feed items. * Merges an EnhancementResult into feed items.

View File

@@ -1,4 +1,4 @@
import type { FeedItem } from "@aelis/core" import type { FeedItem } from "@freya/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 "@aelis/core" import type { FeedItem } from "@freya/core"
import { CalDavFeedItemType } from "@aelis/source-caldav" import { CalDavFeedItemType } from "@freya/source-caldav"
import { CalendarFeedItemType } from "@aelis/source-google-calendar" import { CalendarFeedItemType } from "@freya/source-google-calendar"
import systemPromptBase from "./prompts/system.txt" import systemPromptBase from "./prompts/system.txt"
@@ -36,8 +36,7 @@ export function buildPrompt(
for (const item of items) { for (const item of items) {
const hasUnfilledSlots = const hasUnfilledSlots =
item.slots && item.slots && Object.values(item.slots).some((slot) => slot.content === null)
Object.values(item.slots).some((slot) => slot.content === null)
if (hasUnfilledSlots) { if (hasUnfilledSlots) {
enhanceItems.push({ enhanceItems.push({
@@ -79,9 +78,7 @@ export function buildPrompt(
*/ */
export function hasUnfilledSlots(items: FeedItem[]): boolean { export function hasUnfilledSlots(items: FeedItem[]): boolean {
return items.some( return items.some(
(item) => (item) => item.slots && Object.values(item.slots).some((slot) => slot.content === null),
item.slots &&
Object.values(item.slots).some((slot) => slot.content === null),
) )
} }
@@ -129,7 +126,20 @@ function extractCalendarEntry(item: FeedItem): CalendarEntry | null {
} }
const DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] as const const DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] as const
const MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] as const const MONTHS = [
"Jan",
"Feb",
"Mar",
"Apr",
"May",
"Jun",
"Jul",
"Aug",
"Sep",
"Oct",
"Nov",
"Dec",
] as const
function pad2(n: number): string { function pad2(n: number): string {
return n.toString().padStart(2, "0") return n.toString().padStart(2, "0")
@@ -144,7 +154,11 @@ function formatDayShort(date: Date): string {
} }
function formatDayLabel(date: Date, currentTime: Date): string { function formatDayLabel(date: Date, currentTime: Date): string {
const currentDay = Date.UTC(currentTime.getUTCFullYear(), currentTime.getUTCMonth(), currentTime.getUTCDate()) const currentDay = Date.UTC(
currentTime.getUTCFullYear(),
currentTime.getUTCMonth(),
currentTime.getUTCDate(),
)
const targetDay = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()) const targetDay = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())
const diffDays = Math.round((targetDay - currentDay) / (1000 * 60 * 60 * 24)) const diffDays = Math.round((targetDay - currentDay) / (1000 * 60 * 60 * 24))

View File

@@ -1,4 +1,4 @@
You are AELIS, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items. You are FREYA, 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

@@ -135,9 +135,7 @@ describe("schema sync", () => {
// JSON Schema structure matches // JSON Schema structure matches
const jsonSchema = enhancementResultJsonSchema const jsonSchema = enhancementResultJsonSchema
expect(Object.keys(jsonSchema.properties).sort()).toEqual( expect(Object.keys(jsonSchema.properties).sort()).toEqual(Object.keys(payload).sort())
Object.keys(payload).sort(),
)
expect([...jsonSchema.required].sort()).toEqual(Object.keys(payload).sort()) expect([...jsonSchema.required].sort()).toEqual(Object.keys(payload).sort())
// syntheticItems item schema has the right required fields // syntheticItems item schema has the right required fields
@@ -167,11 +165,7 @@ describe("schema sync", () => {
// JSON Schema only allows string or null for slot values // JSON Schema only allows string or null for slot values
const slotValueSchema = const slotValueSchema =
enhancementResultJsonSchema.properties.slotFills.additionalProperties enhancementResultJsonSchema.properties.slotFills.additionalProperties.additionalProperties
.additionalProperties expect(slotValueSchema.anyOf).toEqual([{ type: "string" }, { type: "null" }])
expect(slotValueSchema.anyOf).toEqual([
{ type: "string" },
{ type: "null" },
])
}) })
}) })

View File

@@ -0,0 +1,55 @@
import type { GoogleMapsSourceOptions } from "@freya/source-google-maps"
import { describe, expect, test } from "bun:test"
import { GoogleMapsSourceProvider } from "./provider.ts"
type McpClient = NonNullable<GoogleMapsSourceOptions["client"]>
class MockMcpClient implements McpClient {
async listTools(): ReturnType<McpClient["listTools"]> {
return { tools: [] }
}
async readResource(
_params: Parameters<McpClient["readResource"]>[0],
): ReturnType<McpClient["readResource"]> {
throw new Error("unexpected resource read")
}
async callTool(_params: Parameters<McpClient["callTool"]>[0]): ReturnType<McpClient["callTool"]> {
return { structuredContent: {} }
}
}
describe("GoogleMapsSourceProvider", () => {
test("sourceId is freya.google-maps", () => {
const provider = new GoogleMapsSourceProvider({ apiKey: "key" })
expect(provider.sourceId).toBe("freya.google-maps")
})
test("throws when service API key is empty", () => {
expect(() => new GoogleMapsSourceProvider({ apiKey: "" })).toThrow(
"Google Maps MCP API key must be configured",
)
})
test("returns source with service API key", async () => {
const provider = new GoogleMapsSourceProvider({ apiKey: "key" })
const source = await provider.feedSourceForUser("user-1", {}, null)
expect(source.id).toBe("freya.google-maps")
})
test("allows injected test client with service API key", async () => {
const provider = new GoogleMapsSourceProvider({
apiKey: "key",
client: new MockMcpClient(),
})
const source = await provider.feedSourceForUser("user-1", {}, null)
expect(source.id).toBe("freya.google-maps")
})
})

View File

@@ -0,0 +1,39 @@
import { GoogleMapsSource, type GoogleMapsSourceOptions } from "@freya/source-google-maps"
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
export interface GoogleMapsSourceProviderOptions {
readonly apiKey: string
readonly client?: GoogleMapsSourceOptions["client"]
}
export class GoogleMapsSourceProvider implements FeedSourceProvider {
readonly sourceId = "freya.google-maps"
private readonly apiKey: string
private readonly client: GoogleMapsSourceProviderOptions["client"]
constructor(options: GoogleMapsSourceProviderOptions) {
if (!nonEmptyString(options.apiKey)) {
throw new Error("Google Maps MCP API key must be configured")
}
this.apiKey = options.apiKey
this.client = options.client
}
async feedSourceForUser(
_userId: string,
_config: unknown,
_credentials: unknown,
): Promise<GoogleMapsSource> {
return new GoogleMapsSource({
apiKey: this.apiKey,
client: this.client,
})
}
}
function nonEmptyString(value: string): boolean {
return typeof value === "string" && value.trim().length > 0
}

View File

@@ -1,5 +1,5 @@
import { randomBytes } from "node:crypto"
import { describe, expect, test } from "bun:test" import { describe, expect, test } from "bun:test"
import { randomBytes } from "node:crypto"
import { CredentialEncryptor } from "./crypto.ts" import { CredentialEncryptor } from "./crypto.ts"

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("aelis.location", "update-location", { await session.engine.executeAction("freya.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 "@aelis/source-location" import { LocationSource } from "@freya/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 = "aelis.location" readonly sourceId = "freya.location"
async feedSourceForUser( async feedSourceForUser(
_userId: string, _userId: string,

View File

@@ -11,6 +11,7 @@ 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"
@@ -18,6 +19,7 @@ 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!)
@@ -46,6 +48,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: [
@@ -60,6 +67,10 @@ 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,
@@ -122,5 +133,6 @@ 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 "@aelis/core" import type { FeedSource } from "@freya/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., "aelis.location"). */ /** The source ID this provider is responsible for (e.g., "freya.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 "@aelis/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
import { LocationSource } from "@aelis/source-location" import { LocationSource } from "@freya/source-location"
import { WeatherSource } from "@aelis/source-weatherkit" import { WeatherSource } from "@freya/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: "aelis.location", sourceId: "freya.location",
async feedSourceForUser() { async feedSourceForUser() {
return new LocationSource() return new LocationSource()
}, },
} }
const weatherProvider: FeedSourceProvider = { const weatherProvider: FeedSourceProvider = {
sourceId: "aelis.weather", sourceId: "freya.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(["aelis.location"]) setEnabledSources(["freya.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(["aelis.location"]) setEnabledSources(["freya.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(["aelis.location"]) setEnabledSources(["freya.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(["aelis.location"]) setEnabledSources(["freya.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>("aelis.location") const source1 = session1.getSource<LocationSource>("freya.location")
const source2 = session2.getSource<LocationSource>("aelis.location") const source2 = session2.getSource<LocationSource>("freya.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(["aelis.location"]) setEnabledSources(["freya.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(["aelis.location"]) setEnabledSources(["freya.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(["aelis.location", "aelis.weather"]) setEnabledSources(["freya.location", "freya.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("aelis.location")).toBeDefined() expect(session.getSource("freya.location")).toBeDefined()
expect(session.getSource("aelis.weather")).toBeDefined() expect(session.getSource("freya.weather")).toBeDefined()
}) })
test("refresh returns feed result through session", async () => { test("refresh returns feed result through session", async () => {
setEnabledSources(["aelis.location"]) setEnabledSources(["freya.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(["aelis.location"]) setEnabledSources(["freya.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("aelis.location", "update-location", { await session.engine.executeAction("freya.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>("aelis.location") const source = session.getSource<LocationSource>("freya.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(["aelis.location"]) setEnabledSources(["freya.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("aelis.location", "update-location", { await session.engine.executeAction("freya.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(["aelis.location"]) setEnabledSources(["freya.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("aelis.location", "update-location", { await session2.engine.executeAction("freya.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(["aelis.location", "aelis.failing"]) setEnabledSources(["freya.location", "freya.failing"])
const failingProvider: FeedSourceProvider = { const failingProvider: FeedSourceProvider = {
sourceId: "aelis.failing", sourceId: "freya.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("aelis.location")).toBeDefined() expect(session.getSource("freya.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(["aelis.fail-1", "aelis.fail-2"]) setEnabledSources(["freya.fail-1", "freya.fail-2"])
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [ providers: [
{ {
sourceId: "aelis.fail-1", sourceId: "freya.fail-1",
async feedSourceForUser() { async feedSourceForUser() {
throw new Error("first failed") throw new Error("first failed")
}, },
}, },
{ {
sourceId: "aelis.fail-2", sourceId: "freya.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(["aelis.location"]) setEnabledSources(["freya.location"])
let callCount = 0 let callCount = 0
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [ providers: [
{ {
sourceId: "aelis.location", sourceId: "freya.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(["aelis.location"]) setEnabledSources(["freya.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: "aelis.location", sourceId: "freya.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(["aelis.location"]) setEnabledSources(["freya.location"])
const locationFactory = mock(async () => createStubSource("aelis.location")) const locationFactory = mock(async () => createStubSource("freya.location"))
const weatherFactory = mock(async () => createStubSource("aelis.weather")) const weatherFactory = mock(async () => createStubSource("freya.weather"))
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [ providers: [
{ sourceId: "aelis.location", feedSourceForUser: locationFactory }, { sourceId: "freya.location", feedSourceForUser: locationFactory },
{ sourceId: "aelis.weather", feedSourceForUser: weatherFactory }, { sourceId: "freya.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("aelis.location")).toBeDefined() expect(session.getSource("freya.location")).toBeDefined()
expect(session.getSource("aelis.weather")).toBeUndefined() expect(session.getSource("freya.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("aelis.location")) const factory = mock(async () => createStubSource("freya.location"))
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [{ sourceId: "aelis.location", feedSourceForUser: factory }], providers: [{ sourceId: "freya.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("aelis.location")).toBeUndefined() expect(session.getSource("freya.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", ["aelis.location"]) setEnabledSourcesForUser("user-1", ["freya.location"])
setEnabledSourcesForUser("user-2", ["aelis.weather"]) setEnabledSourcesForUser("user-2", ["freya.weather"])
const manager = new UserSessionManager({ const manager = new UserSessionManager({
db: fakeDb, db: fakeDb,
providers: [createStubProvider("aelis.location"), createStubProvider("aelis.weather")], providers: [createStubProvider("freya.location"), createStubProvider("freya.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("aelis.location")).toBeDefined() expect(session1.getSource("freya.location")).toBeDefined()
expect(session1.getSource("aelis.weather")).toBeUndefined() expect(session1.getSource("freya.weather")).toBeUndefined()
expect(session2.getSource("aelis.location")).toBeUndefined() expect(session2.getSource("freya.location")).toBeUndefined()
expect(session2.getSource("aelis.weather")).toBeDefined() expect(session2.getSource("freya.weather")).toBeDefined()
}) })
}) })
@@ -525,10 +525,10 @@ describe("UserSessionManager.replaceProvider", () => {
}) })
test("throws for unknown provider sourceId", async () => { test("throws for unknown provider sourceId", async () => {
setEnabledSources(["aelis.location"]) setEnabledSources(["freya.location"])
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] }) const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
const unknownProvider = createStubProvider("aelis.unknown") const unknownProvider = createStubProvider("freya.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 "@aelis/core" import type { FeedSource } from "@freya/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 "@aelis/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
import { LocationSource } from "@aelis/source-location" import { LocationSource } from "@freya/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>("aelis.location") const result = session.getSource<LocationSource>("freya.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("aelis.location", "update-location", { await session.engine.executeAction("freya.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 "@aelis/core" import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@freya/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 "@aelis/core" import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/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,6 +186,18 @@ 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
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -193,16 +205,16 @@ function put(app: Hono, sourceId: string, body: unknown) {
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("aelis.weather", weatherConfig)]) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
const res = await get(app, "aelis.weather") const res = await get(app, "freya.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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "unknown.source") const res = await get(app, "unknown.source")
@@ -213,13 +225,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "aelis.weather") const res = await get(app, "freya.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 }
@@ -229,9 +241,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "aelis.weather") const res = await get(app, "freya.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,13 +253,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
enabled: false, enabled: false,
config: { units: "imperial" }, config: { units: "imperial" },
}) })
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await get(app, "aelis.weather") const res = await get(app, "freya.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 }
@@ -259,16 +271,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("aelis.weather", weatherConfig)]) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
const res = await patch(app, "aelis.weather", { enabled: true }) const res = await patch(app, "freya.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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "unknown.source", { enabled: true }) const res = await patch(app, "unknown.source", { enabled: true })
@@ -279,9 +291,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", { enabled: true }) const res = await patch(app, "freya.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 }
@@ -290,29 +302,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, "aelis.weather") activeStore.seed(MOCK_USER_ID, "freya.weather")
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", {}) const res = await patch(app, "freya.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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", {}) const res = await patch(app, "freya.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, "aelis.weather") activeStore.seed(MOCK_USER_ID, "freya.weather")
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await app.request("/api/sources/aelis.weather", { const res = await app.request("/api/sources/freya.weather", {
method: "PATCH", method: "PATCH",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: "not json", body: "not json",
@@ -325,10 +337,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, "aelis.weather") activeStore.seed(MOCK_USER_ID, "freya.weather")
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", { const res = await patch(app, "freya.weather", {
enabled: true, enabled: true,
unknownField: "hello", unknownField: "hello",
}) })
@@ -338,10 +350,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, "aelis.weather") activeStore.seed(MOCK_USER_ID, "freya.weather")
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", { const res = await patch(app, "freya.weather", {
config: { units: "metric", unknownField: "hello" }, config: { units: "metric", unknownField: "hello" },
}) })
@@ -350,10 +362,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, "aelis.weather") activeStore.seed(MOCK_USER_ID, "freya.weather")
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", { const res = await patch(app, "freya.weather", {
config: { units: "invalid" }, config: { units: "invalid" },
}) })
@@ -362,65 +374,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", { enabled: false }) const res = await patch(app, "freya.weather", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", { const res = await patch(app, "freya.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}:aelis.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.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, "aelis.tfl", { activeStore.seed(MOCK_USER_ID, "freya.tfl", {
enabled: true, enabled: true,
config: { lines: ["bakerloo"] }, config: { lines: ["bakerloo"] },
}) })
const { app } = createApp([createStubProvider("aelis.tfl", tflConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.tfl", tflConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.tfl", { enabled: false }) const res = await patch(app, "freya.tfl", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.tfl`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
config: { units: "metric", hourlyLimit: 12 }, config: { units: "metric", hourlyLimit: 12 },
}) })
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await patch(app, "aelis.weather", { const res = await patch(app, "freya.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}:aelis.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
expect(row!.config).toEqual({ expect(row!.config).toEqual({
units: "metric", units: "metric",
hourlyLimit: 12, hourlyLimit: 12,
@@ -430,18 +442,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("aelis.weather", weatherConfig)], [createStubProvider("freya.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, "aelis.weather", { const res = await patch(app, "freya.weather", {
config: { units: "imperial" }, config: { units: "imperial" },
}) })
@@ -452,31 +464,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("aelis.weather", weatherConfig)], [createStubProvider("freya.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, "aelis.weather", { enabled: false }) const res = await patch(app, "freya.weather", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
expect(removeSpy).toHaveBeenCalledWith("aelis.weather") expect(removeSpy).toHaveBeenCalledWith("freya.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, "aelis.location") activeStore.seed(MOCK_USER_ID, "freya.location")
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await patch(app, "aelis.location", { const res = await patch(app, "freya.location", {
config: { something: "value" }, config: { something: "value" },
}) })
@@ -485,10 +497,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, "aelis.location") activeStore.seed(MOCK_USER_ID, "freya.location")
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await patch(app, "aelis.location", { const res = await patch(app, "freya.location", {
config: {}, config: {},
}) })
@@ -497,13 +509,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, "aelis.location", { enabled: true }) activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true })
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await patch(app, "aelis.location", { enabled: false }) const res = await patch(app, "freya.location", { enabled: false })
expect(res.status).toBe(204) expect(res.status).toBe(204)
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.location`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.location`)
expect(row!.enabled).toBe(false) expect(row!.enabled).toBe(false)
}) })
}) })
@@ -515,16 +527,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("aelis.weather", weatherConfig)]) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
const res = await put(app, "aelis.weather", { enabled: true, config: {} }) const res = await put(app, "freya.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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.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: {} })
@@ -535,9 +547,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await app.request("/api/sources/aelis.weather", { const res = await app.request("/api/sources/freya.weather", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: "not json", body: "not json",
@@ -550,27 +562,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { config: {} }) const res = await put(app, "freya.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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { enabled: true }) const res = await put(app, "freya.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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { const res = await put(app, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
unknownField: "hello", unknownField: "hello",
@@ -581,9 +593,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { const res = await put(app, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric", unknownField: "hello" }, config: { units: "metric", unknownField: "hello" },
}) })
@@ -593,9 +605,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { const res = await put(app, "freya.weather", {
enabled: true, enabled: true,
config: { units: "invalid" }, config: { units: "invalid" },
}) })
@@ -605,15 +617,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { const res = await put(app, "freya.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}:aelis.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.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" })
@@ -621,19 +633,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric", hourlyLimit: 12 }, config: { units: "metric", hourlyLimit: 12 },
}) })
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { const res = await put(app, "freya.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}:aelis.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.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" })
@@ -641,18 +653,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("aelis.weather", weatherConfig)], [createStubProvider("freya.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, "aelis.weather", { const res = await put(app, "freya.weather", {
enabled: true, enabled: true,
config: { units: "imperial" }, config: { units: "imperial" },
}) })
@@ -664,56 +676,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, "aelis.weather", { activeStore.seed(MOCK_USER_ID, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("aelis.weather", weatherConfig)], [createStubProvider("freya.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, "aelis.weather", { const res = await put(app, "freya.weather", {
enabled: false, enabled: false,
config: { units: "metric" }, config: { units: "metric" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
expect(removeSpy).toHaveBeenCalledWith("aelis.weather") expect(removeSpy).toHaveBeenCalledWith("freya.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, "aelis.location", { enabled: true }) activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true })
const { app, sessionManager } = createApp( const { app, sessionManager } = createApp(
[createStubProvider("aelis.location"), createStubProvider("aelis.weather", weatherConfig)], [createStubProvider("freya.location"), createStubProvider("freya.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
// Create session — only has aelis.location // Create session — only has freya.location
const session = await sessionManager.getOrCreate(MOCK_USER_ID) const session = await sessionManager.getOrCreate(MOCK_USER_ID)
expect(session.hasSource("aelis.weather")).toBe(false) expect(session.hasSource("freya.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, "aelis.weather", { const res = await put(app, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
}) })
expect(res.status).toBe(204) expect(res.status).toBe(204)
expect(session.hasSource("aelis.weather")).toBe(true) expect(session.hasSource("freya.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("aelis.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await put(app, "aelis.location", { const res = await put(app, "freya.location", {
enabled: true, enabled: true,
config: { something: "value" }, config: { something: "value" },
}) })
@@ -723,9 +735,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("aelis.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await put(app, "aelis.location", { const res = await put(app, "freya.location", {
enabled: true, enabled: true,
config: {}, config: {},
}) })
@@ -735,9 +747,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("aelis.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await put(app, "aelis.location", { const res = await put(app, "freya.location", {
enabled: true, enabled: true,
}) })
@@ -747,18 +759,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("aelis.weather", weatherConfig)], [createStubProvider("freya.weather", weatherConfig)],
MOCK_USER_ID, MOCK_USER_ID,
) )
const res = await put(app, "aelis.weather", { const res = await put(app, "freya.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}:aelis.weather`) const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.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" })
@@ -767,9 +779,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("aelis.weather", weatherConfig)], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
const res = await put(app, "aelis.weather", { const res = await put(app, "freya.weather", {
enabled: true, enabled: true,
config: { units: "metric" }, config: { units: "metric" },
credentials: { apiKey: "secret123" }, credentials: { apiKey: "secret123" },
@@ -781,19 +793,181 @@ 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("aelis.location")]) const { app } = createAppWithEncryptor([createStubProvider("freya.location")])
const res = await putCredentials(app, "aelis.location", { token: "x" }) const res = await putCredentials(app, "freya.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("aelis.location")], MOCK_USER_ID) const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await putCredentials(app, "unknown.source", { token: "x" }) const res = await putCredentials(app, "unknown.source", { token: "x" })
@@ -802,10 +976,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, "aelis.location") activeStore.seed(MOCK_USER_ID, "freya.location")
const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID) const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await app.request("/api/sources/aelis.location/credentials", { const res = await app.request("/api/sources/freya.location/credentials", {
method: "PUT", method: "PUT",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: "not-json", body: "not-json",
@@ -818,10 +992,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, "aelis.location") activeStore.seed(MOCK_USER_ID, "freya.location")
const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID) const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await putCredentials(app, "aelis.location", { token: "secret" }) const res = await putCredentials(app, "freya.location", { token: "secret" })
expect(res.status).toBe(204) expect(res.status).toBe(204)
}) })
@@ -853,10 +1027,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, "aelis.location") activeStore.seed(MOCK_USER_ID, "freya.location")
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID) const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
const res = await putCredentials(app, "aelis.location", { token: "x" }) const res = await putCredentials(app, "freya.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,3 +1,4 @@
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"
@@ -55,6 +56,13 @@ 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,
@@ -189,6 +197,71 @@ 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) {
@@ -228,3 +301,21 @@ 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 "@aelis/source-tfl" import { TflSource, type ITflApi, type TflLineId } from "@freya/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 = "aelis.tfl" readonly sourceId = "freya.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 "@aelis/source-weatherkit" import { WeatherSource, type WeatherSourceOptions } from "@freya/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 = "aelis.weather" readonly sourceId = "freya.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

@@ -0,0 +1,30 @@
import { WebSearchSource, type WebSearchClient } from "@freya/source-web-search"
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
export type WebSearchSourceProviderOptions =
| { apiKey: string | undefined; client?: never }
| { apiKey?: never; client: WebSearchClient }
export class WebSearchSourceProvider implements FeedSourceProvider {
readonly sourceId = "freya.web-search"
private readonly apiKey: string | undefined
private readonly client: WebSearchClient | undefined
constructor(options: WebSearchSourceProviderOptions) {
this.apiKey = "apiKey" in options ? options.apiKey : undefined
this.client = "client" in options ? options.client : undefined
}
async feedSourceForUser(
_userId: string,
_config: unknown,
_credentials: unknown,
): Promise<WebSearchSource> {
return new WebSearchSource({
apiKey: this.apiKey,
client: this.client,
})
}
}

View File

@@ -1,11 +1,11 @@
{ {
"expo": { "expo": {
"name": "Aelis", "name": "Freya",
"slug": "aelis-client", "slug": "freya-client",
"version": "1.0.0", "version": "1.0.0",
"orientation": "portrait", "orientation": "portrait",
"icon": "./assets/images/icon.png", "icon": "./assets/images/icon.png",
"scheme": "aelis", "scheme": "freya",
"userInterfaceStyle": "automatic", "userInterfaceStyle": "automatic",
"newArchEnabled": true, "newArchEnabled": true,
"ios": { "ios": {
@@ -15,7 +15,7 @@
}, },
"ITSAppUsesNonExemptEncryption": false "ITSAppUsesNonExemptEncryption": false
}, },
"bundleIdentifier": "sh.nym.aelis" "bundleIdentifier": "sh.nym.freya"
}, },
"android": { "android": {
"adaptiveIcon": { "adaptiveIcon": {
@@ -26,7 +26,7 @@
}, },
"edgeToEdgeEnabled": true, "edgeToEdgeEnabled": true,
"predictiveBackGestureEnabled": false, "predictiveBackGestureEnabled": false,
"package": "sh.nym.aelis" "package": "sh.nym.freya"
}, },
"web": { "web": {
"output": "static", "output": "static",
@@ -55,44 +55,112 @@
"fontFamily": "Inter", "fontFamily": "Inter",
"fontDefinitions": [ "fontDefinitions": [
{ "path": "./assets/fonts/Inter_100Thin.ttf", "weight": 100 }, { "path": "./assets/fonts/Inter_100Thin.ttf", "weight": 100 },
{ "path": "./assets/fonts/Inter_100Thin_Italic.ttf", "weight": 100, "style": "italic" }, {
"path": "./assets/fonts/Inter_100Thin_Italic.ttf",
"weight": 100,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_200ExtraLight.ttf", "weight": 200 }, { "path": "./assets/fonts/Inter_200ExtraLight.ttf", "weight": 200 },
{ "path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf", "weight": 200, "style": "italic" }, {
"path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf",
"weight": 200,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_300Light.ttf", "weight": 300 }, { "path": "./assets/fonts/Inter_300Light.ttf", "weight": 300 },
{ "path": "./assets/fonts/Inter_300Light_Italic.ttf", "weight": 300, "style": "italic" }, {
"path": "./assets/fonts/Inter_300Light_Italic.ttf",
"weight": 300,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_400Regular.ttf", "weight": 400 }, { "path": "./assets/fonts/Inter_400Regular.ttf", "weight": 400 },
{ "path": "./assets/fonts/Inter_400Regular_Italic.ttf", "weight": 400, "style": "italic" }, {
"path": "./assets/fonts/Inter_400Regular_Italic.ttf",
"weight": 400,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_500Medium.ttf", "weight": 500 }, { "path": "./assets/fonts/Inter_500Medium.ttf", "weight": 500 },
{ "path": "./assets/fonts/Inter_500Medium_Italic.ttf", "weight": 500, "style": "italic" }, {
"path": "./assets/fonts/Inter_500Medium_Italic.ttf",
"weight": 500,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_600SemiBold.ttf", "weight": 600 }, { "path": "./assets/fonts/Inter_600SemiBold.ttf", "weight": 600 },
{ "path": "./assets/fonts/Inter_600SemiBold_Italic.ttf", "weight": 600, "style": "italic" }, {
"path": "./assets/fonts/Inter_600SemiBold_Italic.ttf",
"weight": 600,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_700Bold.ttf", "weight": 700 }, { "path": "./assets/fonts/Inter_700Bold.ttf", "weight": 700 },
{ "path": "./assets/fonts/Inter_700Bold_Italic.ttf", "weight": 700, "style": "italic" }, {
"path": "./assets/fonts/Inter_700Bold_Italic.ttf",
"weight": 700,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_800ExtraBold.ttf", "weight": 800 }, { "path": "./assets/fonts/Inter_800ExtraBold.ttf", "weight": 800 },
{ "path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf", "weight": 800, "style": "italic" }, {
"path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf",
"weight": 800,
"style": "italic"
},
{ "path": "./assets/fonts/Inter_900Black.ttf", "weight": 900 }, { "path": "./assets/fonts/Inter_900Black.ttf", "weight": 900 },
{ "path": "./assets/fonts/Inter_900Black_Italic.ttf", "weight": 900, "style": "italic" } {
"path": "./assets/fonts/Inter_900Black_Italic.ttf",
"weight": 900,
"style": "italic"
}
] ]
}, },
{ {
"fontFamily": "Source Serif 4", "fontFamily": "Source Serif 4",
"fontDefinitions": [ "fontDefinitions": [
{ "path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf", "weight": 200 }, { "path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf", "weight": 200 },
{ "path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf", "weight": 200, "style": "italic" }, {
"path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf",
"weight": 200,
"style": "italic"
},
{ "path": "./assets/fonts/SourceSerif4_300Light.ttf", "weight": 300 }, { "path": "./assets/fonts/SourceSerif4_300Light.ttf", "weight": 300 },
{ "path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf", "weight": 300, "style": "italic" }, {
"path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf",
"weight": 300,
"style": "italic"
},
{ "path": "./assets/fonts/SourceSerif4_400Regular.ttf", "weight": 400 }, { "path": "./assets/fonts/SourceSerif4_400Regular.ttf", "weight": 400 },
{ "path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf", "weight": 400, "style": "italic" }, {
"path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf",
"weight": 400,
"style": "italic"
},
{ "path": "./assets/fonts/SourceSerif4_500Medium.ttf", "weight": 500 }, { "path": "./assets/fonts/SourceSerif4_500Medium.ttf", "weight": 500 },
{ "path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf", "weight": 500, "style": "italic" }, {
"path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf",
"weight": 500,
"style": "italic"
},
{ "path": "./assets/fonts/SourceSerif4_600SemiBold.ttf", "weight": 600 }, { "path": "./assets/fonts/SourceSerif4_600SemiBold.ttf", "weight": 600 },
{ "path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf", "weight": 600, "style": "italic" }, {
"path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf",
"weight": 600,
"style": "italic"
},
{ "path": "./assets/fonts/SourceSerif4_700Bold.ttf", "weight": 700 }, { "path": "./assets/fonts/SourceSerif4_700Bold.ttf", "weight": 700 },
{ "path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf", "weight": 700, "style": "italic" }, {
"path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf",
"weight": 700,
"style": "italic"
},
{ "path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf", "weight": 800 }, { "path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf", "weight": 800 },
{ "path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf", "weight": 800, "style": "italic" }, {
"path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf",
"weight": 800,
"style": "italic"
},
{ "path": "./assets/fonts/SourceSerif4_900Black.ttf", "weight": 900 }, { "path": "./assets/fonts/SourceSerif4_900Black.ttf", "weight": 900 },
{ "path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf", "weight": 900, "style": "italic" } {
"path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf",
"weight": 900,
"style": "italic"
}
] ]
} }
] ]

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