mirror of
https://github.com/kennethnym/aris.git
synced 2026-06-13 19:11:18 +01:00
Compare commits
1 Commits
feat/mcp-p
...
fix-tailne
| Author | SHA1 | Date | |
|---|---|---|---|
| 000b95ccb7 |
2
.github/workflows/build-waitlist-website.yml
vendored
2
.github/workflows/build-waitlist-website.yml
vendored
@@ -11,7 +11,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: cr.nym.sh
|
REGISTRY: cr.nym.sh
|
||||||
IMAGE_NAME: freya-waitlist-website
|
IMAGE_NAME: aelis-waitlist-website
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
## Project
|
## Project
|
||||||
|
|
||||||
FREYA is an AI-powered personal assistant that aggregates data from various sources into a contextual feed. Monorepo with `packages/` (shared libraries) and `apps/` (applications).
|
AELIS is an AI-powered personal assistant that aggregates data from various sources into a contextual feed. Monorepo with `packages/` (shared libraries) and `apps/` (applications).
|
||||||
|
|
||||||
## Commands
|
## Commands
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# freya
|
# aelis
|
||||||
|
|
||||||
To install dependencies:
|
To install dependencies:
|
||||||
|
|
||||||
@@ -8,14 +8,14 @@ bun install
|
|||||||
|
|
||||||
## Packages
|
## Packages
|
||||||
|
|
||||||
### @freya/source-tfl
|
### @aelis/source-tfl
|
||||||
|
|
||||||
TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.
|
TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.
|
||||||
|
|
||||||
#### Testing
|
#### Testing
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd packages/freya-source-tfl
|
cd packages/aelis-source-tfl
|
||||||
bun run test
|
bun run test
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ export function LoginPage({ onLogin }: LoginPageProps) {
|
|||||||
type="email"
|
type="email"
|
||||||
value={email}
|
value={email}
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
placeholder="admin@freya.local"
|
placeholder="admin@aelis.local"
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -247,7 +247,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Always-on sources */}
|
{/* Always-on sources */}
|
||||||
{source.alwaysEnabled && source.id !== "freya.location" && (
|
{source.alwaysEnabled && source.id !== "aelis.location" && (
|
||||||
<>
|
<>
|
||||||
<Separator />
|
<Separator />
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
@@ -256,7 +256,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{source.id === "freya.location" && <LocationCard />}
|
{source.id === "aelis.location" && <LocationCard />}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,14 +36,14 @@ export interface SourceConfig {
|
|||||||
|
|
||||||
const sourceDefinitions: SourceDefinition[] = [
|
const sourceDefinitions: SourceDefinition[] = [
|
||||||
{
|
{
|
||||||
id: "freya.location",
|
id: "aelis.location",
|
||||||
name: "Location",
|
name: "Location",
|
||||||
description: "Device location provider. Always enabled as a dependency for other sources.",
|
description: "Device location provider. Always enabled as a dependency for other sources.",
|
||||||
alwaysEnabled: true,
|
alwaysEnabled: true,
|
||||||
fields: {},
|
fields: {},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "freya.weather",
|
id: "aelis.weather",
|
||||||
name: "WeatherKit",
|
name: "WeatherKit",
|
||||||
description: "Apple WeatherKit weather data. Requires Apple Developer credentials.",
|
description: "Apple WeatherKit weather data. Requires Apple Developer credentials.",
|
||||||
fields: {
|
fields: {
|
||||||
@@ -81,7 +81,7 @@ const sourceDefinitions: SourceDefinition[] = [
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "freya.caldav",
|
id: "aelis.caldav",
|
||||||
name: "CalDAV",
|
name: "CalDAV",
|
||||||
description: "Calendar events from any CalDAV server (Nextcloud, Radicale, Baikal, etc.).",
|
description: "Calendar events from any CalDAV server (Nextcloud, Radicale, Baikal, etc.).",
|
||||||
perUserCredentials: true,
|
perUserCredentials: true,
|
||||||
@@ -119,7 +119,7 @@ const sourceDefinitions: SourceDefinition[] = [
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "freya.tfl",
|
id: "aelis.tfl",
|
||||||
name: "TfL",
|
name: "TfL",
|
||||||
description: "Transport for London tube line status alerts.",
|
description: "Transport for London tube line status alerts.",
|
||||||
fields: {
|
fields: {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const STORAGE_KEY = "freya-server-url"
|
const STORAGE_KEY = "aelis-server-url"
|
||||||
const DEFAULT_URL = "https://3000--019cf276-6ed6-7529-a425-210182693908.eu-runner.flex.doptig.cloud"
|
const DEFAULT_URL = "https://3000--019cf276-6ed6-7529-a425-210182693908.eu-runner.flex.doptig.cloud"
|
||||||
|
|
||||||
export function getServerUrl(): string {
|
export function getServerUrl(): string {
|
||||||
|
|||||||
@@ -45,11 +45,11 @@ import { getSession, signOut } from "@/lib/auth"
|
|||||||
import { Route as rootRoute } from "./__root"
|
import { Route as rootRoute } from "./__root"
|
||||||
|
|
||||||
const SOURCE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
|
const SOURCE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
|
||||||
"freya.location": MapPin,
|
"aelis.location": MapPin,
|
||||||
"freya.weather": CloudSun,
|
"aelis.weather": CloudSun,
|
||||||
"freya.caldav": CalendarDays,
|
"aelis.caldav": CalendarDays,
|
||||||
"freya.google-calendar": Calendar,
|
"aelis.google-calendar": Calendar,
|
||||||
"freya.tfl": TrainFront,
|
"aelis.tfl": TrainFront,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Route = createRoute({
|
export const Route = createRoute({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "@freya/backend",
|
"name": "@aelis/backend",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "src/server.ts",
|
"main": "src/server.ts",
|
||||||
@@ -15,12 +15,12 @@
|
|||||||
"create-admin": "bun run src/scripts/create-admin.ts"
|
"create-admin": "bun run src/scripts/create-admin.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@freya/core": "workspace:*",
|
"@aelis/core": "workspace:*",
|
||||||
"@freya/source-caldav": "workspace:*",
|
"@aelis/source-caldav": "workspace:*",
|
||||||
"@freya/source-google-calendar": "workspace:*",
|
"@aelis/source-google-calendar": "workspace:*",
|
||||||
"@freya/source-location": "workspace:*",
|
"@aelis/source-location": "workspace:*",
|
||||||
"@freya/source-tfl": "workspace:*",
|
"@aelis/source-tfl": "workspace:*",
|
||||||
"@freya/source-weatherkit": "workspace:*",
|
"@aelis/source-weatherkit": "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",
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import { describe, expect, mock, test } from "bun:test"
|
import { describe, expect, mock, test } from "bun:test"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
@@ -118,9 +118,9 @@ const validWeatherConfig = {
|
|||||||
|
|
||||||
describe("PUT /api/admin/:sourceId/config", () => {
|
describe("PUT /api/admin/:sourceId/config", () => {
|
||||||
test("returns 404 for unknown provider", async () => {
|
test("returns 404 for unknown provider", async () => {
|
||||||
const { app } = createApp([createStubProvider("freya.location")])
|
const { app } = createApp([createStubProvider("aelis.location")])
|
||||||
|
|
||||||
const res = await app.request("/api/admin/freya.nonexistent/config", {
|
const res = await app.request("/api/admin/aelis.nonexistent/config", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({ key: "value" }),
|
body: JSON.stringify({ key: "value" }),
|
||||||
@@ -132,9 +132,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 for provider without runtime config support", async () => {
|
test("returns 404 for provider without runtime config support", async () => {
|
||||||
const { app } = createApp([createStubProvider("freya.location")])
|
const { app } = createApp([createStubProvider("aelis.location")])
|
||||||
|
|
||||||
const res = await app.request("/api/admin/freya.location/config", {
|
const res = await app.request("/api/admin/aelis.location/config", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({ key: "value" }),
|
body: JSON.stringify({ key: "value" }),
|
||||||
@@ -146,9 +146,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 for invalid JSON body", async () => {
|
test("returns 400 for invalid JSON body", async () => {
|
||||||
const { app } = createApp([createStubProvider("freya.weather")])
|
const { app } = createApp([createStubProvider("aelis.weather")])
|
||||||
|
|
||||||
const res = await app.request("/api/admin/freya.weather/config", {
|
const res = await app.request("/api/admin/aelis.weather/config", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: "not json",
|
body: "not json",
|
||||||
@@ -160,9 +160,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when weather config fails validation", async () => {
|
test("returns 400 when weather config fails validation", async () => {
|
||||||
const { app } = createApp([createStubProvider("freya.weather")])
|
const { app } = createApp([createStubProvider("aelis.weather")])
|
||||||
|
|
||||||
const res = await app.request("/api/admin/freya.weather/config", {
|
const res = await app.request("/api/admin/aelis.weather/config", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({ credentials: { privateKey: 123 } }),
|
body: JSON.stringify({ credentials: { privateKey: 123 } }),
|
||||||
@@ -174,11 +174,11 @@ describe("PUT /api/admin/:sourceId/config", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 204 and applies valid weather config", async () => {
|
test("returns 204 and applies valid weather config", async () => {
|
||||||
const { app, sessionManager } = createApp([createStubProvider("freya.weather")])
|
const { app, sessionManager } = createApp([createStubProvider("aelis.weather")])
|
||||||
|
|
||||||
const originalProvider = sessionManager.getProvider("freya.weather")
|
const originalProvider = sessionManager.getProvider("aelis.weather")
|
||||||
|
|
||||||
const res = await app.request("/api/admin/freya.weather/config", {
|
const res = await app.request("/api/admin/aelis.weather/config", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify(validWeatherConfig),
|
body: JSON.stringify(validWeatherConfig),
|
||||||
@@ -187,9 +187,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
|
|||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
|
|
||||||
// Provider was replaced with a new instance
|
// Provider was replaced with a new instance
|
||||||
const provider = sessionManager.getProvider("freya.weather")
|
const provider = sessionManager.getProvider("aelis.weather")
|
||||||
expect(provider).toBeDefined()
|
expect(provider).toBeDefined()
|
||||||
expect(provider!.sourceId).toBe("freya.weather")
|
expect(provider!.sourceId).toBe("aelis.weather")
|
||||||
expect(provider).not.toBe(originalProvider)
|
expect(provider).not.toBe(originalProvider)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -60,7 +60,7 @@ async function handleUpdateProviderConfig(c: Context<Env>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch (sourceId) {
|
switch (sourceId) {
|
||||||
case "freya.weather": {
|
case "aelis.weather": {
|
||||||
const parsed = WeatherKitSourceProviderConfig(body)
|
const parsed = WeatherKitSourceProviderConfig(body)
|
||||||
if (parsed instanceof type.errors) {
|
if (parsed instanceof type.errors) {
|
||||||
return c.json({ error: parsed.summary }, 400)
|
return c.json({ error: parsed.summary }, 400)
|
||||||
@@ -79,7 +79,7 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
|
|||||||
const user: AuthUser = {
|
const user: AuthUser = {
|
||||||
id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
|
id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
|
||||||
name: "Dev User",
|
name: "Dev User",
|
||||||
email: "dev@freya.local",
|
email: "dev@aelis.local",
|
||||||
emailVerified: true,
|
emailVerified: true,
|
||||||
image: null,
|
image: null,
|
||||||
createdAt: now,
|
createdAt: now,
|
||||||
@@ -96,7 +96,7 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
|
|||||||
token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4",
|
token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4",
|
||||||
expiresAt,
|
expiresAt,
|
||||||
ipAddress: "127.0.0.1",
|
ipAddress: "127.0.0.1",
|
||||||
userAgent: "freya-dev",
|
userAgent: "aelis-dev",
|
||||||
createdAt: now,
|
createdAt: now,
|
||||||
updatedAt: now,
|
updatedAt: now,
|
||||||
}
|
}
|
||||||
@@ -5,8 +5,8 @@ import { CalDavSourceProvider } from "./provider.ts"
|
|||||||
describe("CalDavSourceProvider", () => {
|
describe("CalDavSourceProvider", () => {
|
||||||
const provider = new CalDavSourceProvider()
|
const provider = new CalDavSourceProvider()
|
||||||
|
|
||||||
test("sourceId is freya.caldav", () => {
|
test("sourceId is aelis.caldav", () => {
|
||||||
expect(provider.sourceId).toBe("freya.caldav")
|
expect(provider.sourceId).toBe("aelis.caldav")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("throws when credentials are null", async () => {
|
test("throws when credentials are null", async () => {
|
||||||
@@ -68,7 +68,7 @@ describe("CalDavSourceProvider", () => {
|
|||||||
|
|
||||||
const source = await provider.feedSourceForUser("user-1", config, credentials)
|
const source = await provider.feedSourceForUser("user-1", config, credentials)
|
||||||
expect(source).toBeDefined()
|
expect(source).toBeDefined()
|
||||||
expect(source.id).toBe("freya.caldav")
|
expect(source.id).toBe("aelis.caldav")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns CalDavSource with minimal config", async () => {
|
test("returns CalDavSource with minimal config", async () => {
|
||||||
@@ -80,6 +80,6 @@ describe("CalDavSourceProvider", () => {
|
|||||||
|
|
||||||
const source = await provider.feedSourceForUser("user-1", config, credentials)
|
const source = await provider.feedSourceForUser("user-1", config, credentials)
|
||||||
expect(source).toBeDefined()
|
expect(source).toBeDefined()
|
||||||
expect(source.id).toBe("freya.caldav")
|
expect(source.id).toBe("aelis.caldav")
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { CalDavSource } from "@freya/source-caldav"
|
import { CalDavSource } from "@aelis/source-caldav"
|
||||||
import { type } from "arktype"
|
import { type } from "arktype"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
@@ -19,7 +19,7 @@ const caldavCredentials = type({
|
|||||||
})
|
})
|
||||||
|
|
||||||
export class CalDavSourceProvider implements FeedSourceProvider {
|
export class CalDavSourceProvider implements FeedSourceProvider {
|
||||||
readonly sourceId = "freya.caldav"
|
readonly sourceId = "aelis.caldav"
|
||||||
readonly configSchema = caldavConfig
|
readonly configSchema = caldavConfig
|
||||||
|
|
||||||
async feedSourceForUser(
|
async feedSourceForUser(
|
||||||
@@ -33,12 +33,12 @@ export class CalDavSourceProvider implements FeedSourceProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!credentials) {
|
if (!credentials) {
|
||||||
throw new InvalidSourceCredentialsError("freya.caldav", "No CalDAV credentials configured")
|
throw new InvalidSourceCredentialsError("aelis.caldav", "No CalDAV credentials configured")
|
||||||
}
|
}
|
||||||
|
|
||||||
const creds = caldavCredentials(credentials)
|
const creds = caldavCredentials(credentials)
|
||||||
if (creds instanceof type.errors) {
|
if (creds instanceof type.errors) {
|
||||||
throw new InvalidSourceCredentialsError("freya.caldav", creds.summary)
|
throw new InvalidSourceCredentialsError("aelis.caldav", creds.summary)
|
||||||
}
|
}
|
||||||
|
|
||||||
return new CalDavSource({
|
return new CalDavSource({
|
||||||
@@ -29,7 +29,7 @@ export {
|
|||||||
import { user } from "./auth-schema.ts"
|
import { user } from "./auth-schema.ts"
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// FREYA — per-user source configuration
|
// AELIS — per-user source configuration
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
const bytea = customType<{ data: Buffer }>({
|
const bytea = customType<{ data: Buffer }>({
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import { contextKey } from "@freya/core"
|
import { contextKey } from "@aelis/core"
|
||||||
import { describe, expect, mock, spyOn, test } from "bun:test"
|
import { describe, expect, mock, spyOn, test } from "bun:test"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
|
|
||||||
@@ -244,7 +244,7 @@ describe("GET /api/feed", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
describe("GET /api/context", () => {
|
describe("GET /api/context", () => {
|
||||||
const weatherKey = contextKey("freya.weather", "weather")
|
const weatherKey = contextKey("aelis.weather", "weather")
|
||||||
const weatherData = { temperature: 20, condition: "Clear" }
|
const weatherData = { temperature: 20, condition: "Clear" }
|
||||||
const contextEntries: readonly ContextEntry[] = [[weatherKey, weatherData]]
|
const contextEntries: readonly ContextEntry[] = [[weatherKey, weatherData]]
|
||||||
|
|
||||||
@@ -274,7 +274,7 @@ describe("GET /api/context", () => {
|
|||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [] })
|
||||||
const app = buildTestApp(manager)
|
const app = buildTestApp(manager)
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["freya.weather","weather"]')
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]')
|
||||||
|
|
||||||
expect(res.status).toBe(401)
|
expect(res.status).toBe(401)
|
||||||
})
|
})
|
||||||
@@ -332,7 +332,7 @@ describe("GET /api/context", () => {
|
|||||||
test("returns 400 when match param is invalid", async () => {
|
test("returns 400 when match param is invalid", async () => {
|
||||||
const { app } = await buildContextApp("user-1")
|
const { app } = await buildContextApp("user-1")
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["freya.weather"]&match=invalid')
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=invalid')
|
||||||
|
|
||||||
expect(res.status).toBe(400)
|
expect(res.status).toBe(400)
|
||||||
const body = (await res.json()) as { error: string }
|
const body = (await res.json()) as { error: string }
|
||||||
@@ -343,7 +343,7 @@ describe("GET /api/context", () => {
|
|||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = await buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["freya.weather","weather"]&match=exact')
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]&match=exact')
|
||||||
|
|
||||||
expect(res.status).toBe(200)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as { match: string; value: unknown }
|
const body = (await res.json()) as { match: string; value: unknown }
|
||||||
@@ -355,7 +355,7 @@ describe("GET /api/context", () => {
|
|||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = await buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["freya.weather"]&match=exact')
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=exact')
|
||||||
|
|
||||||
expect(res.status).toBe(404)
|
expect(res.status).toBe(404)
|
||||||
})
|
})
|
||||||
@@ -364,7 +364,7 @@ describe("GET /api/context", () => {
|
|||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = await buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["freya.weather"]&match=prefix')
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=prefix')
|
||||||
|
|
||||||
expect(res.status).toBe(200)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as {
|
const body = (await res.json()) as {
|
||||||
@@ -373,7 +373,7 @@ describe("GET /api/context", () => {
|
|||||||
}
|
}
|
||||||
expect(body.match).toBe("prefix")
|
expect(body.match).toBe("prefix")
|
||||||
expect(body.entries).toHaveLength(1)
|
expect(body.entries).toHaveLength(1)
|
||||||
expect(body.entries[0]!.key).toEqual(["freya.weather", "weather"])
|
expect(body.entries[0]!.key).toEqual(["aelis.weather", "weather"])
|
||||||
expect(body.entries[0]!.value).toEqual(weatherData)
|
expect(body.entries[0]!.value).toEqual(weatherData)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -381,7 +381,7 @@ describe("GET /api/context", () => {
|
|||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = await buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["freya.weather","weather"]')
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]')
|
||||||
|
|
||||||
expect(res.status).toBe(200)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as { match: string; value: unknown }
|
const body = (await res.json()) as { match: string; value: unknown }
|
||||||
@@ -393,7 +393,7 @@ describe("GET /api/context", () => {
|
|||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = await buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["freya.weather"]')
|
const res = await app.request('/api/context?key=["aelis.weather"]')
|
||||||
|
|
||||||
expect(res.status).toBe(200)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as {
|
const body = (await res.json()) as {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { Context, Hono } from "hono"
|
import type { Context, Hono } from "hono"
|
||||||
|
|
||||||
import { contextKey } from "@freya/core"
|
import { contextKey } from "@aelis/core"
|
||||||
import { createMiddleware } from "hono/factory"
|
import { createMiddleware } from "hono/factory"
|
||||||
|
|
||||||
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@freya/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import type { LlmClient } from "./llm-client.ts"
|
import type { LlmClient } from "./llm-client.ts"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@freya/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import type { FeedItem } from "@freya/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import type { EnhancementResult } from "./schema.ts"
|
import type { EnhancementResult } from "./schema.ts"
|
||||||
|
|
||||||
const ENHANCEMENT_SOURCE_ID = "freya.enhancement"
|
const ENHANCEMENT_SOURCE_ID = "aelis.enhancement"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Merges an EnhancementResult into feed items.
|
* Merges an EnhancementResult into feed items.
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@freya/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { FeedItem } from "@freya/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import { CalDavFeedItemType } from "@freya/source-caldav"
|
import { CalDavFeedItemType } from "@aelis/source-caldav"
|
||||||
import { CalendarFeedItemType } from "@freya/source-google-calendar"
|
import { CalendarFeedItemType } from "@aelis/source-google-calendar"
|
||||||
|
|
||||||
import systemPromptBase from "./prompts/system.txt"
|
import systemPromptBase from "./prompts/system.txt"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
You are FREYA, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
|
You are AELIS, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
|
||||||
|
|
||||||
The user message is a JSON object with:
|
The user message is a JSON object with:
|
||||||
- "items": feed items with data and named slots to fill. Each slot has a description of what to write.
|
- "items": feed items with data and named slots to fill. Each slot has a description of what to write.
|
||||||
@@ -57,7 +57,7 @@ async function handleUpdateLocation(c: Context<Env>) {
|
|||||||
return c.json({ error: "Service unavailable" }, 503)
|
return c.json({ error: "Service unavailable" }, 503)
|
||||||
}
|
}
|
||||||
|
|
||||||
await session.engine.executeAction("freya.location", "update-location", {
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: result.lat,
|
lat: result.lat,
|
||||||
lng: result.lng,
|
lng: result.lng,
|
||||||
accuracy: result.accuracy,
|
accuracy: result.accuracy,
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
import { LocationSource } from "@freya/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
|
|
||||||
export class LocationSourceProvider implements FeedSourceProvider {
|
export class LocationSourceProvider implements FeedSourceProvider {
|
||||||
readonly sourceId = "freya.location"
|
readonly sourceId = "aelis.location"
|
||||||
|
|
||||||
async feedSourceForUser(
|
async feedSourceForUser(
|
||||||
_userId: string,
|
_userId: string,
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
import type { FeedSource } from "@freya/core"
|
import type { FeedSource } from "@aelis/core"
|
||||||
import type { type } from "arktype"
|
import type { type } from "arktype"
|
||||||
|
|
||||||
export type ConfigSchema = ReturnType<typeof type>
|
export type ConfigSchema = ReturnType<typeof type>
|
||||||
|
|
||||||
export interface FeedSourceProvider {
|
export interface FeedSourceProvider {
|
||||||
/** The source ID this provider is responsible for (e.g., "freya.location"). */
|
/** The source ID this provider is responsible for (e.g., "aelis.location"). */
|
||||||
readonly sourceId: string
|
readonly sourceId: string
|
||||||
/** Arktype schema for validating user-provided config. Omit if the source has no config. */
|
/** Arktype schema for validating user-provided config. Omit if the source has no config. */
|
||||||
readonly configSchema?: ConfigSchema
|
readonly configSchema?: ConfigSchema
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import { LocationSource } from "@freya/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
import { WeatherSource } from "@freya/source-weatherkit"
|
import { WeatherSource } from "@aelis/source-weatherkit"
|
||||||
import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
|
import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
|
||||||
|
|
||||||
import type { Database } from "../db/index.ts"
|
import type { Database } from "../db/index.ts"
|
||||||
@@ -145,14 +145,14 @@ function createStubProvider(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const locationProvider: FeedSourceProvider = {
|
const locationProvider: FeedSourceProvider = {
|
||||||
sourceId: "freya.location",
|
sourceId: "aelis.location",
|
||||||
async feedSourceForUser() {
|
async feedSourceForUser() {
|
||||||
return new LocationSource()
|
return new LocationSource()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
const weatherProvider: FeedSourceProvider = {
|
const weatherProvider: FeedSourceProvider = {
|
||||||
sourceId: "freya.weather",
|
sourceId: "aelis.weather",
|
||||||
async feedSourceForUser() {
|
async feedSourceForUser() {
|
||||||
return new WeatherSource({ client: { fetch: async () => ({}) as never } })
|
return new WeatherSource({ client: { fetch: async () => ({}) as never } })
|
||||||
},
|
},
|
||||||
@@ -167,7 +167,7 @@ beforeEach(() => {
|
|||||||
|
|
||||||
describe("UserSessionManager", () => {
|
describe("UserSessionManager", () => {
|
||||||
test("getOrCreate creates session on first call", async () => {
|
test("getOrCreate creates session on first call", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = await manager.getOrCreate("user-1")
|
||||||
@@ -177,7 +177,7 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("getOrCreate returns same session for same user", async () => {
|
test("getOrCreate returns same session for same user", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = await manager.getOrCreate("user-1")
|
||||||
@@ -187,7 +187,7 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("getOrCreate returns different sessions for different users", async () => {
|
test("getOrCreate returns different sessions for different users", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = await manager.getOrCreate("user-1")
|
||||||
@@ -197,20 +197,20 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("each user gets independent source instances", async () => {
|
test("each user gets independent source instances", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = await manager.getOrCreate("user-1")
|
||||||
const session2 = await manager.getOrCreate("user-2")
|
const session2 = await manager.getOrCreate("user-2")
|
||||||
|
|
||||||
const source1 = session1.getSource<LocationSource>("freya.location")
|
const source1 = session1.getSource<LocationSource>("aelis.location")
|
||||||
const source2 = session2.getSource<LocationSource>("freya.location")
|
const source2 = session2.getSource<LocationSource>("aelis.location")
|
||||||
|
|
||||||
expect(source1).not.toBe(source2)
|
expect(source1).not.toBe(source2)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("remove destroys session and allows re-creation", async () => {
|
test("remove destroys session and allows re-creation", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = await manager.getOrCreate("user-1")
|
||||||
@@ -221,14 +221,14 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("remove is no-op for unknown user", () => {
|
test("remove is no-op for unknown user", () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
expect(() => manager.remove("unknown")).not.toThrow()
|
expect(() => manager.remove("unknown")).not.toThrow()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("registers multiple providers", async () => {
|
test("registers multiple providers", async () => {
|
||||||
setEnabledSources(["freya.location", "freya.weather"])
|
setEnabledSources(["aelis.location", "aelis.weather"])
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
db: fakeDb,
|
db: fakeDb,
|
||||||
providers: [locationProvider, weatherProvider],
|
providers: [locationProvider, weatherProvider],
|
||||||
@@ -236,12 +236,12 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = await manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session.getSource("freya.location")).toBeDefined()
|
expect(session.getSource("aelis.location")).toBeDefined()
|
||||||
expect(session.getSource("freya.weather")).toBeDefined()
|
expect(session.getSource("aelis.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("refresh returns feed result through session", async () => {
|
test("refresh returns feed result through session", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = await manager.getOrCreate("user-1")
|
||||||
@@ -254,30 +254,30 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("location update via executeAction works", async () => {
|
test("location update via executeAction works", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = await manager.getOrCreate("user-1")
|
||||||
await session.engine.executeAction("freya.location", "update-location", {
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
timestamp: new Date(),
|
timestamp: new Date(),
|
||||||
})
|
})
|
||||||
|
|
||||||
const source = session.getSource<LocationSource>("freya.location")
|
const source = session.getSource<LocationSource>("aelis.location")
|
||||||
expect(source?.lastLocation?.lat).toBe(51.5074)
|
expect(source?.lastLocation?.lat).toBe(51.5074)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("subscribe receives updates after location push", async () => {
|
test("subscribe receives updates after location push", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
const callback = mock()
|
const callback = mock()
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = await manager.getOrCreate("user-1")
|
||||||
session.engine.subscribe(callback)
|
session.engine.subscribe(callback)
|
||||||
|
|
||||||
await session.engine.executeAction("freya.location", "update-location", {
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
@@ -291,7 +291,7 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("remove stops reactive updates", async () => {
|
test("remove stops reactive updates", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
const callback = mock()
|
const callback = mock()
|
||||||
|
|
||||||
@@ -302,7 +302,7 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
// Create new session and push location — old callback should not fire
|
// Create new session and push location — old callback should not fire
|
||||||
const session2 = await manager.getOrCreate("user-1")
|
const session2 = await manager.getOrCreate("user-1")
|
||||||
await session2.engine.executeAction("freya.location", "update-location", {
|
await session2.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
@@ -315,9 +315,9 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("creates session with successful providers when some fail", async () => {
|
test("creates session with successful providers when some fail", async () => {
|
||||||
setEnabledSources(["freya.location", "freya.failing"])
|
setEnabledSources(["aelis.location", "aelis.failing"])
|
||||||
const failingProvider: FeedSourceProvider = {
|
const failingProvider: FeedSourceProvider = {
|
||||||
sourceId: "freya.failing",
|
sourceId: "aelis.failing",
|
||||||
async feedSourceForUser() {
|
async feedSourceForUser() {
|
||||||
throw new Error("provider failed")
|
throw new Error("provider failed")
|
||||||
},
|
},
|
||||||
@@ -333,25 +333,25 @@ describe("UserSessionManager", () => {
|
|||||||
const session = await manager.getOrCreate("user-1")
|
const session = await manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session).toBeDefined()
|
expect(session).toBeDefined()
|
||||||
expect(session.getSource("freya.location")).toBeDefined()
|
expect(session.getSource("aelis.location")).toBeDefined()
|
||||||
expect(spy).toHaveBeenCalled()
|
expect(spy).toHaveBeenCalled()
|
||||||
|
|
||||||
spy.mockRestore()
|
spy.mockRestore()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("throws AggregateError when all providers fail", async () => {
|
test("throws AggregateError when all providers fail", async () => {
|
||||||
setEnabledSources(["freya.fail-1", "freya.fail-2"])
|
setEnabledSources(["aelis.fail-1", "aelis.fail-2"])
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
db: fakeDb,
|
db: fakeDb,
|
||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
sourceId: "freya.fail-1",
|
sourceId: "aelis.fail-1",
|
||||||
async feedSourceForUser() {
|
async feedSourceForUser() {
|
||||||
throw new Error("first failed")
|
throw new Error("first failed")
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
sourceId: "freya.fail-2",
|
sourceId: "aelis.fail-2",
|
||||||
async feedSourceForUser() {
|
async feedSourceForUser() {
|
||||||
throw new Error("second failed")
|
throw new Error("second failed")
|
||||||
},
|
},
|
||||||
@@ -363,13 +363,13 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("concurrent getOrCreate for same user returns same session", async () => {
|
test("concurrent getOrCreate for same user returns same session", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
let callCount = 0
|
let callCount = 0
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
db: fakeDb,
|
db: fakeDb,
|
||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
sourceId: "freya.location",
|
sourceId: "aelis.location",
|
||||||
async feedSourceForUser() {
|
async feedSourceForUser() {
|
||||||
callCount++
|
callCount++
|
||||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||||
@@ -389,7 +389,7 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("remove during in-flight getOrCreate prevents session from being stored", async () => {
|
test("remove during in-flight getOrCreate prevents session from being stored", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
let resolveProvider: () => void
|
let resolveProvider: () => void
|
||||||
const providerGate = new Promise<void>((r) => {
|
const providerGate = new Promise<void>((r) => {
|
||||||
resolveProvider = r
|
resolveProvider = r
|
||||||
@@ -399,7 +399,7 @@ describe("UserSessionManager", () => {
|
|||||||
db: fakeDb,
|
db: fakeDb,
|
||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
sourceId: "freya.location",
|
sourceId: "aelis.location",
|
||||||
async feedSourceForUser() {
|
async feedSourceForUser() {
|
||||||
await providerGate
|
await providerGate
|
||||||
return new LocationSource()
|
return new LocationSource()
|
||||||
@@ -425,15 +425,15 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("only invokes providers for sources enabled for the user", async () => {
|
test("only invokes providers for sources enabled for the user", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const locationFactory = mock(async () => createStubSource("freya.location"))
|
const locationFactory = mock(async () => createStubSource("aelis.location"))
|
||||||
const weatherFactory = mock(async () => createStubSource("freya.weather"))
|
const weatherFactory = mock(async () => createStubSource("aelis.weather"))
|
||||||
|
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
db: fakeDb,
|
db: fakeDb,
|
||||||
providers: [
|
providers: [
|
||||||
{ sourceId: "freya.location", feedSourceForUser: locationFactory },
|
{ sourceId: "aelis.location", feedSourceForUser: locationFactory },
|
||||||
{ sourceId: "freya.weather", feedSourceForUser: weatherFactory },
|
{ sourceId: "aelis.weather", feedSourceForUser: weatherFactory },
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -441,43 +441,43 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
expect(locationFactory).toHaveBeenCalledTimes(1)
|
expect(locationFactory).toHaveBeenCalledTimes(1)
|
||||||
expect(weatherFactory).not.toHaveBeenCalled()
|
expect(weatherFactory).not.toHaveBeenCalled()
|
||||||
expect(session.getSource("freya.location")).toBeDefined()
|
expect(session.getSource("aelis.location")).toBeDefined()
|
||||||
expect(session.getSource("freya.weather")).toBeUndefined()
|
expect(session.getSource("aelis.weather")).toBeUndefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("creates empty session when no sources are enabled", async () => {
|
test("creates empty session when no sources are enabled", async () => {
|
||||||
setEnabledSources([])
|
setEnabledSources([])
|
||||||
const factory = mock(async () => createStubSource("freya.location"))
|
const factory = mock(async () => createStubSource("aelis.location"))
|
||||||
|
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
db: fakeDb,
|
db: fakeDb,
|
||||||
providers: [{ sourceId: "freya.location", feedSourceForUser: factory }],
|
providers: [{ sourceId: "aelis.location", feedSourceForUser: factory }],
|
||||||
})
|
})
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = await manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(factory).not.toHaveBeenCalled()
|
expect(factory).not.toHaveBeenCalled()
|
||||||
expect(session).toBeDefined()
|
expect(session).toBeDefined()
|
||||||
expect(session.getSource("freya.location")).toBeUndefined()
|
expect(session.getSource("aelis.location")).toBeUndefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("per-user enabled sources are respected", async () => {
|
test("per-user enabled sources are respected", async () => {
|
||||||
enabledByUser.clear()
|
enabledByUser.clear()
|
||||||
setEnabledSourcesForUser("user-1", ["freya.location"])
|
setEnabledSourcesForUser("user-1", ["aelis.location"])
|
||||||
setEnabledSourcesForUser("user-2", ["freya.weather"])
|
setEnabledSourcesForUser("user-2", ["aelis.weather"])
|
||||||
|
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
db: fakeDb,
|
db: fakeDb,
|
||||||
providers: [createStubProvider("freya.location"), createStubProvider("freya.weather")],
|
providers: [createStubProvider("aelis.location"), createStubProvider("aelis.weather")],
|
||||||
})
|
})
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = await manager.getOrCreate("user-1")
|
||||||
const session2 = await manager.getOrCreate("user-2")
|
const session2 = await manager.getOrCreate("user-2")
|
||||||
|
|
||||||
expect(session1.getSource("freya.location")).toBeDefined()
|
expect(session1.getSource("aelis.location")).toBeDefined()
|
||||||
expect(session1.getSource("freya.weather")).toBeUndefined()
|
expect(session1.getSource("aelis.weather")).toBeUndefined()
|
||||||
expect(session2.getSource("freya.location")).toBeUndefined()
|
expect(session2.getSource("aelis.location")).toBeUndefined()
|
||||||
expect(session2.getSource("freya.weather")).toBeDefined()
|
expect(session2.getSource("aelis.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -525,10 +525,10 @@ describe("UserSessionManager.replaceProvider", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("throws for unknown provider sourceId", async () => {
|
test("throws for unknown provider sourceId", async () => {
|
||||||
setEnabledSources(["freya.location"])
|
setEnabledSources(["aelis.location"])
|
||||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||||
|
|
||||||
const unknownProvider = createStubProvider("freya.unknown")
|
const unknownProvider = createStubProvider("aelis.unknown")
|
||||||
|
|
||||||
await expect(manager.replaceProvider(unknownProvider)).rejects.toThrow(
|
await expect(manager.replaceProvider(unknownProvider)).rejects.toThrow(
|
||||||
"no existing provider with that sourceId",
|
"no existing provider with that sourceId",
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedSource } from "@freya/core"
|
import type { FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import { type } from "arktype"
|
import { type } from "arktype"
|
||||||
import merge from "lodash.merge"
|
import merge from "lodash.merge"
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import { LocationSource } from "@freya/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
import { describe, expect, spyOn, test } from "bun:test"
|
import { describe, expect, spyOn, test } from "bun:test"
|
||||||
|
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
@@ -39,7 +39,7 @@ describe("UserSession", () => {
|
|||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession("test-user", [location])
|
const session = new UserSession("test-user", [location])
|
||||||
|
|
||||||
const result = session.getSource<LocationSource>("freya.location")
|
const result = session.getSource<LocationSource>("aelis.location")
|
||||||
|
|
||||||
expect(result).toBe(location)
|
expect(result).toBe(location)
|
||||||
})
|
})
|
||||||
@@ -62,7 +62,7 @@ describe("UserSession", () => {
|
|||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession("test-user", [location])
|
const session = new UserSession("test-user", [location])
|
||||||
|
|
||||||
await session.engine.executeAction("freya.location", "update-location", {
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: 51.5,
|
lat: 51.5,
|
||||||
lng: -0.1,
|
lng: -0.1,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@freya/core"
|
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import { describe, expect, mock, spyOn, test } from "bun:test"
|
import { describe, expect, mock, spyOn, test } from "bun:test"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
@@ -193,16 +193,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("freya.weather", weatherConfig)])
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
|
||||||
|
|
||||||
const res = await get(app, "freya.weather")
|
const res = await get(app, "aelis.weather")
|
||||||
|
|
||||||
expect(res.status).toBe(401)
|
expect(res.status).toBe(401)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 for unknown source", async () => {
|
test("returns 404 for unknown source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await get(app, "unknown.source")
|
const res = await get(app, "unknown.source")
|
||||||
|
|
||||||
@@ -213,13 +213,13 @@ describe("GET /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns enabled and config for existing source", async () => {
|
test("returns enabled and config for existing source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await get(app, "freya.weather")
|
const res = await get(app, "aelis.weather")
|
||||||
|
|
||||||
expect(res.status).toBe(200)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as { enabled: boolean; config: unknown }
|
const body = (await res.json()) as { enabled: boolean; config: unknown }
|
||||||
@@ -229,9 +229,9 @@ describe("GET /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns defaults when user has no row for source", async () => {
|
test("returns defaults when user has no row for source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await get(app, "freya.weather")
|
const res = await get(app, "aelis.weather")
|
||||||
|
|
||||||
expect(res.status).toBe(200)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as { enabled: boolean; config: unknown }
|
const body = (await res.json()) as { enabled: boolean; config: unknown }
|
||||||
@@ -241,13 +241,13 @@ describe("GET /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns disabled source", async () => {
|
test("returns disabled source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
config: { units: "imperial" },
|
config: { units: "imperial" },
|
||||||
})
|
})
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await get(app, "freya.weather")
|
const res = await get(app, "aelis.weather")
|
||||||
|
|
||||||
expect(res.status).toBe(200)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as { enabled: boolean; config: unknown }
|
const body = (await res.json()) as { enabled: boolean; config: unknown }
|
||||||
@@ -259,16 +259,16 @@ describe("GET /api/sources/:sourceId", () => {
|
|||||||
describe("PATCH /api/sources/:sourceId", () => {
|
describe("PATCH /api/sources/:sourceId", () => {
|
||||||
test("returns 401 without auth", async () => {
|
test("returns 401 without auth", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", { enabled: true })
|
const res = await patch(app, "aelis.weather", { enabled: true })
|
||||||
|
|
||||||
expect(res.status).toBe(401)
|
expect(res.status).toBe(401)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 for unknown source", async () => {
|
test("returns 404 for unknown source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "unknown.source", { enabled: true })
|
const res = await patch(app, "unknown.source", { enabled: true })
|
||||||
|
|
||||||
@@ -279,9 +279,9 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 404 when user has no existing row for source", async () => {
|
test("returns 404 when user has no existing row for source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", { enabled: true })
|
const res = await patch(app, "aelis.weather", { enabled: true })
|
||||||
|
|
||||||
expect(res.status).toBe(404)
|
expect(res.status).toBe(404)
|
||||||
const body = (await res.json()) as { error: string }
|
const body = (await res.json()) as { error: string }
|
||||||
@@ -290,29 +290,29 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 204 when body is empty object (no-op) on existing source", async () => {
|
test("returns 204 when body is empty object (no-op) on existing source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather")
|
activeStore.seed(MOCK_USER_ID, "aelis.weather")
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {})
|
const res = await patch(app, "aelis.weather", {})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 when body is empty object on nonexistent user source", async () => {
|
test("returns 404 when body is empty object on nonexistent user source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {})
|
const res = await patch(app, "aelis.weather", {})
|
||||||
|
|
||||||
expect(res.status).toBe(404)
|
expect(res.status).toBe(404)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 for invalid JSON body", async () => {
|
test("returns 400 for invalid JSON body", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather")
|
activeStore.seed(MOCK_USER_ID, "aelis.weather")
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await app.request("/api/sources/freya.weather", {
|
const res = await app.request("/api/sources/aelis.weather", {
|
||||||
method: "PATCH",
|
method: "PATCH",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: "not json",
|
body: "not json",
|
||||||
@@ -325,10 +325,10 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when request body contains unknown fields", async () => {
|
test("returns 400 when request body contains unknown fields", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather")
|
activeStore.seed(MOCK_USER_ID, "aelis.weather")
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {
|
const res = await patch(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
unknownField: "hello",
|
unknownField: "hello",
|
||||||
})
|
})
|
||||||
@@ -338,10 +338,10 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when weather config contains unknown fields", async () => {
|
test("returns 400 when weather config contains unknown fields", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather")
|
activeStore.seed(MOCK_USER_ID, "aelis.weather")
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {
|
const res = await patch(app, "aelis.weather", {
|
||||||
config: { units: "metric", unknownField: "hello" },
|
config: { units: "metric", unknownField: "hello" },
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -350,10 +350,10 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when weather config fails validation", async () => {
|
test("returns 400 when weather config fails validation", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather")
|
activeStore.seed(MOCK_USER_ID, "aelis.weather")
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {
|
const res = await patch(app, "aelis.weather", {
|
||||||
config: { units: "invalid" },
|
config: { units: "invalid" },
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -362,65 +362,65 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 204 and updates enabled", async () => {
|
test("returns 204 and updates enabled", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", { enabled: false })
|
const res = await patch(app, "aelis.weather", { enabled: false })
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
|
||||||
expect(row!.enabled).toBe(false)
|
expect(row!.enabled).toBe(false)
|
||||||
expect(row!.config).toEqual({ units: "metric" })
|
expect(row!.config).toEqual({ units: "metric" })
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 204 and updates config", async () => {
|
test("returns 204 and updates config", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {
|
const res = await patch(app, "aelis.weather", {
|
||||||
config: { units: "imperial" },
|
config: { units: "imperial" },
|
||||||
})
|
})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
|
||||||
expect(row!.config).toEqual({ units: "imperial" })
|
expect(row!.config).toEqual({ units: "imperial" })
|
||||||
})
|
})
|
||||||
|
|
||||||
test("preserves config when only updating enabled", async () => {
|
test("preserves config when only updating enabled", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.tfl", {
|
activeStore.seed(MOCK_USER_ID, "aelis.tfl", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { lines: ["bakerloo"] },
|
config: { lines: ["bakerloo"] },
|
||||||
})
|
})
|
||||||
const { app } = createApp([createStubProvider("freya.tfl", tflConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.tfl", tflConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.tfl", { enabled: false })
|
const res = await patch(app, "aelis.tfl", { enabled: false })
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.tfl`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.tfl`)
|
||||||
expect(row!.enabled).toBe(false)
|
expect(row!.enabled).toBe(false)
|
||||||
expect(row!.config).toEqual({ lines: ["bakerloo"] })
|
expect(row!.config).toEqual({ lines: ["bakerloo"] })
|
||||||
})
|
})
|
||||||
|
|
||||||
test("deep-merges config on update", async () => {
|
test("deep-merges config on update", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
config: { units: "metric", hourlyLimit: 12 },
|
config: { units: "metric", hourlyLimit: 12 },
|
||||||
})
|
})
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {
|
const res = await patch(app, "aelis.weather", {
|
||||||
config: { dailyLimit: 5 },
|
config: { dailyLimit: 5 },
|
||||||
})
|
})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
|
||||||
expect(row!.config).toEqual({
|
expect(row!.config).toEqual({
|
||||||
units: "metric",
|
units: "metric",
|
||||||
hourlyLimit: 12,
|
hourlyLimit: 12,
|
||||||
@@ -430,18 +430,18 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("refreshes source in active session after config update", async () => {
|
test("refreshes source in active session after config update", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
const { app, sessionManager } = createApp(
|
const { app, sessionManager } = createApp(
|
||||||
[createStubProvider("freya.weather", weatherConfig)],
|
[createStubProvider("aelis.weather", weatherConfig)],
|
||||||
MOCK_USER_ID,
|
MOCK_USER_ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
||||||
const replaceSpy = spyOn(session, "replaceSource")
|
const replaceSpy = spyOn(session, "replaceSource")
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", {
|
const res = await patch(app, "aelis.weather", {
|
||||||
config: { units: "imperial" },
|
config: { units: "imperial" },
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -452,31 +452,31 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("removes source from session when disabled", async () => {
|
test("removes source from session when disabled", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
const { app, sessionManager } = createApp(
|
const { app, sessionManager } = createApp(
|
||||||
[createStubProvider("freya.weather", weatherConfig)],
|
[createStubProvider("aelis.weather", weatherConfig)],
|
||||||
MOCK_USER_ID,
|
MOCK_USER_ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
||||||
const removeSpy = spyOn(session, "removeSource")
|
const removeSpy = spyOn(session, "removeSource")
|
||||||
|
|
||||||
const res = await patch(app, "freya.weather", { enabled: false })
|
const res = await patch(app, "aelis.weather", { enabled: false })
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
expect(removeSpy).toHaveBeenCalledWith("freya.weather")
|
expect(removeSpy).toHaveBeenCalledWith("aelis.weather")
|
||||||
removeSpy.mockRestore()
|
removeSpy.mockRestore()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when config is provided for source without schema", async () => {
|
test("returns 400 when config is provided for source without schema", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.location")
|
activeStore.seed(MOCK_USER_ID, "aelis.location")
|
||||||
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.location", {
|
const res = await patch(app, "aelis.location", {
|
||||||
config: { something: "value" },
|
config: { something: "value" },
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -485,10 +485,10 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when empty config is provided for source without schema", async () => {
|
test("returns 400 when empty config is provided for source without schema", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.location")
|
activeStore.seed(MOCK_USER_ID, "aelis.location")
|
||||||
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.location", {
|
const res = await patch(app, "aelis.location", {
|
||||||
config: {},
|
config: {},
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -497,13 +497,13 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("updates enabled on location source", async () => {
|
test("updates enabled on location source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true })
|
activeStore.seed(MOCK_USER_ID, "aelis.location", { enabled: true })
|
||||||
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await patch(app, "freya.location", { enabled: false })
|
const res = await patch(app, "aelis.location", { enabled: false })
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.location`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.location`)
|
||||||
expect(row!.enabled).toBe(false)
|
expect(row!.enabled).toBe(false)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -515,16 +515,16 @@ describe("PATCH /api/sources/:sourceId", () => {
|
|||||||
describe("PUT /api/sources/:sourceId", () => {
|
describe("PUT /api/sources/:sourceId", () => {
|
||||||
test("returns 401 without auth", async () => {
|
test("returns 401 without auth", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", { enabled: true, config: {} })
|
const res = await put(app, "aelis.weather", { enabled: true, config: {} })
|
||||||
|
|
||||||
expect(res.status).toBe(401)
|
expect(res.status).toBe(401)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 for unknown source", async () => {
|
test("returns 404 for unknown source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "unknown.source", { enabled: true, config: {} })
|
const res = await put(app, "unknown.source", { enabled: true, config: {} })
|
||||||
|
|
||||||
@@ -535,9 +535,9 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 for invalid JSON", async () => {
|
test("returns 400 for invalid JSON", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await app.request("/api/sources/freya.weather", {
|
const res = await app.request("/api/sources/aelis.weather", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: "not json",
|
body: "not json",
|
||||||
@@ -550,27 +550,27 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when enabled is missing", async () => {
|
test("returns 400 when enabled is missing", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", { config: {} })
|
const res = await put(app, "aelis.weather", { config: {} })
|
||||||
|
|
||||||
expect(res.status).toBe(400)
|
expect(res.status).toBe(400)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when config is missing", async () => {
|
test("returns 400 when config is missing", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", { enabled: true })
|
const res = await put(app, "aelis.weather", { enabled: true })
|
||||||
|
|
||||||
expect(res.status).toBe(400)
|
expect(res.status).toBe(400)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when request body contains unknown fields", async () => {
|
test("returns 400 when request body contains unknown fields", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
unknownField: "hello",
|
unknownField: "hello",
|
||||||
@@ -581,9 +581,9 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when weather config contains unknown fields", async () => {
|
test("returns 400 when weather config contains unknown fields", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric", unknownField: "hello" },
|
config: { units: "metric", unknownField: "hello" },
|
||||||
})
|
})
|
||||||
@@ -593,9 +593,9 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when config fails schema validation", async () => {
|
test("returns 400 when config fails schema validation", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "invalid" },
|
config: { units: "invalid" },
|
||||||
})
|
})
|
||||||
@@ -605,15 +605,15 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 204 and inserts when row does not exist", async () => {
|
test("returns 204 and inserts when row does not exist", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
|
||||||
expect(row).toBeDefined()
|
expect(row).toBeDefined()
|
||||||
expect(row!.enabled).toBe(true)
|
expect(row!.enabled).toBe(true)
|
||||||
expect(row!.config).toEqual({ units: "metric" })
|
expect(row!.config).toEqual({ units: "metric" })
|
||||||
@@ -621,19 +621,19 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 204 and fully replaces existing row", async () => {
|
test("returns 204 and fully replaces existing row", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric", hourlyLimit: 12 },
|
config: { units: "metric", hourlyLimit: 12 },
|
||||||
})
|
})
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
config: { units: "imperial" },
|
config: { units: "imperial" },
|
||||||
})
|
})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
|
||||||
expect(row!.enabled).toBe(false)
|
expect(row!.enabled).toBe(false)
|
||||||
// hourlyLimit should be gone — full replace, not merge
|
// hourlyLimit should be gone — full replace, not merge
|
||||||
expect(row!.config).toEqual({ units: "imperial" })
|
expect(row!.config).toEqual({ units: "imperial" })
|
||||||
@@ -641,18 +641,18 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("refreshes source in active session after upsert", async () => {
|
test("refreshes source in active session after upsert", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
const { app, sessionManager } = createApp(
|
const { app, sessionManager } = createApp(
|
||||||
[createStubProvider("freya.weather", weatherConfig)],
|
[createStubProvider("aelis.weather", weatherConfig)],
|
||||||
MOCK_USER_ID,
|
MOCK_USER_ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
||||||
const replaceSpy = spyOn(session, "replaceSource")
|
const replaceSpy = spyOn(session, "replaceSource")
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "imperial" },
|
config: { units: "imperial" },
|
||||||
})
|
})
|
||||||
@@ -664,56 +664,56 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("removes source from session when disabled via upsert", async () => {
|
test("removes source from session when disabled via upsert", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.weather", {
|
activeStore.seed(MOCK_USER_ID, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
const { app, sessionManager } = createApp(
|
const { app, sessionManager } = createApp(
|
||||||
[createStubProvider("freya.weather", weatherConfig)],
|
[createStubProvider("aelis.weather", weatherConfig)],
|
||||||
MOCK_USER_ID,
|
MOCK_USER_ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
||||||
const removeSpy = spyOn(session, "removeSource")
|
const removeSpy = spyOn(session, "removeSource")
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
expect(removeSpy).toHaveBeenCalledWith("freya.weather")
|
expect(removeSpy).toHaveBeenCalledWith("aelis.weather")
|
||||||
removeSpy.mockRestore()
|
removeSpy.mockRestore()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("adds source to active session when inserting a new source", async () => {
|
test("adds source to active session when inserting a new source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
// Seed a different source so the session can be created
|
// Seed a different source so the session can be created
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true })
|
activeStore.seed(MOCK_USER_ID, "aelis.location", { enabled: true })
|
||||||
const { app, sessionManager } = createApp(
|
const { app, sessionManager } = createApp(
|
||||||
[createStubProvider("freya.location"), createStubProvider("freya.weather", weatherConfig)],
|
[createStubProvider("aelis.location"), createStubProvider("aelis.weather", weatherConfig)],
|
||||||
MOCK_USER_ID,
|
MOCK_USER_ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
// Create session — only has freya.location
|
// Create session — only has aelis.location
|
||||||
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
const session = await sessionManager.getOrCreate(MOCK_USER_ID)
|
||||||
expect(session.hasSource("freya.weather")).toBe(false)
|
expect(session.hasSource("aelis.weather")).toBe(false)
|
||||||
|
|
||||||
// PUT a new source that didn't exist before
|
// PUT a new source that didn't exist before
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
})
|
})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
expect(session.hasSource("freya.weather")).toBe(true)
|
expect(session.hasSource("aelis.weather")).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when config is provided for source without schema", async () => {
|
test("returns 400 when config is provided for source without schema", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.location", {
|
const res = await put(app, "aelis.location", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { something: "value" },
|
config: { something: "value" },
|
||||||
})
|
})
|
||||||
@@ -723,9 +723,9 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 400 when empty config is provided for source without schema", async () => {
|
test("returns 400 when empty config is provided for source without schema", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.location", {
|
const res = await put(app, "aelis.location", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: {},
|
config: {},
|
||||||
})
|
})
|
||||||
@@ -735,9 +735,9 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
|
|
||||||
test("returns 204 without config field for source without schema", async () => {
|
test("returns 204 without config field for source without schema", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.location", {
|
const res = await put(app, "aelis.location", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -747,18 +747,18 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
test("returns 204 when credentials are included alongside config", async () => {
|
test("returns 204 when credentials are included alongside config", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createAppWithEncryptor(
|
const { app } = createAppWithEncryptor(
|
||||||
[createStubProvider("freya.weather", weatherConfig)],
|
[createStubProvider("aelis.weather", weatherConfig)],
|
||||||
MOCK_USER_ID,
|
MOCK_USER_ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
credentials: { apiKey: "secret123" },
|
credentials: { apiKey: "secret123" },
|
||||||
})
|
})
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
|
const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
|
||||||
expect(row).toBeDefined()
|
expect(row).toBeDefined()
|
||||||
expect(row!.enabled).toBe(true)
|
expect(row!.enabled).toBe(true)
|
||||||
expect(row!.config).toEqual({ units: "metric" })
|
expect(row!.config).toEqual({ units: "metric" })
|
||||||
@@ -767,9 +767,9 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
test("returns 503 when credentials are provided but no encryptor is configured", async () => {
|
test("returns 503 when credentials are provided but no encryptor is configured", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
// createApp does NOT configure an encryptor
|
// createApp does NOT configure an encryptor
|
||||||
const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await put(app, "freya.weather", {
|
const res = await put(app, "aelis.weather", {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
config: { units: "metric" },
|
config: { units: "metric" },
|
||||||
credentials: { apiKey: "secret123" },
|
credentials: { apiKey: "secret123" },
|
||||||
@@ -784,16 +784,16 @@ describe("PUT /api/sources/:sourceId", () => {
|
|||||||
describe("PUT /api/sources/:sourceId/credentials", () => {
|
describe("PUT /api/sources/:sourceId/credentials", () => {
|
||||||
test("returns 401 without auth", async () => {
|
test("returns 401 without auth", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createAppWithEncryptor([createStubProvider("freya.location")])
|
const { app } = createAppWithEncryptor([createStubProvider("aelis.location")])
|
||||||
|
|
||||||
const res = await putCredentials(app, "freya.location", { token: "x" })
|
const res = await putCredentials(app, "aelis.location", { token: "x" })
|
||||||
|
|
||||||
expect(res.status).toBe(401)
|
expect(res.status).toBe(401)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 for unknown source", async () => {
|
test("returns 404 for unknown source", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await putCredentials(app, "unknown.source", { token: "x" })
|
const res = await putCredentials(app, "unknown.source", { token: "x" })
|
||||||
|
|
||||||
@@ -802,10 +802,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
|
|||||||
|
|
||||||
test("returns 400 for invalid JSON", async () => {
|
test("returns 400 for invalid JSON", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.location")
|
activeStore.seed(MOCK_USER_ID, "aelis.location")
|
||||||
const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await app.request("/api/sources/freya.location/credentials", {
|
const res = await app.request("/api/sources/aelis.location/credentials", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: "not-json",
|
body: "not-json",
|
||||||
@@ -818,10 +818,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
|
|||||||
|
|
||||||
test("returns 204 and persists credentials", async () => {
|
test("returns 204 and persists credentials", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.location")
|
activeStore.seed(MOCK_USER_ID, "aelis.location")
|
||||||
const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await putCredentials(app, "freya.location", { token: "secret" })
|
const res = await putCredentials(app, "aelis.location", { token: "secret" })
|
||||||
|
|
||||||
expect(res.status).toBe(204)
|
expect(res.status).toBe(204)
|
||||||
})
|
})
|
||||||
@@ -853,10 +853,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
|
|||||||
|
|
||||||
test("returns 503 when credential encryption is not configured", async () => {
|
test("returns 503 when credential encryption is not configured", async () => {
|
||||||
activeStore = createInMemoryStore()
|
activeStore = createInMemoryStore()
|
||||||
activeStore.seed(MOCK_USER_ID, "freya.location")
|
activeStore.seed(MOCK_USER_ID, "aelis.location")
|
||||||
const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
|
const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
|
||||||
|
|
||||||
const res = await putCredentials(app, "freya.location", { token: "x" })
|
const res = await putCredentials(app, "aelis.location", { token: "x" })
|
||||||
|
|
||||||
expect(res.status).toBe(503)
|
expect(res.status).toBe(503)
|
||||||
const body = (await res.json()) as { error: string }
|
const body = (await res.json()) as { error: string }
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { TflSource, type ITflApi, type TflLineId } from "@freya/source-tfl"
|
import { TflSource, type ITflApi, type TflLineId } from "@aelis/source-tfl"
|
||||||
import { type } from "arktype"
|
import { type } from "arktype"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
@@ -13,7 +13,7 @@ export const tflConfig = type({
|
|||||||
})
|
})
|
||||||
|
|
||||||
export class TflSourceProvider implements FeedSourceProvider {
|
export class TflSourceProvider implements FeedSourceProvider {
|
||||||
readonly sourceId = "freya.tfl"
|
readonly sourceId = "aelis.tfl"
|
||||||
readonly configSchema = tflConfig
|
readonly configSchema = tflConfig
|
||||||
private readonly apiKey: string | undefined
|
private readonly apiKey: string | undefined
|
||||||
private readonly client: ITflApi | undefined
|
private readonly client: ITflApi | undefined
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { WeatherSource, type WeatherSourceOptions } from "@freya/source-weatherkit"
|
import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
|
||||||
import { type } from "arktype"
|
import { type } from "arktype"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
@@ -16,7 +16,7 @@ export const weatherConfig = type({
|
|||||||
})
|
})
|
||||||
|
|
||||||
export class WeatherSourceProvider implements FeedSourceProvider {
|
export class WeatherSourceProvider implements FeedSourceProvider {
|
||||||
readonly sourceId = "freya.weather"
|
readonly sourceId = "aelis.weather"
|
||||||
readonly configSchema = weatherConfig
|
readonly configSchema = weatherConfig
|
||||||
private readonly credentials: WeatherSourceOptions["credentials"]
|
private readonly credentials: WeatherSourceOptions["credentials"]
|
||||||
private readonly client: WeatherSourceOptions["client"]
|
private readonly client: WeatherSourceOptions["client"]
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"expo": {
|
"expo": {
|
||||||
"name": "Freya",
|
"name": "Aelis",
|
||||||
"slug": "freya-client",
|
"slug": "aelis-client",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"orientation": "portrait",
|
"orientation": "portrait",
|
||||||
"icon": "./assets/images/icon.png",
|
"icon": "./assets/images/icon.png",
|
||||||
"scheme": "freya",
|
"scheme": "aelis",
|
||||||
"userInterfaceStyle": "automatic",
|
"userInterfaceStyle": "automatic",
|
||||||
"newArchEnabled": true,
|
"newArchEnabled": true,
|
||||||
"ios": {
|
"ios": {
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"ITSAppUsesNonExemptEncryption": false
|
"ITSAppUsesNonExemptEncryption": false
|
||||||
},
|
},
|
||||||
"bundleIdentifier": "sh.nym.freya"
|
"bundleIdentifier": "sh.nym.aelis"
|
||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"adaptiveIcon": {
|
"adaptiveIcon": {
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
},
|
},
|
||||||
"edgeToEdgeEnabled": true,
|
"edgeToEdgeEnabled": true,
|
||||||
"predictiveBackGestureEnabled": false,
|
"predictiveBackGestureEnabled": false,
|
||||||
"package": "sh.nym.freya"
|
"package": "sh.nym.aelis"
|
||||||
},
|
},
|
||||||
"web": {
|
"web": {
|
||||||
"output": "static",
|
"output": "static",
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user