Compare commits
1 Commits
feat/feed-
...
a26e35cc2f
| Author | SHA1 | Date | |
|---|---|---|---|
|
a26e35cc2f
|
@@ -1,8 +1,8 @@
|
|||||||
services:
|
services:
|
||||||
expo:
|
expo:
|
||||||
name: Expo Dev Server
|
name: Expo Dev Server
|
||||||
description: Expo development server for aris-client
|
description: Expo development server for aelis-client
|
||||||
triggeredBy:
|
triggeredBy:
|
||||||
- postDevcontainerStart
|
- postDevcontainerStart
|
||||||
commands:
|
commands:
|
||||||
start: cd apps/aris-client && ./scripts/run-dev-server.sh
|
start: cd apps/aelis-client && ./scripts/run-dev-server.sh
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
## Project
|
## Project
|
||||||
|
|
||||||
ARIS 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 @@
|
|||||||
# aris
|
# aelis
|
||||||
|
|
||||||
To install dependencies:
|
To install dependencies:
|
||||||
|
|
||||||
@@ -8,14 +8,14 @@ bun install
|
|||||||
|
|
||||||
## Packages
|
## Packages
|
||||||
|
|
||||||
### @aris/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/aris-source-tfl
|
cd packages/aelis-source-tfl
|
||||||
bun run test
|
bun run test
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -7,11 +7,6 @@ BETTER_AUTH_SECRET=
|
|||||||
# Base URL of the backend
|
# Base URL of the backend
|
||||||
BETTER_AUTH_URL=http://localhost:3000
|
BETTER_AUTH_URL=http://localhost:3000
|
||||||
|
|
||||||
# OpenRouter (LLM feed enhancement)
|
|
||||||
OPENROUTER_API_KEY=
|
|
||||||
# Optional: override the default model (default: openai/gpt-4.1-mini)
|
|
||||||
# OPENROUTER_MODEL=openai/gpt-4.1-mini
|
|
||||||
|
|
||||||
# Apple WeatherKit credentials
|
# Apple WeatherKit credentials
|
||||||
WEATHERKIT_PRIVATE_KEY=
|
WEATHERKIT_PRIVATE_KEY=
|
||||||
WEATHERKIT_KEY_ID=
|
WEATHERKIT_KEY_ID=
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "@aris/backend",
|
"name": "@aelis/backend",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "src/server.ts",
|
"main": "src/server.ts",
|
||||||
@@ -9,13 +9,10 @@
|
|||||||
"test": "bun test src/"
|
"test": "bun test src/"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aris/core": "workspace:*",
|
"@aelis/core": "workspace:*",
|
||||||
"@aris/source-caldav": "workspace:*",
|
"@aelis/source-location": "workspace:*",
|
||||||
"@aris/source-google-calendar": "workspace:*",
|
"@aelis/source-tfl": "workspace:*",
|
||||||
"@aris/source-location": "workspace:*",
|
"@aelis/source-weatherkit": "workspace:*",
|
||||||
"@aris/source-tfl": "workspace:*",
|
|
||||||
"@aris/source-weatherkit": "workspace:*",
|
|
||||||
"@openrouter/sdk": "^0.9.11",
|
|
||||||
"arktype": "^2.1.29",
|
"arktype": "^2.1.29",
|
||||||
"better-auth": "^1",
|
"better-auth": "^1",
|
||||||
"hono": "^4",
|
"hono": "^4",
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aris/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
@@ -47,7 +47,7 @@ function buildTestApp(sessionManager: UserSessionManager, userId?: string) {
|
|||||||
|
|
||||||
describe("GET /api/feed", () => {
|
describe("GET /api/feed", () => {
|
||||||
test("returns 401 without auth", async () => {
|
test("returns 401 without auth", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [] })
|
const manager = new UserSessionManager([])
|
||||||
const app = buildTestApp(manager)
|
const app = buildTestApp(manager)
|
||||||
|
|
||||||
const res = await app.request("/api/feed")
|
const res = await app.request("/api/feed")
|
||||||
@@ -65,9 +65,7 @@ describe("GET /api/feed", () => {
|
|||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager([() => createStubSource("test", items)])
|
||||||
providers: [() => createStubSource("test", items)],
|
|
||||||
})
|
|
||||||
const app = buildTestApp(manager, "user-1")
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
// Prime the cache
|
// Prime the cache
|
||||||
@@ -97,9 +95,7 @@ describe("GET /api/feed", () => {
|
|||||||
data: { fresh: true },
|
data: { fresh: true },
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager([() => createStubSource("test", items)])
|
||||||
providers: [() => createStubSource("test", items)],
|
|
||||||
})
|
|
||||||
const app = buildTestApp(manager, "user-1")
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
// No prior refresh — lastFeed() returns null, handler should call refresh()
|
// No prior refresh — lastFeed() returns null, handler should call refresh()
|
||||||
@@ -129,7 +125,7 @@ describe("GET /api/feed", () => {
|
|||||||
throw new Error("connection timeout")
|
throw new Error("connection timeout")
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
const manager = new UserSessionManager({ providers: [() => failingSource] })
|
const manager = new UserSessionManager([() => failingSource])
|
||||||
const app = buildTestApp(manager, "user-1")
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
const res = await app.request("/api/feed")
|
const res = await app.request("/api/feed")
|
||||||
@@ -5,11 +5,7 @@ import { createMiddleware } from "hono/factory"
|
|||||||
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
import type { UserSessionManager } from "../session/index.ts"
|
import type { UserSessionManager } from "../session/index.ts"
|
||||||
|
|
||||||
type Env = {
|
type Env = { Variables: { sessionManager: UserSessionManager } }
|
||||||
Variables: {
|
|
||||||
sessionManager: UserSessionManager
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
interface FeedHttpHandlersDeps {
|
interface FeedHttpHandlersDeps {
|
||||||
sessionManager: UserSessionManager
|
sessionManager: UserSessionManager
|
||||||
@@ -33,7 +29,7 @@ async function handleGetFeed(c: Context<Env>) {
|
|||||||
const sessionManager = c.get("sessionManager")
|
const sessionManager = c.get("sessionManager")
|
||||||
const session = sessionManager.getOrCreate(user.id)
|
const session = sessionManager.getOrCreate(user.id)
|
||||||
|
|
||||||
const feed = await session.feed()
|
const feed = session.engine.lastFeed() ?? (await session.engine.refresh())
|
||||||
|
|
||||||
return c.json({
|
return c.json({
|
||||||
items: feed.items,
|
items: feed.items,
|
||||||
@@ -45,7 +45,7 @@ async function handleUpdateLocation(c: Context<Env>) {
|
|||||||
const user = c.get("user")!
|
const user = c.get("user")!
|
||||||
const sessionManager = c.get("sessionManager")
|
const sessionManager = c.get("sessionManager")
|
||||||
const session = sessionManager.getOrCreate(user.id)
|
const session = sessionManager.getOrCreate(user.id)
|
||||||
await session.engine.executeAction("aris.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,
|
||||||
40
apps/aelis-backend/src/server.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { LocationSource } from "@aelis/source-location"
|
||||||
|
import { Hono } from "hono"
|
||||||
|
|
||||||
|
import { registerAuthHandlers } from "./auth/http.ts"
|
||||||
|
import { requireSession } from "./auth/session-middleware.ts"
|
||||||
|
import { registerFeedHttpHandlers } from "./feed/http.ts"
|
||||||
|
import { registerLocationHttpHandlers } from "./location/http.ts"
|
||||||
|
import { UserSessionManager } from "./session/index.ts"
|
||||||
|
import { WeatherSourceProvider } from "./weather/provider.ts"
|
||||||
|
|
||||||
|
function main() {
|
||||||
|
const sessionManager = new UserSessionManager([
|
||||||
|
() => new LocationSource(),
|
||||||
|
new WeatherSourceProvider({
|
||||||
|
credentials: {
|
||||||
|
privateKey: process.env.WEATHERKIT_PRIVATE_KEY!,
|
||||||
|
keyId: process.env.WEATHERKIT_KEY_ID!,
|
||||||
|
teamId: process.env.WEATHERKIT_TEAM_ID!,
|
||||||
|
serviceId: process.env.WEATHERKIT_SERVICE_ID!,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
|
||||||
|
const app = new Hono()
|
||||||
|
|
||||||
|
app.get("/health", (c) => c.json({ status: "ok" }))
|
||||||
|
|
||||||
|
registerAuthHandlers(app)
|
||||||
|
registerFeedHttpHandlers(app, { sessionManager, authSessionMiddleware: requireSession })
|
||||||
|
registerLocationHttpHandlers(app, { sessionManager })
|
||||||
|
|
||||||
|
return app
|
||||||
|
}
|
||||||
|
|
||||||
|
const app = main()
|
||||||
|
|
||||||
|
export default {
|
||||||
|
port: 3000,
|
||||||
|
fetch: app.fetch,
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedSource } from "@aris/core"
|
import type { FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
export interface FeedSourceProvider {
|
export interface FeedSourceProvider {
|
||||||
feedSourceForUser(userId: string): FeedSource
|
feedSourceForUser(userId: string): FeedSource
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { WeatherKitClient, WeatherKitResponse } from "@aris/source-weatherkit"
|
import type { WeatherKitClient, WeatherKitResponse } from "@aelis/source-weatherkit"
|
||||||
|
|
||||||
import { LocationSource } from "@aris/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
import { describe, expect, mock, test } from "bun:test"
|
import { describe, expect, mock, test } from "bun:test"
|
||||||
|
|
||||||
import { WeatherSourceProvider } from "../weather/provider.ts"
|
import { WeatherSourceProvider } from "../weather/provider.ts"
|
||||||
@@ -12,7 +12,7 @@ const mockWeatherClient: WeatherKitClient = {
|
|||||||
|
|
||||||
describe("UserSessionManager", () => {
|
describe("UserSessionManager", () => {
|
||||||
test("getOrCreate creates session on first call", () => {
|
test("getOrCreate creates session on first call", () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("getOrCreate returns same session for same user", () => {
|
test("getOrCreate returns same session for same user", () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session1 = manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
const session2 = manager.getOrCreate("user-1")
|
const session2 = manager.getOrCreate("user-1")
|
||||||
@@ -30,7 +30,7 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("getOrCreate returns different sessions for different users", () => {
|
test("getOrCreate returns different sessions for different users", () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session1 = manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
const session2 = manager.getOrCreate("user-2")
|
const session2 = manager.getOrCreate("user-2")
|
||||||
@@ -39,19 +39,19 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("each user gets independent source instances", () => {
|
test("each user gets independent source instances", () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session1 = manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
const session2 = manager.getOrCreate("user-2")
|
const session2 = manager.getOrCreate("user-2")
|
||||||
|
|
||||||
const source1 = session1.getSource<LocationSource>("aris.location")
|
const source1 = session1.getSource<LocationSource>("aelis.location")
|
||||||
const source2 = session2.getSource<LocationSource>("aris.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", () => {
|
test("remove destroys session and allows re-creation", () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session1 = manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
manager.remove("user-1")
|
manager.remove("user-1")
|
||||||
@@ -61,13 +61,13 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("remove is no-op for unknown user", () => {
|
test("remove is no-op for unknown user", () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
expect(() => manager.remove("unknown")).not.toThrow()
|
expect(() => manager.remove("unknown")).not.toThrow()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("accepts function providers", async () => {
|
test("accepts function providers", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
const result = await session.engine.refresh()
|
const result = await session.engine.refresh()
|
||||||
@@ -77,29 +77,25 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
test("accepts object providers", () => {
|
test("accepts object providers", () => {
|
||||||
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager([() => new LocationSource(), provider])
|
||||||
providers: [() => new LocationSource(), provider],
|
|
||||||
})
|
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session.getSource("aris.weather")).toBeDefined()
|
expect(session.getSource("aelis.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("accepts mixed providers", () => {
|
test("accepts mixed providers", () => {
|
||||||
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager([() => new LocationSource(), provider])
|
||||||
providers: [() => new LocationSource(), provider],
|
|
||||||
})
|
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session.getSource("aris.location")).toBeDefined()
|
expect(session.getSource("aelis.location")).toBeDefined()
|
||||||
expect(session.getSource("aris.weather")).toBeDefined()
|
expect(session.getSource("aelis.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("refresh returns feed result through session", async () => {
|
test("refresh returns feed result through session", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
const result = await session.engine.refresh()
|
const result = await session.engine.refresh()
|
||||||
@@ -111,28 +107,28 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("location update via executeAction works", async () => {
|
test("location update via executeAction works", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
await session.engine.executeAction("aris.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>("aris.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 () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
const callback = mock()
|
const callback = mock()
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
session.engine.subscribe(callback)
|
session.engine.subscribe(callback)
|
||||||
|
|
||||||
await session.engine.executeAction("aris.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,
|
||||||
@@ -146,7 +142,7 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("remove stops reactive updates", async () => {
|
test("remove stops reactive updates", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager([() => new LocationSource()])
|
||||||
const callback = mock()
|
const callback = mock()
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
@@ -156,7 +152,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 = manager.getOrCreate("user-1")
|
const session2 = manager.getOrCreate("user-1")
|
||||||
await session2.engine.executeAction("aris.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,
|
||||||
@@ -1,21 +1,13 @@
|
|||||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
|
||||||
import type { FeedSourceProviderInput } from "./feed-source-provider.ts"
|
import type { FeedSourceProviderInput } from "./feed-source-provider.ts"
|
||||||
|
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
|
|
||||||
export interface UserSessionManagerConfig {
|
|
||||||
providers: FeedSourceProviderInput[]
|
|
||||||
feedEnhancer?: FeedEnhancer | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export class UserSessionManager {
|
export class UserSessionManager {
|
||||||
private sessions = new Map<string, UserSession>()
|
private sessions = new Map<string, UserSession>()
|
||||||
private readonly providers: FeedSourceProviderInput[]
|
private readonly providers: FeedSourceProviderInput[]
|
||||||
private readonly feedEnhancer: FeedEnhancer | null
|
|
||||||
|
|
||||||
constructor(config: UserSessionManagerConfig) {
|
constructor(providers: FeedSourceProviderInput[]) {
|
||||||
this.providers = config.providers
|
this.providers = providers
|
||||||
this.feedEnhancer = config.feedEnhancer ?? null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getOrCreate(userId: string): UserSession {
|
getOrCreate(userId: string): UserSession {
|
||||||
@@ -24,7 +16,7 @@ export class UserSessionManager {
|
|||||||
const sources = this.providers.map((p) =>
|
const sources = this.providers.map((p) =>
|
||||||
typeof p === "function" ? p(userId) : p.feedSourceForUser(userId),
|
typeof p === "function" ? p(userId) : p.feedSourceForUser(userId),
|
||||||
)
|
)
|
||||||
session = new UserSession(sources, this.feedEnhancer)
|
session = new UserSession(sources)
|
||||||
this.sessions.set(userId, session)
|
this.sessions.set(userId, session)
|
||||||
}
|
}
|
||||||
return session
|
return session
|
||||||
72
apps/aelis-backend/src/session/user-session.test.ts
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
import type { ActionDefinition, ContextEntry, FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
|
import { LocationSource } from "@aelis/source-location"
|
||||||
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
|
import { UserSession } from "./user-session.ts"
|
||||||
|
|
||||||
|
function createStubSource(id: string): FeedSource {
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {}
|
||||||
|
},
|
||||||
|
async executeAction(): Promise<unknown> {
|
||||||
|
return undefined
|
||||||
|
},
|
||||||
|
async fetchContext(): Promise<readonly ContextEntry[] | null> {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
async fetchItems() {
|
||||||
|
return []
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("UserSession", () => {
|
||||||
|
test("registers sources and starts engine", async () => {
|
||||||
|
const session = new UserSession([createStubSource("test-a"), createStubSource("test-b")])
|
||||||
|
|
||||||
|
const result = await session.engine.refresh()
|
||||||
|
|
||||||
|
expect(result.errors).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("getSource returns registered source", () => {
|
||||||
|
const location = new LocationSource()
|
||||||
|
const session = new UserSession([location])
|
||||||
|
|
||||||
|
const result = session.getSource<LocationSource>("aelis.location")
|
||||||
|
|
||||||
|
expect(result).toBe(location)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("getSource returns undefined for unknown source", () => {
|
||||||
|
const session = new UserSession([createStubSource("test")])
|
||||||
|
|
||||||
|
expect(session.getSource("unknown")).toBeUndefined()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("destroy stops engine and clears sources", () => {
|
||||||
|
const session = new UserSession([createStubSource("test")])
|
||||||
|
|
||||||
|
session.destroy()
|
||||||
|
|
||||||
|
expect(session.getSource("test")).toBeUndefined()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("engine.executeAction routes to correct source", async () => {
|
||||||
|
const location = new LocationSource()
|
||||||
|
const session = new UserSession([location])
|
||||||
|
|
||||||
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
|
lat: 51.5,
|
||||||
|
lng: -0.1,
|
||||||
|
accuracy: 10,
|
||||||
|
timestamp: new Date(),
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(location.lastLocation).toBeDefined()
|
||||||
|
expect(location.lastLocation!.lat).toBe(51.5)
|
||||||
|
})
|
||||||
|
})
|
||||||
24
apps/aelis-backend/src/session/user-session.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { FeedEngine, type FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
|
export class UserSession {
|
||||||
|
readonly engine: FeedEngine
|
||||||
|
private sources = new Map<string, FeedSource>()
|
||||||
|
|
||||||
|
constructor(sources: FeedSource[]) {
|
||||||
|
this.engine = new FeedEngine()
|
||||||
|
for (const source of sources) {
|
||||||
|
this.sources.set(source.id, source)
|
||||||
|
this.engine.register(source)
|
||||||
|
}
|
||||||
|
this.engine.start()
|
||||||
|
}
|
||||||
|
|
||||||
|
getSource<T extends FeedSource>(sourceId: string): T | undefined {
|
||||||
|
return this.sources.get(sourceId) as T | undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
destroy(): void {
|
||||||
|
this.engine.stop()
|
||||||
|
this.sources.clear()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { TflSource, type ITflApi } from "@aris/source-tfl"
|
import { TflSource, type ITflApi } from "@aelis/source-tfl"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { WeatherSource, type WeatherSourceOptions } from "@aris/source-weatherkit"
|
import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
|
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"expo": {
|
"expo": {
|
||||||
"name": "Aris",
|
"name": "Aelis",
|
||||||
"slug": "aris-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": "aris",
|
"scheme": "aelis",
|
||||||
"userInterfaceStyle": "automatic",
|
"userInterfaceStyle": "automatic",
|
||||||
"newArchEnabled": true,
|
"newArchEnabled": true,
|
||||||
"ios": {
|
"ios": {
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"ITSAppUsesNonExemptEncryption": false
|
"ITSAppUsesNonExemptEncryption": false
|
||||||
},
|
},
|
||||||
"bundleIdentifier": "sh.nym.aris"
|
"bundleIdentifier": "sh.nym.aelis"
|
||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"adaptiveIcon": {
|
"adaptiveIcon": {
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
},
|
},
|
||||||
"edgeToEdgeEnabled": true,
|
"edgeToEdgeEnabled": true,
|
||||||
"predictiveBackGestureEnabled": false,
|
"predictiveBackGestureEnabled": false,
|
||||||
"package": "sh.nym.aris"
|
"package": "sh.nym.aelis"
|
||||||
},
|
},
|
||||||
"web": {
|
"web": {
|
||||||
"output": "static",
|
"output": "static",
|
||||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 384 KiB After Width: | Height: | Size: 384 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "aris-client",
|
"name": "aelis-client",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"main": "expo-router/entry",
|
"main": "expo-router/entry",
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
import type { FeedItem } from "@aris/core"
|
|
||||||
|
|
||||||
import type { LlmClient } from "./llm-client.ts"
|
|
||||||
|
|
||||||
import { mergeEnhancement } from "./merge.ts"
|
|
||||||
import { buildPrompt, hasUnfilledSlots } from "./prompt-builder.ts"
|
|
||||||
|
|
||||||
/** Takes feed items, returns enhanced feed items. */
|
|
||||||
export type FeedEnhancer = (items: FeedItem[]) => Promise<FeedItem[]>
|
|
||||||
|
|
||||||
export interface FeedEnhancerConfig {
|
|
||||||
client: LlmClient
|
|
||||||
/** Defaults to Date.now — override for testing */
|
|
||||||
clock?: () => Date
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a FeedEnhancer that uses the provided LlmClient.
|
|
||||||
*
|
|
||||||
* Skips the LLM call when no items have unfilled slots.
|
|
||||||
* Returns items unchanged on LLM failure.
|
|
||||||
*/
|
|
||||||
export function createFeedEnhancer(config: FeedEnhancerConfig): FeedEnhancer {
|
|
||||||
const { client } = config
|
|
||||||
const clock = config.clock ?? (() => new Date())
|
|
||||||
|
|
||||||
return async function enhanceFeed(items) {
|
|
||||||
if (!hasUnfilledSlots(items)) {
|
|
||||||
return items
|
|
||||||
}
|
|
||||||
|
|
||||||
const currentTime = clock()
|
|
||||||
const { systemPrompt, userMessage } = buildPrompt(items, currentTime)
|
|
||||||
|
|
||||||
let result
|
|
||||||
try {
|
|
||||||
result = await client.enhance({ systemPrompt, userMessage })
|
|
||||||
} catch (err) {
|
|
||||||
console.error("[enhancement] LLM call failed:", err)
|
|
||||||
result = null
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!result) {
|
|
||||||
return items
|
|
||||||
}
|
|
||||||
|
|
||||||
return mergeEnhancement(items, result, currentTime)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||