Compare commits
16 Commits
e6ca1763ef
...
feat/feed-
| Author | SHA1 | Date | |
|---|---|---|---|
|
0145976a9f
|
|||
| 4b824c66ce | |||
| 272fb9b9b3 | |||
| 5ea24b0a13 | |||
| bed033652c | |||
| ec083c3c77 | |||
| 45fa539d3e | |||
| b4ad910a14 | |||
| d3452dd452 | |||
| c78ad25f0d | |||
| e07157eba0 | |||
| 3036f4ad3f | |||
| f2c991eebb | |||
| 805e4f2bc6 | |||
| 34ead53e1d | |||
| 863c298bd3 |
42
.github/workflows/build-waitlist-website.yml
vendored
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
name: Build waitlist website
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [master]
|
||||||
|
paths:
|
||||||
|
- apps/waitlist-website/**
|
||||||
|
- .github/workflows/build-waitlist-website.yml
|
||||||
|
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: cr.nym.sh
|
||||||
|
IMAGE_NAME: aelis-waitlist-website
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Log in to container registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Build and push
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: apps/waitlist-website
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
|
||||||
|
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
2
.github/workflows/test.yml
vendored
@@ -21,4 +21,4 @@ jobs:
|
|||||||
run: bun install --frozen-lockfile
|
run: bun install --frozen-lockfile
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: bun test
|
run: bun run test
|
||||||
|
|||||||
@@ -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
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -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,12 +9,13 @@
|
|||||||
"test": "bun test src/"
|
"test": "bun test src/"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aris/core": "workspace:*",
|
"@aelis/core": "workspace:*",
|
||||||
"@aris/source-caldav": "workspace:*",
|
"@aelis/source-caldav": "workspace:*",
|
||||||
"@aris/source-google-calendar": "workspace:*",
|
"@aelis/source-google-calendar": "workspace:*",
|
||||||
"@aris/source-location": "workspace:*",
|
"@aelis/source-location": "workspace:*",
|
||||||
"@aris/source-tfl": "workspace:*",
|
"@aelis/source-tfl": "workspace:*",
|
||||||
"@aris/source-weatherkit": "workspace:*",
|
"@aelis/source-weatherkit": "workspace:*",
|
||||||
|
"@nym.sh/jrx": "^0.2.0",
|
||||||
"@openrouter/sdk": "^0.9.11",
|
"@openrouter/sdk": "^0.9.11",
|
||||||
"arktype": "^2.1.29",
|
"arktype": "^2.1.29",
|
||||||
"better-auth": "^1",
|
"better-auth": "^1",
|
||||||
@@ -61,7 +61,7 @@ export async function getSessionFromHeaders(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test-only middleware that injects a fake user and session.
|
* Dev/test middleware that injects a fake user and session.
|
||||||
* Pass userId to simulate an authenticated request, or omit to get 401.
|
* Pass userId to simulate an authenticated request, or omit to get 401.
|
||||||
*/
|
*/
|
||||||
export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddleware {
|
export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddleware {
|
||||||
@@ -69,8 +69,34 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
|
|||||||
if (!userId) {
|
if (!userId) {
|
||||||
return c.json({ error: "Unauthorized" }, 401)
|
return c.json({ error: "Unauthorized" }, 401)
|
||||||
}
|
}
|
||||||
c.set("user", { id: userId } as AuthUser)
|
|
||||||
c.set("session", { id: "mock-session" } as AuthSession)
|
const now = new Date()
|
||||||
|
const expiresAt = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000)
|
||||||
|
|
||||||
|
const user: AuthUser = {
|
||||||
|
id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
|
||||||
|
name: "Dev User",
|
||||||
|
email: "dev@aelis.local",
|
||||||
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
}
|
||||||
|
|
||||||
|
const session: AuthSession = {
|
||||||
|
id: "Wt3FvBpXaQrMhD8sKjE6LcYn0gUz5iRo",
|
||||||
|
userId: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
|
||||||
|
token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4",
|
||||||
|
expiresAt,
|
||||||
|
ipAddress: "127.0.0.1",
|
||||||
|
userAgent: "aelis-dev",
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
}
|
||||||
|
|
||||||
|
c.set("user", user)
|
||||||
|
c.set("session", session)
|
||||||
|
|
||||||
await next()
|
await next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
7
apps/aelis-backend/src/caldav/renderer-provider.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import type { FeedItemRenderer } from "@aelis/core"
|
||||||
|
|
||||||
|
import { renderCalDavFeedItem } from "@aelis/source-caldav"
|
||||||
|
|
||||||
|
export const CALDAV_SOURCE_ID = "aelis.caldav"
|
||||||
|
|
||||||
|
export const calDavRenderer: FeedItemRenderer = renderCalDavFeedItem as FeedItemRenderer
|
||||||
497
apps/aelis-backend/src/engine/http.test.ts
Normal file
@@ -0,0 +1,497 @@
|
|||||||
|
import type {
|
||||||
|
ActionDefinition,
|
||||||
|
ContextEntry,
|
||||||
|
FeedItem,
|
||||||
|
FeedItemRenderer,
|
||||||
|
FeedSource,
|
||||||
|
} from "@aelis/core"
|
||||||
|
import type { Spec } from "@json-render/core"
|
||||||
|
|
||||||
|
import { contextKey } from "@aelis/core"
|
||||||
|
import { JRX_NODE } from "@nym.sh/jrx"
|
||||||
|
import { describe, expect, test } from "bun:test"
|
||||||
|
import { Hono } from "hono"
|
||||||
|
|
||||||
|
import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
|
import { FeedRenderer } from "../session/feed-renderer.ts"
|
||||||
|
import { UserSessionManager } from "../session/index.ts"
|
||||||
|
import { registerFeedHttpHandlers } from "./http.ts"
|
||||||
|
|
||||||
|
interface FeedResponse {
|
||||||
|
items: Array<{
|
||||||
|
id: string
|
||||||
|
type: string
|
||||||
|
priority: number
|
||||||
|
timestamp: string
|
||||||
|
data: Record<string, unknown>
|
||||||
|
}>
|
||||||
|
errors: Array<{ sourceId: string; error: string }>
|
||||||
|
}
|
||||||
|
|
||||||
|
interface RenderedFeedResponse {
|
||||||
|
items: Array<{
|
||||||
|
id: string
|
||||||
|
type: string
|
||||||
|
timestamp: string
|
||||||
|
data: Record<string, unknown>
|
||||||
|
ui: Spec
|
||||||
|
}>
|
||||||
|
errors: Array<{ sourceId: string; error: string }>
|
||||||
|
}
|
||||||
|
|
||||||
|
function createStubSource(
|
||||||
|
id: string,
|
||||||
|
items: FeedItem[] = [],
|
||||||
|
contextEntries: readonly ContextEntry[] | null = null,
|
||||||
|
): FeedSource {
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {}
|
||||||
|
},
|
||||||
|
async executeAction(): Promise<unknown> {
|
||||||
|
return undefined
|
||||||
|
},
|
||||||
|
async fetchContext(): Promise<readonly ContextEntry[] | null> {
|
||||||
|
return contextEntries
|
||||||
|
},
|
||||||
|
async fetchItems() {
|
||||||
|
return items
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildTestApp(sessionManager: UserSessionManager, userId?: string) {
|
||||||
|
const app = new Hono()
|
||||||
|
registerFeedHttpHandlers(app, {
|
||||||
|
sessionManager,
|
||||||
|
authSessionMiddleware: mockAuthSessionMiddleware(userId),
|
||||||
|
})
|
||||||
|
return app
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("GET /api/feed", () => {
|
||||||
|
test("returns 401 without auth", async () => {
|
||||||
|
const manager = new UserSessionManager({ providers: [] })
|
||||||
|
const app = buildTestApp(manager)
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed")
|
||||||
|
|
||||||
|
expect(res.status).toBe(401)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns cached feed when available", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
|
type: "test",
|
||||||
|
priority: 0.8,
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: 42 },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
// Prime the cache
|
||||||
|
const session = manager.getOrCreate("user-1")
|
||||||
|
await session.engine.refresh()
|
||||||
|
expect(session.engine.lastFeed()).not.toBeNull()
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as FeedResponse
|
||||||
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!.id).toBe("item-1")
|
||||||
|
expect(body.items[0]!.type).toBe("test")
|
||||||
|
expect(body.items[0]!.priority).toBe(0.8)
|
||||||
|
expect(body.items[0]!.timestamp).toBe("2025-01-01T00:00:00.000Z")
|
||||||
|
expect(body.errors).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("forces refresh when no cached feed", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "fresh-1",
|
||||||
|
sourceId: "test",
|
||||||
|
type: "test",
|
||||||
|
priority: 0.5,
|
||||||
|
timestamp: new Date("2025-06-01T12:00:00.000Z"),
|
||||||
|
data: { fresh: true },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
// No prior refresh — lastFeed() returns null, handler should call refresh()
|
||||||
|
const res = await app.request("/api/feed")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as FeedResponse
|
||||||
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!.id).toBe("fresh-1")
|
||||||
|
expect(body.items[0]!.data.fresh).toBe(true)
|
||||||
|
expect(body.errors).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("serializes source errors as message strings", async () => {
|
||||||
|
const failingSource: FeedSource = {
|
||||||
|
id: "failing",
|
||||||
|
async listActions() {
|
||||||
|
return {}
|
||||||
|
},
|
||||||
|
async executeAction() {
|
||||||
|
return undefined
|
||||||
|
},
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
async fetchItems() {
|
||||||
|
throw new Error("connection timeout")
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const manager = new UserSessionManager({ providers: [() => failingSource] })
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as FeedResponse
|
||||||
|
expect(body.items).toHaveLength(0)
|
||||||
|
expect(body.errors).toHaveLength(1)
|
||||||
|
expect(body.errors[0]!.sourceId).toBe("failing")
|
||||||
|
expect(body.errors[0]!.error).toBe("connection timeout")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("GET /api/feed?render=json-render", () => {
|
||||||
|
const stubRenderer: FeedItemRenderer = (item) => ({
|
||||||
|
$$typeof: JRX_NODE,
|
||||||
|
type: "FeedCard",
|
||||||
|
props: {},
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
$$typeof: JRX_NODE,
|
||||||
|
type: "SansSerifText",
|
||||||
|
props: { content: `Rendered: ${item.data.value}` },
|
||||||
|
children: [],
|
||||||
|
key: undefined,
|
||||||
|
visible: undefined,
|
||||||
|
on: undefined,
|
||||||
|
repeat: undefined,
|
||||||
|
watch: undefined,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
key: undefined,
|
||||||
|
visible: undefined,
|
||||||
|
on: undefined,
|
||||||
|
repeat: undefined,
|
||||||
|
watch: undefined,
|
||||||
|
})
|
||||||
|
|
||||||
|
const rendererProvider = {
|
||||||
|
feedRendererForUser: () => new FeedRenderer({ "test-source": stubRenderer }),
|
||||||
|
}
|
||||||
|
|
||||||
|
test("returns rendered items with ui field as Spec", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "item-1",
|
||||||
|
sourceId: "test-source",
|
||||||
|
type: "renderable",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: "hello" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as RenderedFeedResponse
|
||||||
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!.id).toBe("item-1")
|
||||||
|
expect(body.items[0]!.ui).toBeDefined()
|
||||||
|
expect(body.items[0]!.ui.root).toBeDefined()
|
||||||
|
expect(body.items[0]!.ui.elements).toBeDefined()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("drops items without a renderer", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "renderable-1",
|
||||||
|
sourceId: "test-source",
|
||||||
|
type: "renderable",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: "yes" },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "unrenderable-1",
|
||||||
|
sourceId: "other-source",
|
||||||
|
type: "no-renderer",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: "no" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as RenderedFeedResponse
|
||||||
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!.id).toBe("renderable-1")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns empty items when no renderers match", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "item-1",
|
||||||
|
sourceId: "other-source",
|
||||||
|
type: "no-renderer",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: 42 },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as RenderedFeedResponse
|
||||||
|
expect(body.items).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 for unknown render format", async () => {
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test")],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=unknown")
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("unknown")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 500 when renderer is not available", async () => {
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test")],
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(500)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("not available")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("without render param returns raw items (no ui field)", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "item-1",
|
||||||
|
sourceId: "test-source",
|
||||||
|
type: "renderable",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: 42 },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as FeedResponse
|
||||||
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!).not.toHaveProperty("ui")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("GET /api/context", () => {
|
||||||
|
const weatherKey = contextKey("aelis.weather", "weather")
|
||||||
|
const weatherData = { temperature: 20, condition: "Clear" }
|
||||||
|
const contextEntries: readonly ContextEntry[] = [[weatherKey, weatherData]]
|
||||||
|
|
||||||
|
// The mock auth middleware always injects this hardcoded user ID
|
||||||
|
const mockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
|
||||||
|
|
||||||
|
function buildContextApp(userId?: string) {
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("weather", [], contextEntries)],
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, userId)
|
||||||
|
const session = manager.getOrCreate(mockUserId)
|
||||||
|
return { app, session }
|
||||||
|
}
|
||||||
|
|
||||||
|
test("returns 401 without auth", async () => {
|
||||||
|
const manager = new UserSessionManager({ providers: [] })
|
||||||
|
const app = buildTestApp(manager)
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]')
|
||||||
|
|
||||||
|
expect(res.status).toBe(401)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 when key param is missing", async () => {
|
||||||
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/context")
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("key")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 when key is invalid JSON", async () => {
|
||||||
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/context?key=notjson")
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("key")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 when key is not an array", async () => {
|
||||||
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key="string"')
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("key")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 when key contains invalid element types", async () => {
|
||||||
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/context?key=[true,null,[1,2]]")
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("key")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 when key is an empty array", async () => {
|
||||||
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/context?key=[]")
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("key")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 when match param is invalid", async () => {
|
||||||
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=invalid')
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("match")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns exact match with match=exact", async () => {
|
||||||
|
const { app, session } = buildContextApp("user-1")
|
||||||
|
await session.engine.refresh()
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]&match=exact')
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as { match: string; value: unknown }
|
||||||
|
expect(body.match).toBe("exact")
|
||||||
|
expect(body.value).toEqual(weatherData)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 404 with match=exact when only prefix would match", async () => {
|
||||||
|
const { app, session } = buildContextApp("user-1")
|
||||||
|
await session.engine.refresh()
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=exact')
|
||||||
|
|
||||||
|
expect(res.status).toBe(404)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns prefix match with match=prefix", async () => {
|
||||||
|
const { app, session } = buildContextApp("user-1")
|
||||||
|
await session.engine.refresh()
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=prefix')
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as {
|
||||||
|
match: string
|
||||||
|
entries: Array<{ key: unknown[]; value: unknown }>
|
||||||
|
}
|
||||||
|
expect(body.match).toBe("prefix")
|
||||||
|
expect(body.entries).toHaveLength(1)
|
||||||
|
expect(body.entries[0]!.key).toEqual(["aelis.weather", "weather"])
|
||||||
|
expect(body.entries[0]!.value).toEqual(weatherData)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("default mode returns exact match when available", async () => {
|
||||||
|
const { app, session } = buildContextApp("user-1")
|
||||||
|
await session.engine.refresh()
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]')
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as { match: string; value: unknown }
|
||||||
|
expect(body.match).toBe("exact")
|
||||||
|
expect(body.value).toEqual(weatherData)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("default mode falls back to prefix when no exact match", async () => {
|
||||||
|
const { app, session } = buildContextApp("user-1")
|
||||||
|
await session.engine.refresh()
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["aelis.weather"]')
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as {
|
||||||
|
match: string
|
||||||
|
entries: Array<{ key: unknown[]; value: unknown }>
|
||||||
|
}
|
||||||
|
expect(body.match).toBe("prefix")
|
||||||
|
expect(body.entries).toHaveLength(1)
|
||||||
|
expect(body.entries[0]!.value).toEqual(weatherData)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 404 when neither exact nor prefix matches", async () => {
|
||||||
|
const { app, session } = buildContextApp("user-1")
|
||||||
|
await session.engine.refresh()
|
||||||
|
|
||||||
|
const res = await app.request('/api/context?key=["nonexistent"]')
|
||||||
|
|
||||||
|
expect(res.status).toBe(404)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toBe("Context key not found")
|
||||||
|
})
|
||||||
|
})
|
||||||
144
apps/aelis-backend/src/engine/http.ts
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
import type { Context, Hono } from "hono"
|
||||||
|
|
||||||
|
import { contextKey } from "@aelis/core"
|
||||||
|
import { render } from "@nym.sh/jrx"
|
||||||
|
import { createMiddleware } from "hono/factory"
|
||||||
|
|
||||||
|
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
|
import type { UserSessionManager } from "../session/index.ts"
|
||||||
|
|
||||||
|
type Env = {
|
||||||
|
Variables: {
|
||||||
|
sessionManager: UserSessionManager
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface FeedHttpHandlersDeps {
|
||||||
|
sessionManager: UserSessionManager
|
||||||
|
authSessionMiddleware: AuthSessionMiddleware
|
||||||
|
}
|
||||||
|
|
||||||
|
export function registerFeedHttpHandlers(
|
||||||
|
app: Hono,
|
||||||
|
{ sessionManager, authSessionMiddleware }: FeedHttpHandlersDeps,
|
||||||
|
) {
|
||||||
|
const inject = createMiddleware<Env>(async (c, next) => {
|
||||||
|
c.set("sessionManager", sessionManager)
|
||||||
|
await next()
|
||||||
|
})
|
||||||
|
|
||||||
|
app.get("/api/feed", inject, authSessionMiddleware, handleGetFeed)
|
||||||
|
app.get("/api/context", inject, authSessionMiddleware, handleGetContext)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleGetFeed(c: Context<Env>) {
|
||||||
|
const user = c.get("user")!
|
||||||
|
const sessionManager = c.get("sessionManager")
|
||||||
|
const session = sessionManager.getOrCreate(user.id)
|
||||||
|
|
||||||
|
const feed = await session.feed()
|
||||||
|
|
||||||
|
const renderParam = c.req.query("render")
|
||||||
|
|
||||||
|
if (renderParam !== undefined) {
|
||||||
|
if (renderParam !== "json-render") {
|
||||||
|
return c.json({ error: `Unknown render format: "${renderParam}"` }, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!session.renderer) {
|
||||||
|
return c.json({ error: "Rendering is not available" }, 500)
|
||||||
|
}
|
||||||
|
|
||||||
|
const renderedItems = session.renderer.render(feed.items).map((item) => ({
|
||||||
|
...item,
|
||||||
|
ui: render(item.ui),
|
||||||
|
}))
|
||||||
|
|
||||||
|
return c.json({
|
||||||
|
items: renderedItems,
|
||||||
|
errors: feed.errors.map((e) => ({
|
||||||
|
sourceId: e.sourceId,
|
||||||
|
error: e.error.message,
|
||||||
|
})),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.json({
|
||||||
|
items: feed.items,
|
||||||
|
errors: feed.errors.map((e) => ({
|
||||||
|
sourceId: e.sourceId,
|
||||||
|
error: e.error.message,
|
||||||
|
})),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleGetContext(c: Context<Env>) {
|
||||||
|
const keyParam = c.req.query("key")
|
||||||
|
if (!keyParam) {
|
||||||
|
return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
let parsed: unknown
|
||||||
|
try {
|
||||||
|
parsed = JSON.parse(keyParam)
|
||||||
|
} catch {
|
||||||
|
return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Array.isArray(parsed) || parsed.length === 0 || !parsed.every(isContextKeyPart)) {
|
||||||
|
return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const matchParam = c.req.query("match")
|
||||||
|
if (matchParam !== undefined && matchParam !== "exact" && matchParam !== "prefix") {
|
||||||
|
return c.json({ error: 'Invalid "match" parameter: must be "exact" or "prefix"' }, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = c.get("user")!
|
||||||
|
const sessionManager = c.get("sessionManager")
|
||||||
|
const session = sessionManager.getOrCreate(user.id)
|
||||||
|
const context = session.engine.currentContext()
|
||||||
|
const key = contextKey(...parsed)
|
||||||
|
|
||||||
|
if (matchParam === "exact") {
|
||||||
|
const value = context.get(key)
|
||||||
|
if (value === undefined) {
|
||||||
|
return c.json({ error: "Context key not found" }, 404)
|
||||||
|
}
|
||||||
|
return c.json({ match: "exact", value })
|
||||||
|
}
|
||||||
|
|
||||||
|
if (matchParam === "prefix") {
|
||||||
|
const entries = context.find(key)
|
||||||
|
if (entries.length === 0) {
|
||||||
|
return c.json({ error: "Context key not found" }, 404)
|
||||||
|
}
|
||||||
|
return c.json({ match: "prefix", entries })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default: single find() covers both exact and prefix matches
|
||||||
|
const entries = context.find(key)
|
||||||
|
if (entries.length === 0) {
|
||||||
|
return c.json({ error: "Context key not found" }, 404)
|
||||||
|
}
|
||||||
|
|
||||||
|
// If exactly one result with the same key length, treat as exact match
|
||||||
|
if (entries.length === 1 && entries[0]!.key.length === parsed.length) {
|
||||||
|
return c.json({ match: "exact", value: entries[0]!.value })
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.json({ match: "prefix", entries })
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Validates that a value is a valid ContextKeyPart (string, number, or plain object of primitives). */
|
||||||
|
function isContextKeyPart(value: unknown): boolean {
|
||||||
|
if (typeof value === "string" || typeof value === "number") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if (typeof value === "object" && value !== null && !Array.isArray(value)) {
|
||||||
|
return Object.values(value).every(
|
||||||
|
(v) => typeof v === "string" || typeof v === "number" || typeof v === "boolean",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@aris/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 "@aris/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
@@ -9,6 +9,7 @@ import { mergeEnhancement } from "./merge.ts"
|
|||||||
function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
|
function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
|
||||||
return {
|
return {
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-01T00:00:00Z"),
|
timestamp: new Date("2025-01-01T00:00:00Z"),
|
||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
import type { FeedItem } from "@aris/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import type { EnhancementResult } from "./schema.ts"
|
import type { EnhancementResult } from "./schema.ts"
|
||||||
|
|
||||||
|
const ENHANCEMENT_SOURCE_ID = "aelis.enhancement"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Merges an EnhancementResult into feed items.
|
* Merges an EnhancementResult into feed items.
|
||||||
*
|
*
|
||||||
@@ -10,7 +12,11 @@ import type { EnhancementResult } from "./schema.ts"
|
|||||||
* - Returns a new array (no mutation)
|
* - Returns a new array (no mutation)
|
||||||
* - Ignores fills for items/slots that don't exist
|
* - Ignores fills for items/slots that don't exist
|
||||||
*/
|
*/
|
||||||
export function mergeEnhancement(items: FeedItem[], result: EnhancementResult, currentTime: Date): FeedItem[] {
|
export function mergeEnhancement(
|
||||||
|
items: FeedItem[],
|
||||||
|
result: EnhancementResult,
|
||||||
|
currentTime: Date,
|
||||||
|
): FeedItem[] {
|
||||||
const merged = items.map((item) => {
|
const merged = items.map((item) => {
|
||||||
const fills = result.slotFills[item.id]
|
const fills = result.slotFills[item.id]
|
||||||
if (!fills || !item.slots) return item
|
if (!fills || !item.slots) return item
|
||||||
@@ -31,6 +37,7 @@ export function mergeEnhancement(items: FeedItem[], result: EnhancementResult, c
|
|||||||
for (const synthetic of result.syntheticItems) {
|
for (const synthetic of result.syntheticItems) {
|
||||||
merged.push({
|
merged.push({
|
||||||
id: synthetic.id,
|
id: synthetic.id,
|
||||||
|
sourceId: ENHANCEMENT_SOURCE_ID,
|
||||||
type: synthetic.type,
|
type: synthetic.type,
|
||||||
timestamp: currentTime,
|
timestamp: currentTime,
|
||||||
data: { text: synthetic.text },
|
data: { text: synthetic.text },
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@aris/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
@@ -7,6 +7,7 @@ import { buildPrompt, hasUnfilledSlots } from "./prompt-builder.ts"
|
|||||||
function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
|
function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
|
||||||
return {
|
return {
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-01T00:00:00Z"),
|
timestamp: new Date("2025-01-01T00:00:00Z"),
|
||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
@@ -60,7 +61,9 @@ describe("buildPrompt", () => {
|
|||||||
|
|
||||||
expect(parsed.items).toHaveLength(1)
|
expect(parsed.items).toHaveLength(1)
|
||||||
expect((parsed.items as Array<Record<string, unknown>>)[0]!.id).toBe("item-1")
|
expect((parsed.items as Array<Record<string, unknown>>)[0]!.id).toBe("item-1")
|
||||||
expect((parsed.items as Array<Record<string, unknown>>)[0]!.slots).toEqual({ insight: "Weather insight" })
|
expect((parsed.items as Array<Record<string, unknown>>)[0]!.slots).toEqual({
|
||||||
|
insight: "Weather insight",
|
||||||
|
})
|
||||||
expect((parsed.items as Array<Record<string, unknown>>)[0]!.type).toBeUndefined()
|
expect((parsed.items as Array<Record<string, unknown>>)[0]!.type).toBeUndefined()
|
||||||
expect(parsed.context).toHaveLength(0)
|
expect(parsed.context).toHaveLength(0)
|
||||||
})
|
})
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { FeedItem } from "@aris/core"
|
import type { FeedItem } from "@aelis/core"
|
||||||
|
|
||||||
import { CalDavFeedItemType } from "@aris/source-caldav"
|
import { CalDavFeedItemType } from "@aelis/source-caldav"
|
||||||
import { CalendarFeedItemType } from "@aris/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 ARIS, 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.
|
||||||
@@ -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,
|
||||||
@@ -1,13 +1,15 @@
|
|||||||
import { LocationSource } from "@aris/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
|
|
||||||
import { registerAuthHandlers } from "./auth/http.ts"
|
import { registerAuthHandlers } from "./auth/http.ts"
|
||||||
import { requireSession } from "./auth/session-middleware.ts"
|
import { mockAuthSessionMiddleware, requireSession } from "./auth/session-middleware.ts"
|
||||||
|
import { CALDAV_SOURCE_ID, calDavRenderer } from "./caldav/renderer-provider.ts"
|
||||||
|
import { registerFeedHttpHandlers } from "./engine/http.ts"
|
||||||
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
||||||
import { createLlmClient } from "./enhancement/llm-client.ts"
|
import { createLlmClient } from "./enhancement/llm-client.ts"
|
||||||
import { registerFeedHttpHandlers } from "./feed/http.ts"
|
|
||||||
import { registerLocationHttpHandlers } from "./location/http.ts"
|
import { registerLocationHttpHandlers } from "./location/http.ts"
|
||||||
import { UserSessionManager } from "./session/index.ts"
|
import { FeedRenderer, UserSessionManager } from "./session/index.ts"
|
||||||
|
import { TFL_SOURCE_ID, tflRenderer } from "./tfl/renderer-provider.ts"
|
||||||
import { WeatherSourceProvider } from "./weather/provider.ts"
|
import { WeatherSourceProvider } from "./weather/provider.ts"
|
||||||
|
|
||||||
function main() {
|
function main() {
|
||||||
@@ -24,6 +26,11 @@ function main() {
|
|||||||
console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
|
console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const allRenderers = {
|
||||||
|
[TFL_SOURCE_ID]: tflRenderer,
|
||||||
|
[CALDAV_SOURCE_ID]: calDavRenderer,
|
||||||
|
}
|
||||||
|
|
||||||
const sessionManager = new UserSessionManager({
|
const sessionManager = new UserSessionManager({
|
||||||
providers: [
|
providers: [
|
||||||
() => new LocationSource(),
|
() => new LocationSource(),
|
||||||
@@ -36,6 +43,9 @@ function main() {
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
rendererProvider: {
|
||||||
|
feedRendererForUser: (_userId) => new FeedRenderer(allRenderers),
|
||||||
|
},
|
||||||
feedEnhancer,
|
feedEnhancer,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -43,10 +53,16 @@ function main() {
|
|||||||
|
|
||||||
app.get("/health", (c) => c.json({ status: "ok" }))
|
app.get("/health", (c) => c.json({ status: "ok" }))
|
||||||
|
|
||||||
registerAuthHandlers(app)
|
const isDev = process.env.NODE_ENV !== "production"
|
||||||
|
const authSessionMiddleware = isDev ? mockAuthSessionMiddleware("dev-user") : requireSession
|
||||||
|
|
||||||
|
if (!isDev) {
|
||||||
|
registerAuthHandlers(app)
|
||||||
|
}
|
||||||
|
|
||||||
registerFeedHttpHandlers(app, {
|
registerFeedHttpHandlers(app, {
|
||||||
sessionManager,
|
sessionManager,
|
||||||
authSessionMiddleware: requireSession,
|
authSessionMiddleware,
|
||||||
})
|
})
|
||||||
registerLocationHttpHandlers(app, { sessionManager })
|
registerLocationHttpHandlers(app, { sessionManager })
|
||||||
|
|
||||||
30
apps/aelis-backend/src/session/feed-renderer.ts
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
import type { FeedItem, FeedItemRenderer, RenderedFeedItem } from "@aelis/core"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders feed items using registered renderers.
|
||||||
|
*
|
||||||
|
* Constructed with a map of source ID to renderer function.
|
||||||
|
* Items whose source has no renderer are silently dropped.
|
||||||
|
*/
|
||||||
|
export class FeedRenderer {
|
||||||
|
private readonly renderers: Map<string, FeedItemRenderer>
|
||||||
|
|
||||||
|
constructor(renderers: Record<string, FeedItemRenderer>) {
|
||||||
|
this.renderers = new Map(Object.entries(renderers))
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders an array of feed items. Items whose sourceId has no
|
||||||
|
* registered renderer are silently dropped from the result.
|
||||||
|
*/
|
||||||
|
render(items: FeedItem[]): RenderedFeedItem[] {
|
||||||
|
const result: RenderedFeedItem[] = []
|
||||||
|
for (const item of items) {
|
||||||
|
const renderer = this.renderers.get(item.sourceId)
|
||||||
|
if (renderer) {
|
||||||
|
result.push({ ...item, ui: renderer(item) })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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
|
||||||
@@ -3,5 +3,7 @@ export type {
|
|||||||
FeedSourceProviderFn,
|
FeedSourceProviderFn,
|
||||||
FeedSourceProviderInput,
|
FeedSourceProviderInput,
|
||||||
} from "./feed-source-provider.ts"
|
} from "./feed-source-provider.ts"
|
||||||
|
export { FeedRenderer } from "./feed-renderer.ts"
|
||||||
|
export type { FeedRendererProvider } from "./renderer-provider.ts"
|
||||||
export { UserSession } from "./user-session.ts"
|
export { UserSession } from "./user-session.ts"
|
||||||
export { UserSessionManager } from "./user-session-manager.ts"
|
export { UserSessionManager } from "./user-session-manager.ts"
|
||||||
5
apps/aelis-backend/src/session/renderer-provider.ts
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
import type { FeedRenderer } from "./feed-renderer.ts"
|
||||||
|
|
||||||
|
export interface FeedRendererProvider {
|
||||||
|
feedRendererForUser(userId: string): FeedRenderer
|
||||||
|
}
|
||||||
@@ -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"
|
||||||
@@ -44,8 +44,8 @@ describe("UserSessionManager", () => {
|
|||||||
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)
|
||||||
})
|
})
|
||||||
@@ -83,7 +83,7 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
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", () => {
|
||||||
@@ -94,8 +94,8 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
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 () => {
|
||||||
@@ -114,14 +114,14 @@ describe("UserSessionManager", () => {
|
|||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => 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)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -132,7 +132,7 @@ describe("UserSessionManager", () => {
|
|||||||
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,
|
||||||
@@ -156,7 +156,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,20 +1,24 @@
|
|||||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
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 type { FeedRendererProvider } from "./renderer-provider.ts"
|
||||||
|
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
|
|
||||||
export interface UserSessionManagerConfig {
|
export interface UserSessionManagerConfig {
|
||||||
providers: FeedSourceProviderInput[]
|
providers: FeedSourceProviderInput[]
|
||||||
|
rendererProvider?: FeedRendererProvider | null
|
||||||
feedEnhancer?: FeedEnhancer | null
|
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 rendererProvider: FeedRendererProvider | null
|
||||||
private readonly feedEnhancer: FeedEnhancer | null
|
private readonly feedEnhancer: FeedEnhancer | null
|
||||||
|
|
||||||
constructor(config: UserSessionManagerConfig) {
|
constructor(config: UserSessionManagerConfig) {
|
||||||
this.providers = config.providers
|
this.providers = config.providers
|
||||||
|
this.rendererProvider = config.rendererProvider ?? null
|
||||||
this.feedEnhancer = config.feedEnhancer ?? null
|
this.feedEnhancer = config.feedEnhancer ?? null
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -24,7 +28,11 @@ 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,
|
||||||
|
enhancer: this.feedEnhancer,
|
||||||
|
renderer: this.rendererProvider?.feedRendererForUser(userId) ?? null,
|
||||||
|
})
|
||||||
this.sessions.set(userId, session)
|
this.sessions.set(userId, session)
|
||||||
}
|
}
|
||||||
return session
|
return session
|
||||||
@@ -1,8 +1,16 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aris/core"
|
import type {
|
||||||
|
ActionDefinition,
|
||||||
|
ContextEntry,
|
||||||
|
FeedItem,
|
||||||
|
FeedItemRenderer,
|
||||||
|
FeedSource,
|
||||||
|
} from "@aelis/core"
|
||||||
|
|
||||||
import { LocationSource } from "@aris/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
|
import { JRX_NODE } from "@nym.sh/jrx"
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
|
import { FeedRenderer } from "./feed-renderer.ts"
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
|
|
||||||
function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
||||||
@@ -25,7 +33,9 @@ function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
|||||||
|
|
||||||
describe("UserSession", () => {
|
describe("UserSession", () => {
|
||||||
test("registers sources and starts engine", async () => {
|
test("registers sources and starts engine", async () => {
|
||||||
const session = new UserSession([createStubSource("test-a"), createStubSource("test-b")])
|
const session = new UserSession({
|
||||||
|
sources: [createStubSource("test-a"), createStubSource("test-b")],
|
||||||
|
})
|
||||||
|
|
||||||
const result = await session.engine.refresh()
|
const result = await session.engine.refresh()
|
||||||
|
|
||||||
@@ -34,21 +44,21 @@ describe("UserSession", () => {
|
|||||||
|
|
||||||
test("getSource returns registered source", () => {
|
test("getSource returns registered source", () => {
|
||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession([location])
|
const session = new UserSession({ sources: [location] })
|
||||||
|
|
||||||
const result = session.getSource<LocationSource>("aris.location")
|
const result = session.getSource<LocationSource>("aelis.location")
|
||||||
|
|
||||||
expect(result).toBe(location)
|
expect(result).toBe(location)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("getSource returns undefined for unknown source", () => {
|
test("getSource returns undefined for unknown source", () => {
|
||||||
const session = new UserSession([createStubSource("test")])
|
const session = new UserSession({ sources: [createStubSource("test")] })
|
||||||
|
|
||||||
expect(session.getSource("unknown")).toBeUndefined()
|
expect(session.getSource("unknown")).toBeUndefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("destroy stops engine and clears sources", () => {
|
test("destroy stops engine and clears sources", () => {
|
||||||
const session = new UserSession([createStubSource("test")])
|
const session = new UserSession({ sources: [createStubSource("test")] })
|
||||||
|
|
||||||
session.destroy()
|
session.destroy()
|
||||||
|
|
||||||
@@ -57,9 +67,9 @@ describe("UserSession", () => {
|
|||||||
|
|
||||||
test("engine.executeAction routes to correct source", async () => {
|
test("engine.executeAction routes to correct source", async () => {
|
||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession([location])
|
const session = new UserSession({ sources: [location] })
|
||||||
|
|
||||||
await session.engine.executeAction("aris.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,
|
||||||
@@ -76,12 +86,13 @@ describe("UserSession.feed", () => {
|
|||||||
const items: FeedItem[] = [
|
const items: FeedItem[] = [
|
||||||
{
|
{
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
const session = new UserSession([createStubSource("test", items)])
|
const session = new UserSession({ sources: [createStubSource("test", items)] })
|
||||||
|
|
||||||
const result = await session.feed()
|
const result = await session.feed()
|
||||||
|
|
||||||
@@ -93,6 +104,7 @@ describe("UserSession.feed", () => {
|
|||||||
const items: FeedItem[] = [
|
const items: FeedItem[] = [
|
||||||
{
|
{
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
@@ -101,7 +113,7 @@ describe("UserSession.feed", () => {
|
|||||||
const enhancer = async (feedItems: FeedItem[]) =>
|
const enhancer = async (feedItems: FeedItem[]) =>
|
||||||
feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
||||||
|
|
||||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
|
||||||
|
|
||||||
const result = await session.feed()
|
const result = await session.feed()
|
||||||
|
|
||||||
@@ -113,6 +125,7 @@ describe("UserSession.feed", () => {
|
|||||||
const items: FeedItem[] = [
|
const items: FeedItem[] = [
|
||||||
{
|
{
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
@@ -124,7 +137,7 @@ describe("UserSession.feed", () => {
|
|||||||
return feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
return feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
|
||||||
|
|
||||||
const result1 = await session.feed()
|
const result1 = await session.feed()
|
||||||
expect(result1.items[0]!.data.enhanced).toBe(true)
|
expect(result1.items[0]!.data.enhanced).toBe(true)
|
||||||
@@ -139,6 +152,7 @@ describe("UserSession.feed", () => {
|
|||||||
let currentItems: FeedItem[] = [
|
let currentItems: FeedItem[] = [
|
||||||
{
|
{
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
data: { version: 1 },
|
data: { version: 1 },
|
||||||
@@ -158,7 +172,7 @@ describe("UserSession.feed", () => {
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = new UserSession([source], enhancer)
|
const session = new UserSession({ sources: [source], enhancer })
|
||||||
|
|
||||||
// First feed triggers refresh + enhancement
|
// First feed triggers refresh + enhancement
|
||||||
const result1 = await session.feed()
|
const result1 = await session.feed()
|
||||||
@@ -169,6 +183,7 @@ describe("UserSession.feed", () => {
|
|||||||
currentItems = [
|
currentItems = [
|
||||||
{
|
{
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-02T00:00:00.000Z"),
|
timestamp: new Date("2025-01-02T00:00:00.000Z"),
|
||||||
data: { version: 2 },
|
data: { version: 2 },
|
||||||
@@ -190,6 +205,7 @@ describe("UserSession.feed", () => {
|
|||||||
const items: FeedItem[] = [
|
const items: FeedItem[] = [
|
||||||
{
|
{
|
||||||
id: "item-1",
|
id: "item-1",
|
||||||
|
sourceId: "test",
|
||||||
type: "test",
|
type: "test",
|
||||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
@@ -199,7 +215,7 @@ describe("UserSession.feed", () => {
|
|||||||
throw new Error("enhancement exploded")
|
throw new Error("enhancement exploded")
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
|
||||||
|
|
||||||
const result = await session.feed()
|
const result = await session.feed()
|
||||||
|
|
||||||
@@ -208,3 +224,81 @@ describe("UserSession.feed", () => {
|
|||||||
expect(result.items[0]!.data.value).toBe(42)
|
expect(result.items[0]!.data.value).toBe(42)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("FeedRenderer", () => {
|
||||||
|
const stubRenderer: FeedItemRenderer = (item) => ({
|
||||||
|
$$typeof: JRX_NODE,
|
||||||
|
type: "FeedCard",
|
||||||
|
props: { content: item.data.value },
|
||||||
|
children: [],
|
||||||
|
key: undefined,
|
||||||
|
visible: undefined,
|
||||||
|
on: undefined,
|
||||||
|
repeat: undefined,
|
||||||
|
watch: undefined,
|
||||||
|
})
|
||||||
|
|
||||||
|
function makeItem(sourceId: string): FeedItem {
|
||||||
|
return {
|
||||||
|
id: `item-${sourceId}`,
|
||||||
|
sourceId,
|
||||||
|
type: "some-type",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: 42 },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
test("renders items with matching sourceId", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
const result = renderer.render([makeItem("test-source")])
|
||||||
|
|
||||||
|
expect(result).toHaveLength(1)
|
||||||
|
expect(result[0]!.ui).toBeDefined()
|
||||||
|
expect(result[0]!.id).toBe("item-test-source")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("drops items without a matching renderer", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
const result = renderer.render([makeItem("unknown-source")])
|
||||||
|
|
||||||
|
expect(result).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("filters mixed items", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
const result = renderer.render([makeItem("test-source"), makeItem("unknown-source")])
|
||||||
|
|
||||||
|
expect(result).toHaveLength(1)
|
||||||
|
expect(result[0]!.id).toBe("item-test-source")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("renders empty array for empty input", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
expect(renderer.render([])).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("renders with no renderers registered", () => {
|
||||||
|
const renderer = new FeedRenderer({})
|
||||||
|
|
||||||
|
expect(renderer.render([makeItem("test-source")])).toHaveLength(0)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("UserSession.renderer", () => {
|
||||||
|
test("exposes renderer when provided", () => {
|
||||||
|
const renderer = new FeedRenderer({})
|
||||||
|
const session = new UserSession({ sources: [createStubSource("test")], renderer })
|
||||||
|
|
||||||
|
expect(session.renderer).toBe(renderer)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("renderer is null when not provided", () => {
|
||||||
|
const session = new UserSession({ sources: [createStubSource("test")] })
|
||||||
|
|
||||||
|
expect(session.renderer).toBeNull()
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -1,9 +1,17 @@
|
|||||||
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aris/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"
|
||||||
|
import type { FeedRenderer } from "./feed-renderer.ts"
|
||||||
|
|
||||||
|
export interface UserSessionOptions {
|
||||||
|
sources: FeedSource[]
|
||||||
|
enhancer?: FeedEnhancer | null
|
||||||
|
renderer?: FeedRenderer | null
|
||||||
|
}
|
||||||
|
|
||||||
export class UserSession {
|
export class UserSession {
|
||||||
readonly engine: FeedEngine
|
readonly engine: FeedEngine
|
||||||
|
readonly renderer: FeedRenderer | null
|
||||||
private sources = new Map<string, FeedSource>()
|
private sources = new Map<string, FeedSource>()
|
||||||
private readonly enhancer: FeedEnhancer | null
|
private readonly enhancer: FeedEnhancer | null
|
||||||
private enhancedItems: FeedItem[] | null = null
|
private enhancedItems: FeedItem[] | null = null
|
||||||
@@ -12,10 +20,11 @@ export class UserSession {
|
|||||||
private enhancingPromise: Promise<void> | null = null
|
private enhancingPromise: Promise<void> | null = null
|
||||||
private unsubscribe: (() => void) | null = null
|
private unsubscribe: (() => void) | null = null
|
||||||
|
|
||||||
constructor(sources: FeedSource[], enhancer?: FeedEnhancer | null) {
|
constructor(options: UserSessionOptions) {
|
||||||
this.engine = new FeedEngine()
|
this.engine = new FeedEngine()
|
||||||
this.enhancer = enhancer ?? null
|
this.enhancer = options.enhancer ?? null
|
||||||
for (const source of sources) {
|
this.renderer = options.renderer ?? null
|
||||||
|
for (const source of options.sources) {
|
||||||
this.sources.set(source.id, source)
|
this.sources.set(source.id, source)
|
||||||
this.engine.register(source)
|
this.engine.register(source)
|
||||||
}
|
}
|
||||||
@@ -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"
|
||||||
|
|
||||||
7
apps/aelis-backend/src/tfl/renderer-provider.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import type { FeedItemRenderer } from "@aelis/core"
|
||||||
|
|
||||||
|
import { renderTflAlert } from "@aelis/source-tfl"
|
||||||
|
|
||||||
|
export const TFL_SOURCE_ID = "aelis.tfl"
|
||||||
|
|
||||||
|
export const tflRenderer: FeedItemRenderer = renderTflAlert as FeedItemRenderer
|
||||||
@@ -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",
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
"@expo-google-fonts/inter": "^0.4.2",
|
"@expo-google-fonts/inter": "^0.4.2",
|
||||||
"@expo-google-fonts/source-serif-4": "^0.4.1",
|
"@expo-google-fonts/source-serif-4": "^0.4.1",
|
||||||
"@expo/vector-icons": "^15.0.3",
|
"@expo/vector-icons": "^15.0.3",
|
||||||
|
"@json-render/react-native": "^0.13.0",
|
||||||
"@react-navigation/bottom-tabs": "^7.4.0",
|
"@react-navigation/bottom-tabs": "^7.4.0",
|
||||||
"@react-navigation/elements": "^2.6.3",
|
"@react-navigation/elements": "^2.6.3",
|
||||||
"@react-navigation/native": "^7.1.8",
|
"@react-navigation/native": "^7.1.8",
|
||||||
@@ -45,7 +46,8 @@
|
|||||||
"react-native-svg": "15.12.1",
|
"react-native-svg": "15.12.1",
|
||||||
"react-native-web": "~0.21.0",
|
"react-native-web": "~0.21.0",
|
||||||
"react-native-worklets": "0.5.1",
|
"react-native-worklets": "0.5.1",
|
||||||
"twrnc": "^4.16.0"
|
"twrnc": "^4.16.0",
|
||||||
|
"zod": "^4.3.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/react": "~19.1.0",
|
"@types/react": "~19.1.0",
|
||||||
45
apps/aelis-client/src/app/_layout.tsx
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import "react-native-reanimated"
|
||||||
|
import { Stack } from "expo-router"
|
||||||
|
import { StatusBar } from "expo-status-bar"
|
||||||
|
import { useColorScheme } from "react-native"
|
||||||
|
import tw, { useDeviceContext } from "twrnc"
|
||||||
|
|
||||||
|
export default function RootLayout() {
|
||||||
|
useDeviceContext(tw)
|
||||||
|
const colorScheme = useColorScheme()
|
||||||
|
const headerBg = colorScheme === "dark" ? "#1c1917" : "#f5f5f4"
|
||||||
|
const headerTint = colorScheme === "dark" ? "#e7e5e4" : "#1c1917"
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Stack
|
||||||
|
screenOptions={{
|
||||||
|
headerShown: false,
|
||||||
|
contentStyle: { backgroundColor: headerBg },
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Stack.Screen
|
||||||
|
name="components/index"
|
||||||
|
options={{
|
||||||
|
headerShown: true,
|
||||||
|
title: "Components",
|
||||||
|
headerStyle: { backgroundColor: headerBg },
|
||||||
|
headerTintColor: headerTint,
|
||||||
|
headerShadowVisible: false,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Stack.Screen
|
||||||
|
name="components/[name]"
|
||||||
|
options={{
|
||||||
|
headerShown: true,
|
||||||
|
title: "",
|
||||||
|
headerStyle: { backgroundColor: headerBg },
|
||||||
|
headerTintColor: headerTint,
|
||||||
|
headerShadowVisible: false,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
<StatusBar style="auto" />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
48
apps/aelis-client/src/app/components/[name].tsx
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
import { useLocalSearchParams, useNavigation } from "expo-router"
|
||||||
|
import { useEffect } from "react"
|
||||||
|
import { ScrollView, View } from "react-native"
|
||||||
|
import tw from "twrnc"
|
||||||
|
|
||||||
|
import { buttonShowcase } from "@/components/ui/button.showcase"
|
||||||
|
import { feedCardShowcase } from "@/components/ui/feed-card.showcase"
|
||||||
|
import { monospaceTextShowcase } from "@/components/ui/monospace-text.showcase"
|
||||||
|
import { sansSerifTextShowcase } from "@/components/ui/sans-serif-text.showcase"
|
||||||
|
import { serifTextShowcase } from "@/components/ui/serif-text.showcase"
|
||||||
|
import { type Showcase } from "@/components/showcase"
|
||||||
|
import { SansSerifText } from "@/components/ui/sans-serif-text"
|
||||||
|
|
||||||
|
const showcases: Record<string, Showcase> = {
|
||||||
|
button: buttonShowcase,
|
||||||
|
"feed-card": feedCardShowcase,
|
||||||
|
"serif-text": serifTextShowcase,
|
||||||
|
"sans-serif-text": sansSerifTextShowcase,
|
||||||
|
"monospace-text": monospaceTextShowcase,
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ComponentDetailScreen() {
|
||||||
|
const { name } = useLocalSearchParams<{ name: string }>()
|
||||||
|
const navigation = useNavigation()
|
||||||
|
const showcase = showcases[name]
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (showcase) {
|
||||||
|
navigation.setOptions({ title: showcase.title })
|
||||||
|
}
|
||||||
|
}, [navigation, showcase])
|
||||||
|
|
||||||
|
if (!showcase) {
|
||||||
|
return (
|
||||||
|
<View style={tw`bg-stone-100 dark:bg-stone-900 flex-1 items-center justify-center`}>
|
||||||
|
<SansSerifText>Component not found</SansSerifText>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const ShowcaseComponent = showcase.component
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ScrollView style={tw`bg-stone-100 dark:bg-stone-900 flex-1`} contentContainerStyle={tw`px-5 pb-10 pt-4 gap-6`}>
|
||||||
|
<ShowcaseComponent />
|
||||||
|
</ScrollView>
|
||||||
|
)
|
||||||
|
}
|
||||||
37
apps/aelis-client/src/app/components/index.tsx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import { Link } from "expo-router"
|
||||||
|
import { FlatList, Pressable, View } from "react-native"
|
||||||
|
import tw from "twrnc"
|
||||||
|
|
||||||
|
import { SansSerifText } from "@/components/ui/sans-serif-text"
|
||||||
|
|
||||||
|
const components = [
|
||||||
|
{ name: "button", label: "Button" },
|
||||||
|
{ name: "feed-card", label: "FeedCard" },
|
||||||
|
{ name: "serif-text", label: "SerifText" },
|
||||||
|
{ name: "sans-serif-text", label: "SansSerifText" },
|
||||||
|
{ name: "monospace-text", label: "MonospaceText" },
|
||||||
|
] as const
|
||||||
|
|
||||||
|
export default function ComponentsScreen() {
|
||||||
|
return (
|
||||||
|
<View style={tw`flex-1`}>
|
||||||
|
<View style={tw`mx-4 mt-4 rounded-xl border border-stone-200 dark:border-stone-800 overflow-hidden`}>
|
||||||
|
<FlatList
|
||||||
|
data={components}
|
||||||
|
keyExtractor={(item) => item.name}
|
||||||
|
scrollEnabled={false}
|
||||||
|
ItemSeparatorComponent={() => (
|
||||||
|
<View style={tw`border-b border-stone-200 dark:border-stone-800`} />
|
||||||
|
)}
|
||||||
|
renderItem={({ item }) => (
|
||||||
|
<Link href={`/components/${item.name}`} asChild>
|
||||||
|
<Pressable style={tw`px-4 py-3`}>
|
||||||
|
<SansSerifText style={tw`text-base`}>{item.label}</SansSerifText>
|
||||||
|
</Pressable>
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
28
apps/aelis-client/src/app/index.tsx
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import { Link } from "expo-router"
|
||||||
|
import { Pressable } from "react-native"
|
||||||
|
import { SafeAreaView } from "react-native-safe-area-context"
|
||||||
|
import tw from "twrnc"
|
||||||
|
|
||||||
|
import { Button } from "@/components/ui/button"
|
||||||
|
import { FeedCard } from "@/components/ui/feed-card"
|
||||||
|
import { MonospaceText } from "@/components/ui/monospace-text"
|
||||||
|
import { SansSerifText } from "@/components/ui/sans-serif-text"
|
||||||
|
import { SerifText } from "@/components/ui/serif-text"
|
||||||
|
|
||||||
|
export default function HomeScreen() {
|
||||||
|
return (
|
||||||
|
<SafeAreaView style={tw`bg-stone-100 dark:bg-stone-900 flex-1 px-5 pt-6 gap-4`}>
|
||||||
|
<FeedCard>
|
||||||
|
<SerifText style={tw`text-4xl`}>Hello world asdsadsa</SerifText>
|
||||||
|
<SansSerifText style={tw`text-4xl font-bold`}>Hello world</SansSerifText>
|
||||||
|
<MonospaceText style={tw`text-4xl`}>asdjsakljdl</MonospaceText>
|
||||||
|
<Button style={tw`self-start`} label="Test" />
|
||||||
|
</FeedCard>
|
||||||
|
<Link href="/components" asChild>
|
||||||
|
<Pressable>
|
||||||
|
<SansSerifText style={tw`text-teal-600`}>View component library</SansSerifText>
|
||||||
|
</Pressable>
|
||||||
|
</Link>
|
||||||
|
</SafeAreaView>
|
||||||
|
)
|
||||||
|
}
|
||||||
18
apps/aelis-client/src/components/showcase.tsx
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { View } from "react-native"
|
||||||
|
import tw from "twrnc"
|
||||||
|
|
||||||
|
import { SansSerifText } from "./ui/sans-serif-text"
|
||||||
|
|
||||||
|
export type Showcase = {
|
||||||
|
title: string
|
||||||
|
component: React.ComponentType
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Section({ title, children }: { title: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<View style={tw`gap-3`}>
|
||||||
|
<SansSerifText style={tw`text-sm text-stone-500 dark:text-stone-400`}>{title}</SansSerifText>
|
||||||
|
{children}
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||