Compare commits

..

1 Commits

Author SHA1 Message Date
33edc5c9f1 fix: add .ona and drizzle to oxfmt ignore
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 17:26:55 +00:00
264 changed files with 662 additions and 3127 deletions

View File

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

45
.ona/automations.yaml Normal file
View File

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

View File

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

View File

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

View File

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

View File

@@ -66,14 +66,6 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
return creds
}
function buildReplaceBody(enabledValue: boolean): Parameters<typeof replaceSource>[1] {
const body: Parameters<typeof replaceSource>[1] = { enabled: enabledValue }
if (Object.keys(source.fields).length > 0) {
body.config = getUserConfig()
}
return body
}
function invalidate() {
queryClient.invalidateQueries({ queryKey: ["sourceConfig", source.id] })
queryClient.invalidateQueries({ queryKey: ["configs"] })
@@ -87,7 +79,10 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
(v) => typeof v === "string" && v.length > 0,
)
const body = buildReplaceBody(enabled)
const body: Parameters<typeof replaceSource>[1] = {
enabled,
config: getUserConfig(),
}
if (hasCredentials && source.perUserCredentials) {
body.credentials = credentialFields
}
@@ -109,7 +104,8 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
})
const toggleMutation = useMutation({
mutationFn: (checked: boolean) => replaceSource(source.id, buildReplaceBody(checked)),
mutationFn: (checked: boolean) =>
replaceSource(source.id, { enabled: checked, config: getUserConfig() }),
onSuccess(_data, checked) {
invalidate()
toast.success(`Source ${checked ? "enabled" : "disabled"}`)
@@ -120,7 +116,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
})
const deleteMutation = useMutation({
mutationFn: () => replaceSource(source.id, buildReplaceBody(false)),
mutationFn: () => replaceSource(source.id, { enabled: false, config: {} }),
onSuccess() {
setDirty({})
invalidate()
@@ -251,7 +247,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
)}
{/* Always-on sources */}
{source.alwaysEnabled && source.id !== "freya.location" && (
{source.alwaysEnabled && source.id !== "aelis.location" && (
<>
<Separator />
<p className="text-sm text-muted-foreground">
@@ -260,7 +256,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
</>
)}
{source.id === "freya.location" && <LocationCard />}
{source.id === "aelis.location" && <LocationCard />}
</div>
)
}

View File

@@ -36,14 +36,14 @@ export interface SourceConfig {
const sourceDefinitions: SourceDefinition[] = [
{
id: "freya.location",
id: "aelis.location",
name: "Location",
description: "Device location provider. Always enabled as a dependency for other sources.",
alwaysEnabled: true,
fields: {},
},
{
id: "freya.weather",
id: "aelis.weather",
name: "WeatherKit",
description: "Apple WeatherKit weather data. Requires Apple Developer credentials.",
fields: {
@@ -81,7 +81,7 @@ const sourceDefinitions: SourceDefinition[] = [
},
},
{
id: "freya.caldav",
id: "aelis.caldav",
name: "CalDAV",
description: "Calendar events from any CalDAV server (Nextcloud, Radicale, Baikal, etc.).",
perUserCredentials: true,
@@ -119,7 +119,7 @@ const sourceDefinitions: SourceDefinition[] = [
},
},
{
id: "freya.tfl",
id: "aelis.tfl",
name: "TfL",
description: "Transport for London tube line status alerts.",
fields: {
@@ -151,12 +151,6 @@ const sourceDefinitions: SourceDefinition[] = [
},
},
},
{
id: "freya.web-search",
name: "Web Search",
description: "Exa web search action. Requires EXA_API_KEY on the backend.",
fields: {},
},
]
export function fetchSources(): Promise<SourceDefinition[]> {
@@ -180,7 +174,7 @@ export async function fetchConfigs(): Promise<SourceConfig[]> {
export async function replaceSource(
sourceId: string,
body: { enabled: boolean; config?: unknown; credentials?: Record<string, unknown> },
body: { enabled: boolean; config: unknown; credentials?: Record<string, unknown> },
): Promise<void> {
const res = await fetch(`${serverBase()}/sources/${sourceId}`, {
method: "PUT",

View File

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

View File

@@ -45,11 +45,11 @@ import { getSession, signOut } from "@/lib/auth"
import { Route as rootRoute } from "./__root"
const SOURCE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
"freya.location": MapPin,
"freya.weather": CloudSun,
"freya.caldav": CalendarDays,
"freya.google-calendar": Calendar,
"freya.tfl": TrainFront,
"aelis.location": MapPin,
"aelis.weather": CloudSun,
"aelis.caldav": CalendarDays,
"aelis.google-calendar": Calendar,
"aelis.tfl": TrainFront,
}
export const Route = createRoute({

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -18,7 +18,6 @@ import { UserSessionManager } from "./session/index.ts"
import { registerSourcesHttpHandlers } from "./sources/http.ts"
import { TflSourceProvider } from "./tfl/provider.ts"
import { WeatherSourceProvider } from "./weather/provider.ts"
import { WebSearchSourceProvider } from "./web-search/provider.ts"
function main() {
const { db, close: closeDb } = createDatabase(process.env.DATABASE_URL!)
@@ -61,7 +60,6 @@ function main() {
},
}),
new TflSourceProvider({ apiKey: process.env.TFL_API_KEY! }),
new WebSearchSourceProvider({ apiKey: process.env.EXA_API_KEY }),
],
feedEnhancer,
credentialEncryptor,
@@ -124,6 +122,5 @@ const app = main()
export default {
port: 3000,
hostname: "0.0.0.0",
fetch: app.fetch,
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,3 @@
import type { ActionDefinition } from "@freya/core"
import type { Context, Hono } from "hono"
import { type } from "arktype"
@@ -56,13 +55,6 @@ export function registerSourcesHttpHandlers(
app.get("/api/sources/:sourceId", inject, authSessionMiddleware, handleGetSource)
app.patch("/api/sources/:sourceId", inject, authSessionMiddleware, handleUpdateSource)
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(
"/api/sources/:sourceId/credentials",
inject,
@@ -197,71 +189,6 @@ async function handleReplaceSource(c: Context<Env>) {
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>) {
const sourceId = c.req.param("sourceId")
if (!sourceId) {
@@ -301,21 +228,3 @@ async function handleUpdateCredentials(c: Context<Env>) {
return c.body(null, 204)
}
function serializeActions(actions: Record<string, ActionDefinition>) {
const serialized: Record<string, { id: string; description?: string }> = {}
for (const [key, action] of Object.entries(actions)) {
serialized[key] = {
id: action.id,
...(action.description ? { description: action.description } : {}),
}
}
return serialized
}
function isActionNotFoundError(err: unknown): err is Error {
if (!(err instanceof Error)) {
return false
}
return err.message.startsWith("Source not found:") || err.message.startsWith("Action ")
}

View File

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

View File

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

View File

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

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