Compare commits
78 Commits
feat/feed-
...
fc08f828f2
| Author | SHA1 | Date | |
|---|---|---|---|
|
fc08f828f2
|
|||
| f2c991eebb | |||
| 805e4f2bc6 | |||
| 34ead53e1d | |||
| 863c298bd3 | |||
| 230116d9f7 | |||
| 0a08706cf9 | |||
| badc00c43b | |||
| 31d5aa8d50 | |||
| de29e44a08 | |||
| caf48484bf | |||
| ac80e0cdac | |||
| 96e22e227c | |||
| 8ca8a0d1d2 | |||
| 4c9ac2c61a | |||
| be3fc41a00 | |||
| 2e9c600e93 | |||
| d616fd52d3 | |||
| 2d7544500d | |||
| 9dc0cc3d2f | |||
| fe1d261f56 | |||
| 40ad90aa2d | |||
| 82ac2b577d | |||
| ffea38b986 | |||
| 28d26b3c87 | |||
| 78b0ed94bd | |||
| ee957ea7b1 | |||
| 6ae0ad1d40 | |||
|
941acb826c
|
|||
| 3d492a5d56 | |||
|
08dd437952
|
|||
| 2fc20759dd | |||
|
963bf073d1
|
|||
| c0b3db0e11 | |||
|
ca4a337dcd
|
|||
| 769e2d4eb0 | |||
|
5e9094710d
|
|||
|
5556f3fbf9
|
|||
|
0176979925
|
|||
|
971aba0932
|
|||
|
68e319e4b8
|
|||
| c042af88f3 | |||
|
0608f2ac61
|
|||
| 1ade63dd8c | |||
|
8df340d9af
|
|||
|
727280e8b1
|
|||
| d30f70494b | |||
| 413a57c156 | |||
|
d9625198d6
|
|||
| 959167a93c | |||
|
3ebb47c5ab
|
|||
| cd29a60bab | |||
|
2f082b5833
|
|||
| f987253e53 | |||
|
699155e0d8
|
|||
| 4d6cac7ec8 | |||
|
1f2920a7ad
|
|||
| 476c6f06d9 | |||
|
bfdc5e67b7
|
|||
|
2cf6536e48
|
|||
|
c7a1048320
|
|||
|
512faf191e
|
|||
| e5d65816dc | |||
| 13c411c842 | |||
| e8ba49d7bb | |||
| 3010eb8990 | |||
| 6c4982ae85 | |||
| f557a0f967 | |||
| 1b2929c2b6 | |||
| e5f1273baf | |||
| c3429e1a77 | |||
|
54e4b0dcf7
|
|||
|
31a82c1d9f
|
|||
| d1102fe1ac | |||
| 9e3fe2ea16 | |||
| 949b7c8571 | |||
| bd6cc3c963 | |||
| aff9464245 |
43
.claude/skills/gpg-commit-signing/SKILL.md
Normal file
@@ -0,0 +1,43 @@
|
||||
---
|
||||
name: gpg-commit-signing
|
||||
description: Sign git commits with GPG in non-interactive environments. Use when committing code and the `GPG_PRIVATE_KEY_PASSPHRASE` environment variable is available. Triggers on "commit", "sign commit", "GPG", "git commit -S", or any git operation requiring signed commits.
|
||||
---
|
||||
|
||||
# GPG Commit Signing
|
||||
|
||||
Sign commits in headless/non-interactive environments where `/dev/tty` is unavailable.
|
||||
|
||||
## Workflow
|
||||
|
||||
1. Check whether `GPG_PRIVATE_KEY_PASSPHRASE` is set:
|
||||
|
||||
```bash
|
||||
test -n "$GPG_PRIVATE_KEY_PASSPHRASE" && echo "available" || echo "not set"
|
||||
```
|
||||
|
||||
If not set, skip signing — commit without `-S`.
|
||||
|
||||
2. Try a direct signed commit first — the environment may already have loopback pinentry configured:
|
||||
|
||||
```bash
|
||||
git commit -S -m "message"
|
||||
```
|
||||
|
||||
If this succeeds, no further steps are needed.
|
||||
|
||||
3. If step 2 fails with a `/dev/tty` error, use `--pinentry-mode loopback` via a wrapper script:
|
||||
|
||||
```bash
|
||||
printf '#!/bin/sh\ngpg --batch --pinentry-mode loopback --passphrase "$GPG_PRIVATE_KEY_PASSPHRASE" "$@"\n' > /tmp/gpg-sign.sh
|
||||
chmod +x /tmp/gpg-sign.sh
|
||||
git -c gpg.program=/tmp/gpg-sign.sh commit -S -m "message"
|
||||
rm /tmp/gpg-sign.sh
|
||||
```
|
||||
|
||||
This passes the passphrase directly to gpg on each signing invocation, bypassing the need for a configured gpg-agent.
|
||||
|
||||
## Anti-patterns
|
||||
|
||||
- Do not echo or log `GPG_PRIVATE_KEY_PASSPHRASE`.
|
||||
- Do not commit without `-S` when the passphrase is available — the project expects signed commits.
|
||||
- Do not leave wrapper scripts on disk after committing.
|
||||
@@ -10,12 +10,13 @@
|
||||
"context": ".",
|
||||
"dockerfile": "Dockerfile"
|
||||
},
|
||||
"postStartCommand": "./scripts/setup-git.sh && ./scripts/setup-nvim.sh"
|
||||
"postCreateCommand": "bun install",
|
||||
"postStartCommand": "./scripts/setup-git.sh && ./scripts/setup-nvim.sh",
|
||||
// Features add additional features to your environment. See https://containers.dev/features
|
||||
// Beware: features are not supported on all platforms and may have unintended side-effects.
|
||||
// "features": {
|
||||
// "ghcr.io/devcontainers/features/docker-in-docker": {
|
||||
// "moby": false
|
||||
// }
|
||||
// }
|
||||
"features": {
|
||||
"ghcr.io/tailscale/codespace/tailscale": {
|
||||
"version": "latest"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
1
.gitignore
vendored
@@ -32,3 +32,4 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
|
||||
|
||||
# Finder (MacOS) folder config
|
||||
.DS_Store
|
||||
core
|
||||
|
||||
8
.ona/automations.yaml
Normal file
@@ -0,0 +1,8 @@
|
||||
services:
|
||||
expo:
|
||||
name: Expo Dev Server
|
||||
description: Expo development server for aelis-client
|
||||
triggeredBy:
|
||||
- postDevcontainerStart
|
||||
commands:
|
||||
start: cd apps/aelis-client && ./scripts/run-dev-server.sh
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
## 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
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# aris
|
||||
# aelis
|
||||
|
||||
To install dependencies:
|
||||
|
||||
@@ -8,14 +8,14 @@ bun install
|
||||
|
||||
## Packages
|
||||
|
||||
### @aris/source-tfl
|
||||
### @aelis/source-tfl
|
||||
|
||||
TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.
|
||||
|
||||
#### Testing
|
||||
|
||||
```bash
|
||||
cd packages/aris-source-tfl
|
||||
cd packages/aelis-source-tfl
|
||||
bun run test
|
||||
```
|
||||
|
||||
|
||||
19
apps/aelis-backend/.env.example
Normal file
@@ -0,0 +1,19 @@
|
||||
# PostgreSQL connection string
|
||||
DATABASE_URL=postgresql://user:password@localhost:5432/aris
|
||||
|
||||
# BetterAuth secret (min 32 chars, generate with: openssl rand -base64 32)
|
||||
BETTER_AUTH_SECRET=
|
||||
|
||||
# Base URL of the backend
|
||||
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
|
||||
WEATHERKIT_PRIVATE_KEY=
|
||||
WEATHERKIT_KEY_ID=
|
||||
WEATHERKIT_TEAM_ID=
|
||||
WEATHERKIT_SERVICE_ID=
|
||||
27
apps/aelis-backend/package.json
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"name": "@aelis/backend",
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"main": "src/server.ts",
|
||||
"scripts": {
|
||||
"dev": "bun run --watch src/server.ts",
|
||||
"start": "bun run src/server.ts",
|
||||
"test": "bun test src/"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aelis/core": "workspace:*",
|
||||
"@aelis/source-caldav": "workspace:*",
|
||||
"@aelis/source-google-calendar": "workspace:*",
|
||||
"@aelis/source-location": "workspace:*",
|
||||
"@aelis/source-tfl": "workspace:*",
|
||||
"@aelis/source-weatherkit": "workspace:*",
|
||||
"@openrouter/sdk": "^0.9.11",
|
||||
"arktype": "^2.1.29",
|
||||
"better-auth": "^1",
|
||||
"hono": "^4",
|
||||
"pg": "^8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/pg": "^8"
|
||||
}
|
||||
}
|
||||
102
apps/aelis-backend/src/auth/session-middleware.ts
Normal file
@@ -0,0 +1,102 @@
|
||||
import type { Context, MiddlewareHandler, Next } from "hono"
|
||||
|
||||
import type { AuthSession, AuthUser } from "./session.ts"
|
||||
|
||||
import { auth } from "./index.ts"
|
||||
|
||||
export interface SessionVariables {
|
||||
user: AuthUser | null
|
||||
session: AuthSession | null
|
||||
}
|
||||
|
||||
export type AuthSessionEnv = { Variables: SessionVariables }
|
||||
|
||||
export type AuthSessionMiddleware = MiddlewareHandler<AuthSessionEnv>
|
||||
|
||||
declare module "hono" {
|
||||
interface ContextVariableMap extends SessionVariables {}
|
||||
}
|
||||
|
||||
/**
|
||||
* Middleware that attaches session and user to the context.
|
||||
* Does not reject unauthenticated requests - use requireSession for that.
|
||||
*/
|
||||
export async function sessionMiddleware(c: Context, next: Next): Promise<void> {
|
||||
const session = await auth.api.getSession({ headers: c.req.raw.headers })
|
||||
|
||||
if (session) {
|
||||
c.set("user", session.user)
|
||||
c.set("session", session.session)
|
||||
} else {
|
||||
c.set("user", null)
|
||||
c.set("session", null)
|
||||
}
|
||||
|
||||
await next()
|
||||
}
|
||||
|
||||
/**
|
||||
* Middleware that requires a valid session. Returns 401 if not authenticated.
|
||||
*/
|
||||
export async function requireSession(c: Context, next: Next): Promise<Response | void> {
|
||||
const session = await auth.api.getSession({ headers: c.req.raw.headers })
|
||||
|
||||
if (!session) {
|
||||
return c.json({ error: "Unauthorized" }, 401)
|
||||
}
|
||||
|
||||
c.set("user", session.user)
|
||||
c.set("session", session.session)
|
||||
await next()
|
||||
}
|
||||
|
||||
/**
|
||||
* Get session from headers. Useful for WebSocket upgrade validation.
|
||||
*/
|
||||
export async function getSessionFromHeaders(
|
||||
headers: Headers,
|
||||
): Promise<{ user: AuthUser; session: AuthSession } | null> {
|
||||
const session = await auth.api.getSession({ headers })
|
||||
return session
|
||||
}
|
||||
|
||||
/**
|
||||
* Dev/test middleware that injects a fake user and session.
|
||||
* Pass userId to simulate an authenticated request, or omit to get 401.
|
||||
*/
|
||||
export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddleware {
|
||||
return async (c: Context, next: Next): Promise<Response | void> => {
|
||||
if (!userId) {
|
||||
return c.json({ error: "Unauthorized" }, 401)
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
}
|
||||
4
apps/aelis-backend/src/auth/session.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
import type { auth } from "./index.ts"
|
||||
|
||||
export type AuthUser = typeof auth.$Infer.Session.user
|
||||
export type AuthSession = typeof auth.$Infer.Session.session
|
||||
51
apps/aelis-backend/src/enhancement/enhance-feed.ts
Normal file
@@ -0,0 +1,51 @@
|
||||
import type { FeedItem } from "@aelis/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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
71
apps/aelis-backend/src/enhancement/llm-client.ts
Normal file
@@ -0,0 +1,71 @@
|
||||
import { OpenRouter } from "@openrouter/sdk"
|
||||
|
||||
import type { EnhancementResult } from "./schema.ts"
|
||||
|
||||
import { enhancementResultJsonSchema, parseEnhancementResult } from "./schema.ts"
|
||||
|
||||
const DEFAULT_MODEL = "openai/gpt-4.1-mini"
|
||||
const DEFAULT_TIMEOUT_MS = 30_000
|
||||
|
||||
export interface LlmClientConfig {
|
||||
apiKey: string
|
||||
model?: string
|
||||
timeoutMs?: number
|
||||
}
|
||||
|
||||
export interface LlmClientRequest {
|
||||
systemPrompt: string
|
||||
userMessage: string
|
||||
}
|
||||
|
||||
export interface LlmClient {
|
||||
enhance(request: LlmClientRequest): Promise<EnhancementResult | null>
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a reusable LLM client backed by OpenRouter.
|
||||
* The OpenRouter SDK instance is created once and reused across calls.
|
||||
*/
|
||||
export function createLlmClient(config: LlmClientConfig): LlmClient {
|
||||
const client = new OpenRouter({
|
||||
apiKey: config.apiKey,
|
||||
timeoutMs: config.timeoutMs ?? DEFAULT_TIMEOUT_MS,
|
||||
})
|
||||
const model = config.model ?? DEFAULT_MODEL
|
||||
|
||||
return {
|
||||
async enhance(request) {
|
||||
const response = await client.chat.send({
|
||||
chatGenerationParams: {
|
||||
model,
|
||||
messages: [
|
||||
{ role: "system" as const, content: request.systemPrompt },
|
||||
{ role: "user" as const, content: request.userMessage },
|
||||
],
|
||||
responseFormat: {
|
||||
type: "json_schema" as const,
|
||||
jsonSchema: {
|
||||
name: "enhancement_result",
|
||||
strict: true,
|
||||
schema: enhancementResultJsonSchema,
|
||||
},
|
||||
},
|
||||
stream: false,
|
||||
},
|
||||
})
|
||||
|
||||
const content = response.choices?.[0]?.message?.content
|
||||
if (typeof content !== "string") {
|
||||
console.warn("[enhancement] LLM returned no content in response")
|
||||
return null
|
||||
}
|
||||
|
||||
const result = parseEnhancementResult(content)
|
||||
if (!result) {
|
||||
console.warn("[enhancement] Failed to parse LLM response:", content)
|
||||
}
|
||||
|
||||
return result
|
||||
},
|
||||
}
|
||||
}
|
||||
150
apps/aelis-backend/src/enhancement/merge.test.ts
Normal file
@@ -0,0 +1,150 @@
|
||||
import type { FeedItem } from "@aelis/core"
|
||||
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
import type { EnhancementResult } from "./schema.ts"
|
||||
|
||||
import { mergeEnhancement } from "./merge.ts"
|
||||
|
||||
function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
|
||||
return {
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-01T00:00:00Z"),
|
||||
data: { value: 42 },
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
const now = new Date("2025-06-01T12:00:00Z")
|
||||
|
||||
describe("mergeEnhancement", () => {
|
||||
test("fills matching slots", () => {
|
||||
const item = makeItem({
|
||||
slots: {
|
||||
insight: { description: "Weather insight", content: null },
|
||||
},
|
||||
})
|
||||
const result: EnhancementResult = {
|
||||
slotFills: {
|
||||
"item-1": { insight: "Rain after 3pm" },
|
||||
},
|
||||
syntheticItems: [],
|
||||
}
|
||||
|
||||
const merged = mergeEnhancement([item], result, now)
|
||||
|
||||
expect(merged).toHaveLength(1)
|
||||
expect(merged[0]!.slots!.insight!.content).toBe("Rain after 3pm")
|
||||
// Description preserved
|
||||
expect(merged[0]!.slots!.insight!.description).toBe("Weather insight")
|
||||
})
|
||||
|
||||
test("does not mutate original items", () => {
|
||||
const item = makeItem({
|
||||
slots: {
|
||||
insight: { description: "test", content: null },
|
||||
},
|
||||
})
|
||||
const result: EnhancementResult = {
|
||||
slotFills: { "item-1": { insight: "filled" } },
|
||||
syntheticItems: [],
|
||||
}
|
||||
|
||||
mergeEnhancement([item], result, now)
|
||||
|
||||
expect(item.slots!.insight!.content).toBeNull()
|
||||
})
|
||||
|
||||
test("ignores fills for non-existent items", () => {
|
||||
const item = makeItem()
|
||||
const result: EnhancementResult = {
|
||||
slotFills: { "non-existent": { insight: "text" } },
|
||||
syntheticItems: [],
|
||||
}
|
||||
|
||||
const merged = mergeEnhancement([item], result, now)
|
||||
|
||||
expect(merged).toHaveLength(1)
|
||||
expect(merged[0]!.id).toBe("item-1")
|
||||
})
|
||||
|
||||
test("ignores fills for non-existent slots", () => {
|
||||
const item = makeItem({
|
||||
slots: {
|
||||
insight: { description: "test", content: null },
|
||||
},
|
||||
})
|
||||
const result: EnhancementResult = {
|
||||
slotFills: { "item-1": { "non-existent-slot": "text" } },
|
||||
syntheticItems: [],
|
||||
}
|
||||
|
||||
const merged = mergeEnhancement([item], result, now)
|
||||
|
||||
expect(merged[0]!.slots!.insight!.content).toBeNull()
|
||||
})
|
||||
|
||||
test("skips null fills", () => {
|
||||
const item = makeItem({
|
||||
slots: {
|
||||
insight: { description: "test", content: null },
|
||||
},
|
||||
})
|
||||
const result: EnhancementResult = {
|
||||
slotFills: { "item-1": { insight: null } },
|
||||
syntheticItems: [],
|
||||
}
|
||||
|
||||
const merged = mergeEnhancement([item], result, now)
|
||||
|
||||
expect(merged[0]!.slots!.insight!.content).toBeNull()
|
||||
})
|
||||
|
||||
test("passes through items without slots unchanged", () => {
|
||||
const item = makeItem()
|
||||
const result: EnhancementResult = {
|
||||
slotFills: {},
|
||||
syntheticItems: [],
|
||||
}
|
||||
|
||||
const merged = mergeEnhancement([item], result, now)
|
||||
|
||||
expect(merged[0]).toBe(item)
|
||||
})
|
||||
|
||||
test("appends synthetic items with backfilled fields", () => {
|
||||
const item = makeItem()
|
||||
const result: EnhancementResult = {
|
||||
slotFills: {},
|
||||
syntheticItems: [
|
||||
{
|
||||
id: "briefing-morning",
|
||||
type: "briefing",
|
||||
text: "Light afternoon ahead.",
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
const merged = mergeEnhancement([item], result, now)
|
||||
|
||||
expect(merged).toHaveLength(2)
|
||||
expect(merged[1]!.id).toBe("briefing-morning")
|
||||
expect(merged[1]!.type).toBe("briefing")
|
||||
expect(merged[1]!.timestamp).toEqual(now)
|
||||
expect(merged[1]!.data).toEqual({ text: "Light afternoon ahead." })
|
||||
})
|
||||
|
||||
test("handles empty enhancement result", () => {
|
||||
const item = makeItem()
|
||||
const result: EnhancementResult = {
|
||||
slotFills: {},
|
||||
syntheticItems: [],
|
||||
}
|
||||
|
||||
const merged = mergeEnhancement([item], result, now)
|
||||
|
||||
expect(merged).toHaveLength(1)
|
||||
expect(merged[0]).toBe(item)
|
||||
})
|
||||
})
|
||||
41
apps/aelis-backend/src/enhancement/merge.ts
Normal file
@@ -0,0 +1,41 @@
|
||||
import type { FeedItem } from "@aelis/core"
|
||||
|
||||
import type { EnhancementResult } from "./schema.ts"
|
||||
|
||||
/**
|
||||
* Merges an EnhancementResult into feed items.
|
||||
*
|
||||
* - Writes slot content from slotFills into matching items
|
||||
* - Appends synthetic items to the list
|
||||
* - Returns a new array (no mutation)
|
||||
* - Ignores fills for items/slots that don't exist
|
||||
*/
|
||||
export function mergeEnhancement(items: FeedItem[], result: EnhancementResult, currentTime: Date): FeedItem[] {
|
||||
const merged = items.map((item) => {
|
||||
const fills = result.slotFills[item.id]
|
||||
if (!fills || !item.slots) return item
|
||||
|
||||
const mergedSlots = { ...item.slots }
|
||||
let changed = false
|
||||
|
||||
for (const [slotName, content] of Object.entries(fills)) {
|
||||
if (slotName in mergedSlots && content !== null) {
|
||||
mergedSlots[slotName] = { ...mergedSlots[slotName]!, content }
|
||||
changed = true
|
||||
}
|
||||
}
|
||||
|
||||
return changed ? { ...item, slots: mergedSlots } : item
|
||||
})
|
||||
|
||||
for (const synthetic of result.syntheticItems) {
|
||||
merged.push({
|
||||
id: synthetic.id,
|
||||
type: synthetic.type,
|
||||
timestamp: currentTime,
|
||||
data: { text: synthetic.text },
|
||||
})
|
||||
}
|
||||
|
||||
return merged
|
||||
}
|
||||
167
apps/aelis-backend/src/enhancement/prompt-builder.test.ts
Normal file
@@ -0,0 +1,167 @@
|
||||
import type { FeedItem } from "@aelis/core"
|
||||
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
import { buildPrompt, hasUnfilledSlots } from "./prompt-builder.ts"
|
||||
|
||||
function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
|
||||
return {
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-01T00:00:00Z"),
|
||||
data: { value: 42 },
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
function parseUserMessage(userMessage: string): Record<string, unknown> {
|
||||
return JSON.parse(userMessage)
|
||||
}
|
||||
|
||||
describe("hasUnfilledSlots", () => {
|
||||
test("returns false for items without slots", () => {
|
||||
expect(hasUnfilledSlots([makeItem()])).toBe(false)
|
||||
})
|
||||
|
||||
test("returns false for items with all slots filled", () => {
|
||||
const item = makeItem({
|
||||
slots: {
|
||||
insight: { description: "test", content: "filled" },
|
||||
},
|
||||
})
|
||||
expect(hasUnfilledSlots([item])).toBe(false)
|
||||
})
|
||||
|
||||
test("returns true when at least one slot is unfilled", () => {
|
||||
const item = makeItem({
|
||||
slots: {
|
||||
insight: { description: "test", content: null },
|
||||
},
|
||||
})
|
||||
expect(hasUnfilledSlots([item])).toBe(true)
|
||||
})
|
||||
|
||||
test("returns false for empty array", () => {
|
||||
expect(hasUnfilledSlots([])).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe("buildPrompt", () => {
|
||||
test("puts items with unfilled slots in items", () => {
|
||||
const item = makeItem({
|
||||
slots: {
|
||||
insight: { description: "Weather insight", content: null },
|
||||
filled: { description: "Already done", content: "done" },
|
||||
},
|
||||
})
|
||||
|
||||
const { userMessage } = buildPrompt([item], new Date("2025-06-01T12:00:00Z"))
|
||||
const parsed = parseUserMessage(userMessage)
|
||||
|
||||
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]!.slots).toEqual({ insight: "Weather insight" })
|
||||
expect((parsed.items as Array<Record<string, unknown>>)[0]!.type).toBeUndefined()
|
||||
expect(parsed.context).toHaveLength(0)
|
||||
})
|
||||
|
||||
test("puts slotless items in context", () => {
|
||||
const withSlots = makeItem({
|
||||
id: "with-slots",
|
||||
slots: { insight: { description: "test", content: null } },
|
||||
})
|
||||
const withoutSlots = makeItem({ id: "no-slots" })
|
||||
|
||||
const { userMessage } = buildPrompt([withSlots, withoutSlots], new Date("2025-06-01T12:00:00Z"))
|
||||
const parsed = parseUserMessage(userMessage)
|
||||
|
||||
expect(parsed.items).toHaveLength(1)
|
||||
expect((parsed.items as Array<Record<string, unknown>>)[0]!.id).toBe("with-slots")
|
||||
expect(parsed.context).toHaveLength(1)
|
||||
expect((parsed.context as Array<Record<string, unknown>>)[0]!.id).toBe("no-slots")
|
||||
})
|
||||
|
||||
test("includes time in ISO format", () => {
|
||||
const { userMessage } = buildPrompt([], new Date("2025-06-01T12:00:00Z"))
|
||||
const parsed = parseUserMessage(userMessage)
|
||||
|
||||
expect(parsed.time).toBe("2025-06-01T12:00:00.000Z")
|
||||
})
|
||||
|
||||
test("system prompt is non-empty", () => {
|
||||
const { systemPrompt } = buildPrompt([], new Date())
|
||||
expect(systemPrompt.length).toBeGreaterThan(0)
|
||||
})
|
||||
|
||||
test("includes schedule in system prompt", () => {
|
||||
const calEvent = makeItem({
|
||||
id: "cal-1",
|
||||
type: "caldav-event",
|
||||
data: {
|
||||
title: "Team standup",
|
||||
startDate: "2025-06-01T10:00:00Z",
|
||||
endDate: "2025-06-01T10:30:00Z",
|
||||
isAllDay: false,
|
||||
location: null,
|
||||
},
|
||||
slots: {
|
||||
insight: { description: "test", content: null },
|
||||
},
|
||||
})
|
||||
|
||||
const { systemPrompt } = buildPrompt([calEvent], new Date("2025-06-01T12:00:00Z"))
|
||||
|
||||
expect(systemPrompt).toContain("Schedule:\n")
|
||||
expect(systemPrompt).toContain("Team standup")
|
||||
expect(systemPrompt).toContain("10:00")
|
||||
})
|
||||
|
||||
test("includes location in schedule", () => {
|
||||
const calEvent = makeItem({
|
||||
id: "cal-1",
|
||||
type: "caldav-event",
|
||||
data: {
|
||||
title: "Therapy",
|
||||
startDate: "2025-06-02T18:00:00Z",
|
||||
endDate: "2025-06-02T19:00:00Z",
|
||||
isAllDay: false,
|
||||
location: "92 Tooley Street, London",
|
||||
},
|
||||
})
|
||||
|
||||
const { systemPrompt } = buildPrompt([calEvent], new Date("2025-06-01T12:00:00Z"))
|
||||
|
||||
expect(systemPrompt).toContain("Therapy @ 92 Tooley Street, London")
|
||||
})
|
||||
|
||||
test("includes week calendar but omits schedule when no calendar items", () => {
|
||||
const weatherItem = makeItem({
|
||||
type: "weather-current",
|
||||
data: { temperature: 14 },
|
||||
})
|
||||
|
||||
const { systemPrompt } = buildPrompt([weatherItem], new Date("2025-06-01T12:00:00Z"))
|
||||
|
||||
expect(systemPrompt).toContain("Week:")
|
||||
expect(systemPrompt).not.toContain("Schedule:")
|
||||
})
|
||||
|
||||
test("user message is pure JSON", () => {
|
||||
const calEvent = makeItem({
|
||||
id: "cal-1",
|
||||
type: "caldav-event",
|
||||
data: {
|
||||
title: "Budget Review",
|
||||
startTime: "2025-06-01T14:00:00Z",
|
||||
endTime: "2025-06-01T15:00:00Z",
|
||||
isAllDay: false,
|
||||
location: "https://meet.google.com/abc",
|
||||
},
|
||||
})
|
||||
|
||||
const { userMessage } = buildPrompt([calEvent], new Date("2025-06-01T12:00:00Z"))
|
||||
|
||||
expect(userMessage.startsWith("{")).toBe(true)
|
||||
expect(() => JSON.parse(userMessage)).not.toThrow()
|
||||
})
|
||||
})
|
||||
218
apps/aelis-backend/src/enhancement/prompt-builder.ts
Normal file
@@ -0,0 +1,218 @@
|
||||
import type { FeedItem } from "@aelis/core"
|
||||
|
||||
import { CalDavFeedItemType } from "@aelis/source-caldav"
|
||||
import { CalendarFeedItemType } from "@aelis/source-google-calendar"
|
||||
|
||||
import systemPromptBase from "./prompts/system.txt"
|
||||
|
||||
const CALENDAR_ITEM_TYPES = new Set<string>([
|
||||
CalDavFeedItemType.Event,
|
||||
CalendarFeedItemType.Event,
|
||||
CalendarFeedItemType.AllDay,
|
||||
])
|
||||
|
||||
/**
|
||||
* Builds the system prompt and user message for the enhancement harness.
|
||||
*
|
||||
* Includes a pre-computed mini calendar so the LLM doesn't have to
|
||||
* parse timestamps to understand the user's schedule.
|
||||
*/
|
||||
export function buildPrompt(
|
||||
items: FeedItem[],
|
||||
currentTime: Date,
|
||||
): { systemPrompt: string; userMessage: string } {
|
||||
const schedule = buildSchedule(items, currentTime)
|
||||
|
||||
const enhanceItems: Array<{
|
||||
id: string
|
||||
data: Record<string, unknown>
|
||||
slots: Record<string, string>
|
||||
}> = []
|
||||
const contextItems: Array<{
|
||||
id: string
|
||||
type: string
|
||||
data: Record<string, unknown>
|
||||
}> = []
|
||||
|
||||
for (const item of items) {
|
||||
const hasUnfilledSlots =
|
||||
item.slots &&
|
||||
Object.values(item.slots).some((slot) => slot.content === null)
|
||||
|
||||
if (hasUnfilledSlots) {
|
||||
enhanceItems.push({
|
||||
id: item.id,
|
||||
data: item.data,
|
||||
slots: Object.fromEntries(
|
||||
Object.entries(item.slots!)
|
||||
.filter(([, slot]) => slot.content === null)
|
||||
.map(([name, slot]) => [name, slot.description]),
|
||||
),
|
||||
})
|
||||
} else {
|
||||
contextItems.push({
|
||||
id: item.id,
|
||||
type: item.type,
|
||||
data: item.data,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const userMessage = JSON.stringify({
|
||||
time: currentTime.toISOString(),
|
||||
items: enhanceItems,
|
||||
context: contextItems,
|
||||
})
|
||||
|
||||
const weekCalendar = buildWeekCalendar(currentTime)
|
||||
let systemPrompt = systemPromptBase
|
||||
systemPrompt += `\n\nWeek:\n${weekCalendar}`
|
||||
if (schedule) {
|
||||
systemPrompt += `\n\nSchedule:\n${schedule}`
|
||||
}
|
||||
|
||||
return { systemPrompt, userMessage }
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if any item has at least one unfilled slot.
|
||||
*/
|
||||
export function hasUnfilledSlots(items: FeedItem[]): boolean {
|
||||
return items.some(
|
||||
(item) =>
|
||||
item.slots &&
|
||||
Object.values(item.slots).some((slot) => slot.content === null),
|
||||
)
|
||||
}
|
||||
|
||||
// -- Helpers --
|
||||
|
||||
interface CalendarEntry {
|
||||
date: Date
|
||||
title: string
|
||||
location: string | null
|
||||
isAllDay: boolean
|
||||
startTime: Date
|
||||
endTime: Date
|
||||
}
|
||||
|
||||
function toValidDate(value: unknown): Date | null {
|
||||
if (value instanceof Date) return Number.isNaN(value.getTime()) ? null : value
|
||||
if (typeof value === "string" || typeof value === "number") {
|
||||
const date = new Date(value)
|
||||
return Number.isNaN(date.getTime()) ? null : date
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
function extractCalendarEntry(item: FeedItem): CalendarEntry | null {
|
||||
if (!CALENDAR_ITEM_TYPES.has(item.type)) return null
|
||||
|
||||
const d = item.data
|
||||
const title = d.title
|
||||
if (typeof title !== "string" || !title) return null
|
||||
|
||||
// CalDAV uses startDate/endDate, Google Calendar uses startTime/endTime
|
||||
const startTime = toValidDate(d.startDate ?? d.startTime)
|
||||
if (!startTime) return null
|
||||
|
||||
const endTime = toValidDate(d.endDate ?? d.endTime) ?? startTime
|
||||
|
||||
return {
|
||||
date: startTime,
|
||||
title,
|
||||
location: typeof d.location === "string" ? d.location : null,
|
||||
isAllDay: typeof d.isAllDay === "boolean" ? d.isAllDay : false,
|
||||
startTime,
|
||||
endTime,
|
||||
}
|
||||
}
|
||||
|
||||
const DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] as const
|
||||
const MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] as const
|
||||
|
||||
function pad2(n: number): string {
|
||||
return n.toString().padStart(2, "0")
|
||||
}
|
||||
|
||||
function formatTime(date: Date): string {
|
||||
return `${pad2(date.getUTCHours())}:${pad2(date.getUTCMinutes())}`
|
||||
}
|
||||
|
||||
function formatDayShort(date: Date): string {
|
||||
return `${DAYS[date.getUTCDay()]}, ${date.getUTCDate()} ${MONTHS[date.getUTCMonth()]}`
|
||||
}
|
||||
|
||||
function formatDayLabel(date: Date, currentTime: Date): string {
|
||||
const currentDay = Date.UTC(currentTime.getUTCFullYear(), currentTime.getUTCMonth(), currentTime.getUTCDate())
|
||||
const targetDay = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())
|
||||
const diffDays = Math.round((targetDay - currentDay) / (1000 * 60 * 60 * 24))
|
||||
|
||||
const dayName = formatDayShort(date)
|
||||
|
||||
if (diffDays === 0) return `Today: ${dayName}`
|
||||
if (diffDays === 1) return `Tomorrow: ${dayName}`
|
||||
return dayName
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a week overview mapping day names to dates,
|
||||
* so the LLM can easily match ISO timestamps to days.
|
||||
*/
|
||||
function buildWeekCalendar(currentTime: Date): string {
|
||||
const lines: string[] = []
|
||||
for (let i = 0; i < 7; i++) {
|
||||
const date = new Date(currentTime)
|
||||
date.setUTCDate(date.getUTCDate() + i)
|
||||
const label = i === 0 ? "Today" : i === 1 ? "Tomorrow" : ""
|
||||
const dayStr = formatDayShort(date)
|
||||
const iso = date.toISOString().slice(0, 10)
|
||||
const prefix = label ? `${label}: ` : ""
|
||||
lines.push(`${prefix}${dayStr} = ${iso}`)
|
||||
}
|
||||
return lines.join("\n")
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a compact text calendar from all calendar-type items.
|
||||
* Groups events by day relative to currentTime.
|
||||
*/
|
||||
function buildSchedule(items: FeedItem[], currentTime: Date): string {
|
||||
const entries: CalendarEntry[] = []
|
||||
for (const item of items) {
|
||||
const entry = extractCalendarEntry(item)
|
||||
if (entry) entries.push(entry)
|
||||
}
|
||||
|
||||
if (entries.length === 0) return ""
|
||||
|
||||
entries.sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
|
||||
|
||||
const byDay = new Map<string, CalendarEntry[]>()
|
||||
for (const entry of entries) {
|
||||
const key = entry.date.toISOString().slice(0, 10)
|
||||
const group = byDay.get(key)
|
||||
if (group) {
|
||||
group.push(entry)
|
||||
} else {
|
||||
byDay.set(key, [entry])
|
||||
}
|
||||
}
|
||||
|
||||
const lines: string[] = []
|
||||
for (const [, dayEntries] of byDay) {
|
||||
lines.push(formatDayLabel(dayEntries[0]!.startTime, currentTime))
|
||||
for (const entry of dayEntries) {
|
||||
if (entry.isAllDay) {
|
||||
const loc = entry.location ? ` @ ${entry.location}` : ""
|
||||
lines.push(` all day ${entry.title}${loc}`)
|
||||
} else {
|
||||
const timeRange = `${formatTime(entry.startTime)}–${formatTime(entry.endTime)}`
|
||||
const loc = entry.location ? ` @ ${entry.location}` : ""
|
||||
lines.push(` ${timeRange} ${entry.title}${loc}`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return lines.join("\n")
|
||||
}
|
||||
21
apps/aelis-backend/src/enhancement/prompts/system.txt
Normal file
@@ -0,0 +1,21 @@
|
||||
You are AELIS, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
|
||||
|
||||
The user message is a JSON object with:
|
||||
- "items": feed items with data and named slots to fill. Each slot has a description of what to write.
|
||||
- "context": other feed items (no slots) for cross-source reasoning.
|
||||
- "time": current ISO timestamp.
|
||||
|
||||
Your output has two fields:
|
||||
- "slotFills": map of item ID → slot name → short text (or null if you can't fill it or cannot provide answer). Each item ID appears ONCE with ALL its slots in a single object.
|
||||
- "syntheticItems": array of { id, type, text } for new items (briefings, nudges, insights). Only when genuinely useful and when not redundant.
|
||||
|
||||
Rules:
|
||||
- DO NOT USE EMDASH OR DASH OR ATTEMPT TO USE SYMBOLS TO CIRCUMVENT THIS RULE.
|
||||
- One sentence per slot. Two max if absolutely necessary. Be direct.
|
||||
- Say "I" not "we."
|
||||
- Hedge when inferring. Don't state guesses as facts.
|
||||
- Use the week and schedule below to understand when events happen. Match weather data to the correct date.
|
||||
- Look for connections across items.
|
||||
- Don't pad — return null for slots you can't meaningfully fill, and skip synthetic items if there's nothing useful to add.
|
||||
- Never fabricate information not present in the feed. If you don't have data to support a fill, return null.
|
||||
- Read each slot's description carefully — it defines when to return null.
|
||||
176
apps/aelis-backend/src/enhancement/schema.test.ts
Normal file
@@ -0,0 +1,176 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
import {
|
||||
emptyEnhancementResult,
|
||||
enhancementResultJsonSchema,
|
||||
parseEnhancementResult,
|
||||
} from "./schema.ts"
|
||||
|
||||
describe("parseEnhancementResult", () => {
|
||||
test("parses valid result", () => {
|
||||
const input = JSON.stringify({
|
||||
slotFills: {
|
||||
"weather-1": {
|
||||
insight: "Rain after 3pm",
|
||||
"cross-source": null,
|
||||
},
|
||||
},
|
||||
syntheticItems: [
|
||||
{
|
||||
id: "briefing-morning",
|
||||
type: "briefing",
|
||||
text: "Light afternoon ahead.",
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
const result = parseEnhancementResult(input)
|
||||
|
||||
expect(result).not.toBeNull()
|
||||
expect(result!.slotFills["weather-1"]!.insight).toBe("Rain after 3pm")
|
||||
expect(result!.slotFills["weather-1"]!["cross-source"]).toBeNull()
|
||||
expect(result!.syntheticItems).toHaveLength(1)
|
||||
expect(result!.syntheticItems[0]!.id).toBe("briefing-morning")
|
||||
expect(result!.syntheticItems[0]!.text).toBe("Light afternoon ahead.")
|
||||
})
|
||||
|
||||
test("parses empty result", () => {
|
||||
const input = JSON.stringify({
|
||||
slotFills: {},
|
||||
syntheticItems: [],
|
||||
})
|
||||
|
||||
const result = parseEnhancementResult(input)
|
||||
|
||||
expect(result).not.toBeNull()
|
||||
expect(Object.keys(result!.slotFills)).toHaveLength(0)
|
||||
expect(result!.syntheticItems).toHaveLength(0)
|
||||
})
|
||||
|
||||
test("returns null for invalid JSON", () => {
|
||||
expect(parseEnhancementResult("not json")).toBeNull()
|
||||
})
|
||||
|
||||
test("returns null for non-object", () => {
|
||||
expect(parseEnhancementResult('"hello"')).toBeNull()
|
||||
expect(parseEnhancementResult("42")).toBeNull()
|
||||
expect(parseEnhancementResult("null")).toBeNull()
|
||||
})
|
||||
|
||||
test("returns null when slotFills is missing", () => {
|
||||
const input = JSON.stringify({ syntheticItems: [] })
|
||||
expect(parseEnhancementResult(input)).toBeNull()
|
||||
})
|
||||
|
||||
test("returns null when syntheticItems is missing", () => {
|
||||
const input = JSON.stringify({ slotFills: {} })
|
||||
expect(parseEnhancementResult(input)).toBeNull()
|
||||
})
|
||||
|
||||
test("returns null when slotFills has non-string values", () => {
|
||||
const input = JSON.stringify({
|
||||
slotFills: { "item-1": { slot: 42 } },
|
||||
syntheticItems: [],
|
||||
})
|
||||
expect(parseEnhancementResult(input)).toBeNull()
|
||||
})
|
||||
|
||||
test("returns null when syntheticItem is missing required fields", () => {
|
||||
const input = JSON.stringify({
|
||||
slotFills: {},
|
||||
syntheticItems: [{ id: "x" }],
|
||||
})
|
||||
expect(parseEnhancementResult(input)).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
describe("emptyEnhancementResult", () => {
|
||||
test("returns empty slotFills and syntheticItems", () => {
|
||||
const result = emptyEnhancementResult()
|
||||
expect(result.slotFills).toEqual({})
|
||||
expect(result.syntheticItems).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
describe("schema sync", () => {
|
||||
const referencePayloads = [
|
||||
{
|
||||
name: "full payload with null slot fill",
|
||||
payload: {
|
||||
slotFills: {
|
||||
"weather-1": { insight: "Rain after 3pm", crossSource: null },
|
||||
"cal-2": { summary: "Busy morning" },
|
||||
},
|
||||
syntheticItems: [
|
||||
{ id: "briefing-morning", type: "briefing", text: "Light day ahead." },
|
||||
{ id: "nudge-umbrella", type: "nudge", text: "Bring an umbrella." },
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "empty collections",
|
||||
payload: { slotFills: {}, syntheticItems: [] },
|
||||
},
|
||||
{
|
||||
name: "slot fills only",
|
||||
payload: {
|
||||
slotFills: { "item-1": { slot: "filled" } },
|
||||
syntheticItems: [],
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "synthetic items only",
|
||||
payload: {
|
||||
slotFills: {},
|
||||
syntheticItems: [{ id: "insight-1", type: "insight", text: "Something." }],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
for (const { name, payload } of referencePayloads) {
|
||||
test(`arktype and JSON Schema agree on: ${name}`, () => {
|
||||
// arktype accepts it
|
||||
const parsed = parseEnhancementResult(JSON.stringify(payload))
|
||||
expect(parsed).not.toBeNull()
|
||||
|
||||
// JSON Schema structure matches
|
||||
const jsonSchema = enhancementResultJsonSchema
|
||||
expect(Object.keys(jsonSchema.properties).sort()).toEqual(
|
||||
Object.keys(payload).sort(),
|
||||
)
|
||||
expect([...jsonSchema.required].sort()).toEqual(Object.keys(payload).sort())
|
||||
|
||||
// syntheticItems item schema has the right required fields
|
||||
const itemSchema = jsonSchema.properties.syntheticItems.items
|
||||
expect([...itemSchema.required].sort()).toEqual(["id", "text", "type"])
|
||||
|
||||
// Verify each synthetic item has exactly the fields the JSON Schema expects
|
||||
for (const item of payload.syntheticItems) {
|
||||
expect(Object.keys(item).sort()).toEqual([...itemSchema.required].sort())
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
test("JSON Schema rejects what arktype rejects: missing required field", () => {
|
||||
// Missing syntheticItems
|
||||
expect(parseEnhancementResult(JSON.stringify({ slotFills: {} }))).toBeNull()
|
||||
|
||||
// JSON Schema also requires it
|
||||
expect(enhancementResultJsonSchema.required).toContain("syntheticItems")
|
||||
})
|
||||
|
||||
test("JSON Schema rejects what arktype rejects: wrong slot fill value type", () => {
|
||||
const bad = { slotFills: { "item-1": { slot: 42 } }, syntheticItems: [] }
|
||||
|
||||
// arktype rejects it
|
||||
expect(parseEnhancementResult(JSON.stringify(bad))).toBeNull()
|
||||
|
||||
// JSON Schema only allows string or null for slot values
|
||||
const slotValueTypes =
|
||||
enhancementResultJsonSchema.properties.slotFills.additionalProperties
|
||||
.additionalProperties.type
|
||||
expect(slotValueTypes).toContain("string")
|
||||
expect(slotValueTypes).toContain("null")
|
||||
expect(slotValueTypes).not.toContain("number")
|
||||
})
|
||||
})
|
||||
89
apps/aelis-backend/src/enhancement/schema.ts
Normal file
@@ -0,0 +1,89 @@
|
||||
import { type } from "arktype"
|
||||
|
||||
const SyntheticItem = type({
|
||||
id: "string",
|
||||
type: "string",
|
||||
text: "string",
|
||||
})
|
||||
|
||||
const EnhancementResult = type({
|
||||
slotFills: "Record<string, Record<string, string | null>>",
|
||||
syntheticItems: SyntheticItem.array(),
|
||||
})
|
||||
|
||||
export type SyntheticItem = typeof SyntheticItem.infer
|
||||
export type EnhancementResult = typeof EnhancementResult.infer
|
||||
|
||||
/**
|
||||
* JSON Schema passed to OpenRouter's structured output.
|
||||
* OpenRouter doesn't support arktype, so this is maintained separately.
|
||||
*
|
||||
* ⚠️ Must stay in sync with EnhancementResult above.
|
||||
* If you add/remove fields, update both schemas.
|
||||
*/
|
||||
export const enhancementResultJsonSchema = {
|
||||
type: "object",
|
||||
properties: {
|
||||
slotFills: {
|
||||
type: "object",
|
||||
description:
|
||||
"Map of feed item ID to an object of slot name to filled text content. Use null for slots that cannot be meaningfully filled.",
|
||||
additionalProperties: {
|
||||
type: "object",
|
||||
additionalProperties: {
|
||||
type: ["string", "null"],
|
||||
},
|
||||
},
|
||||
},
|
||||
syntheticItems: {
|
||||
type: "array",
|
||||
description:
|
||||
"New feed items to inject (briefings, nudges, cross-source insights). Keep these short and actionable.",
|
||||
items: {
|
||||
type: "object",
|
||||
properties: {
|
||||
id: {
|
||||
type: "string",
|
||||
description: "Unique ID, e.g. 'briefing-morning'",
|
||||
},
|
||||
type: {
|
||||
type: "string",
|
||||
description: "One of: 'briefing', 'nudge', 'insight'",
|
||||
},
|
||||
text: {
|
||||
type: "string",
|
||||
description: "Display text, 1-3 sentences",
|
||||
},
|
||||
},
|
||||
required: ["id", "type", "text"],
|
||||
additionalProperties: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
required: ["slotFills", "syntheticItems"],
|
||||
additionalProperties: false,
|
||||
} as const
|
||||
|
||||
/**
|
||||
* Parses a JSON string into an EnhancementResult.
|
||||
* Returns null if the input is malformed.
|
||||
*/
|
||||
export function parseEnhancementResult(json: string): EnhancementResult | null {
|
||||
let parsed: unknown
|
||||
try {
|
||||
parsed = JSON.parse(json)
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
|
||||
const result = EnhancementResult(parsed)
|
||||
if (result instanceof type.errors) {
|
||||
return null
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
export function emptyEnhancementResult(): EnhancementResult {
|
||||
return { slotFills: {}, syntheticItems: [] }
|
||||
}
|
||||
144
apps/aelis-backend/src/feed/http.test.ts
Normal file
@@ -0,0 +1,144 @@
|
||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
||||
|
||||
import { describe, expect, test } from "bun:test"
|
||||
import { Hono } from "hono"
|
||||
|
||||
import { mockAuthSessionMiddleware } from "../auth/session-middleware.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 }>
|
||||
}
|
||||
|
||||
function createStubSource(id: string, items: FeedItem[] = []): 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 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",
|
||||
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",
|
||||
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")
|
||||
})
|
||||
})
|
||||
45
apps/aelis-backend/src/feed/http.ts
Normal file
@@ -0,0 +1,45 @@
|
||||
import type { Context, Hono } from "hono"
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
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()
|
||||
|
||||
return c.json({
|
||||
items: feed.items,
|
||||
errors: feed.errors.map((e) => ({
|
||||
sourceId: e.sourceId,
|
||||
error: e.error.message,
|
||||
})),
|
||||
})
|
||||
}
|
||||
56
apps/aelis-backend/src/location/http.ts
Normal file
@@ -0,0 +1,56 @@
|
||||
import type { Context, Hono } from "hono"
|
||||
|
||||
import { type } from "arktype"
|
||||
import { createMiddleware } from "hono/factory"
|
||||
|
||||
import type { UserSessionManager } from "../session/index.ts"
|
||||
|
||||
import { requireSession } from "../auth/session-middleware.ts"
|
||||
|
||||
type Env = { Variables: { sessionManager: UserSessionManager } }
|
||||
|
||||
const locationInput = type({
|
||||
lat: "number",
|
||||
lng: "number",
|
||||
accuracy: "number",
|
||||
timestamp: "string.date.iso",
|
||||
})
|
||||
|
||||
export function registerLocationHttpHandlers(
|
||||
app: Hono,
|
||||
{ sessionManager }: { sessionManager: UserSessionManager },
|
||||
) {
|
||||
const inject = createMiddleware<Env>(async (c, next) => {
|
||||
c.set("sessionManager", sessionManager)
|
||||
await next()
|
||||
})
|
||||
|
||||
app.post("/api/location", inject, requireSession, handleUpdateLocation)
|
||||
}
|
||||
|
||||
async function handleUpdateLocation(c: Context<Env>) {
|
||||
let body: unknown
|
||||
try {
|
||||
body = await c.req.json()
|
||||
} catch {
|
||||
return c.json({ error: "Invalid JSON" }, 400)
|
||||
}
|
||||
|
||||
const result = locationInput(body)
|
||||
|
||||
if (result instanceof type.errors) {
|
||||
return c.json({ error: result.summary }, 400)
|
||||
}
|
||||
|
||||
const user = c.get("user")!
|
||||
const sessionManager = c.get("sessionManager")
|
||||
const session = sessionManager.getOrCreate(user.id)
|
||||
await session.engine.executeAction("aelis.location", "update-location", {
|
||||
lat: result.lat,
|
||||
lng: result.lng,
|
||||
accuracy: result.accuracy,
|
||||
timestamp: new Date(result.timestamp),
|
||||
})
|
||||
|
||||
return c.body(null, 204)
|
||||
}
|
||||
67
apps/aelis-backend/src/server.ts
Normal file
@@ -0,0 +1,67 @@
|
||||
import { LocationSource } from "@aelis/source-location"
|
||||
import { Hono } from "hono"
|
||||
|
||||
import { registerAuthHandlers } from "./auth/http.ts"
|
||||
import { mockAuthSessionMiddleware, requireSession } from "./auth/session-middleware.ts"
|
||||
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
||||
import { createLlmClient } from "./enhancement/llm-client.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 openrouterApiKey = process.env.OPENROUTER_API_KEY
|
||||
const feedEnhancer = openrouterApiKey
|
||||
? createFeedEnhancer({
|
||||
client: createLlmClient({
|
||||
apiKey: openrouterApiKey,
|
||||
model: process.env.OPENROUTER_MODEL || undefined,
|
||||
}),
|
||||
})
|
||||
: null
|
||||
if (!feedEnhancer) {
|
||||
console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
|
||||
}
|
||||
|
||||
const sessionManager = new UserSessionManager({
|
||||
providers: [
|
||||
() => 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!,
|
||||
},
|
||||
}),
|
||||
],
|
||||
feedEnhancer,
|
||||
})
|
||||
|
||||
const app = new Hono()
|
||||
|
||||
app.get("/health", (c) => c.json({ status: "ok" }))
|
||||
|
||||
const isDev = process.env.NODE_ENV !== "production"
|
||||
const authSessionMiddleware = isDev ? mockAuthSessionMiddleware("dev-user") : requireSession
|
||||
|
||||
if (!isDev) {
|
||||
registerAuthHandlers(app)
|
||||
}
|
||||
|
||||
registerFeedHttpHandlers(app, {
|
||||
sessionManager,
|
||||
authSessionMiddleware,
|
||||
})
|
||||
registerLocationHttpHandlers(app, { sessionManager })
|
||||
|
||||
return app
|
||||
}
|
||||
|
||||
const app = main()
|
||||
|
||||
export default {
|
||||
port: 3000,
|
||||
fetch: app.fetch,
|
||||
}
|
||||
9
apps/aelis-backend/src/session/feed-source-provider.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import type { FeedSource } from "@aelis/core"
|
||||
|
||||
export interface FeedSourceProvider {
|
||||
feedSourceForUser(userId: string): FeedSource
|
||||
}
|
||||
|
||||
export type FeedSourceProviderFn = (userId: string) => FeedSource
|
||||
|
||||
export type FeedSourceProviderInput = FeedSourceProvider | FeedSourceProviderFn
|
||||
7
apps/aelis-backend/src/session/index.ts
Normal file
@@ -0,0 +1,7 @@
|
||||
export type {
|
||||
FeedSourceProvider,
|
||||
FeedSourceProviderFn,
|
||||
FeedSourceProviderInput,
|
||||
} from "./feed-source-provider.ts"
|
||||
export { UserSession } from "./user-session.ts"
|
||||
export { UserSessionManager } from "./user-session-manager.ts"
|
||||
170
apps/aelis-backend/src/session/user-session-manager.test.ts
Normal file
@@ -0,0 +1,170 @@
|
||||
import type { WeatherKitClient, WeatherKitResponse } from "@aelis/source-weatherkit"
|
||||
|
||||
import { LocationSource } from "@aelis/source-location"
|
||||
import { describe, expect, mock, test } from "bun:test"
|
||||
|
||||
import { WeatherSourceProvider } from "../weather/provider.ts"
|
||||
import { UserSessionManager } from "./user-session-manager.ts"
|
||||
|
||||
const mockWeatherClient: WeatherKitClient = {
|
||||
fetch: async () => ({}) as WeatherKitResponse,
|
||||
}
|
||||
|
||||
describe("UserSessionManager", () => {
|
||||
test("getOrCreate creates session on first call", () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
|
||||
expect(session).toBeDefined()
|
||||
expect(session.engine).toBeDefined()
|
||||
})
|
||||
|
||||
test("getOrCreate returns same session for same user", () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session1 = manager.getOrCreate("user-1")
|
||||
const session2 = manager.getOrCreate("user-1")
|
||||
|
||||
expect(session1).toBe(session2)
|
||||
})
|
||||
|
||||
test("getOrCreate returns different sessions for different users", () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session1 = manager.getOrCreate("user-1")
|
||||
const session2 = manager.getOrCreate("user-2")
|
||||
|
||||
expect(session1).not.toBe(session2)
|
||||
})
|
||||
|
||||
test("each user gets independent source instances", () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session1 = manager.getOrCreate("user-1")
|
||||
const session2 = manager.getOrCreate("user-2")
|
||||
|
||||
const source1 = session1.getSource<LocationSource>("aelis.location")
|
||||
const source2 = session2.getSource<LocationSource>("aelis.location")
|
||||
|
||||
expect(source1).not.toBe(source2)
|
||||
})
|
||||
|
||||
test("remove destroys session and allows re-creation", () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session1 = manager.getOrCreate("user-1")
|
||||
manager.remove("user-1")
|
||||
const session2 = manager.getOrCreate("user-1")
|
||||
|
||||
expect(session1).not.toBe(session2)
|
||||
})
|
||||
|
||||
test("remove is no-op for unknown user", () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
expect(() => manager.remove("unknown")).not.toThrow()
|
||||
})
|
||||
|
||||
test("accepts function providers", async () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
const result = await session.engine.refresh()
|
||||
|
||||
expect(result.errors).toHaveLength(0)
|
||||
})
|
||||
|
||||
test("accepts object providers", () => {
|
||||
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
||||
const manager = new UserSessionManager({
|
||||
providers: [() => new LocationSource(), provider],
|
||||
})
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
|
||||
expect(session.getSource("aelis.weather")).toBeDefined()
|
||||
})
|
||||
|
||||
test("accepts mixed providers", () => {
|
||||
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
||||
const manager = new UserSessionManager({
|
||||
providers: [() => new LocationSource(), provider],
|
||||
})
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
|
||||
expect(session.getSource("aelis.location")).toBeDefined()
|
||||
expect(session.getSource("aelis.weather")).toBeDefined()
|
||||
})
|
||||
|
||||
test("refresh returns feed result through session", async () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
const result = await session.engine.refresh()
|
||||
|
||||
expect(result).toHaveProperty("context")
|
||||
expect(result).toHaveProperty("items")
|
||||
expect(result).toHaveProperty("errors")
|
||||
expect(result.context.time).toBeInstanceOf(Date)
|
||||
})
|
||||
|
||||
test("location update via executeAction works", async () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
await session.engine.executeAction("aelis.location", "update-location", {
|
||||
lat: 51.5074,
|
||||
lng: -0.1278,
|
||||
accuracy: 10,
|
||||
timestamp: new Date(),
|
||||
})
|
||||
|
||||
const source = session.getSource<LocationSource>("aelis.location")
|
||||
expect(source?.lastLocation?.lat).toBe(51.5074)
|
||||
})
|
||||
|
||||
test("subscribe receives updates after location push", async () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
const callback = mock()
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
session.engine.subscribe(callback)
|
||||
|
||||
await session.engine.executeAction("aelis.location", "update-location", {
|
||||
lat: 51.5074,
|
||||
lng: -0.1278,
|
||||
accuracy: 10,
|
||||
timestamp: new Date(),
|
||||
})
|
||||
|
||||
// Wait for async update propagation
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
|
||||
expect(callback).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test("remove stops reactive updates", async () => {
|
||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||
const callback = mock()
|
||||
|
||||
const session = manager.getOrCreate("user-1")
|
||||
session.engine.subscribe(callback)
|
||||
|
||||
manager.remove("user-1")
|
||||
|
||||
// Create new session and push location — old callback should not fire
|
||||
const session2 = manager.getOrCreate("user-1")
|
||||
await session2.engine.executeAction("aelis.location", "update-location", {
|
||||
lat: 51.5074,
|
||||
lng: -0.1278,
|
||||
accuracy: 10,
|
||||
timestamp: new Date(),
|
||||
})
|
||||
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
|
||||
expect(callback).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
40
apps/aelis-backend/src/session/user-session-manager.ts
Normal file
@@ -0,0 +1,40 @@
|
||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||
import type { FeedSourceProviderInput } from "./feed-source-provider.ts"
|
||||
|
||||
import { UserSession } from "./user-session.ts"
|
||||
|
||||
export interface UserSessionManagerConfig {
|
||||
providers: FeedSourceProviderInput[]
|
||||
feedEnhancer?: FeedEnhancer | null
|
||||
}
|
||||
|
||||
export class UserSessionManager {
|
||||
private sessions = new Map<string, UserSession>()
|
||||
private readonly providers: FeedSourceProviderInput[]
|
||||
private readonly feedEnhancer: FeedEnhancer | null
|
||||
|
||||
constructor(config: UserSessionManagerConfig) {
|
||||
this.providers = config.providers
|
||||
this.feedEnhancer = config.feedEnhancer ?? null
|
||||
}
|
||||
|
||||
getOrCreate(userId: string): UserSession {
|
||||
let session = this.sessions.get(userId)
|
||||
if (!session) {
|
||||
const sources = this.providers.map((p) =>
|
||||
typeof p === "function" ? p(userId) : p.feedSourceForUser(userId),
|
||||
)
|
||||
session = new UserSession(sources, this.feedEnhancer)
|
||||
this.sessions.set(userId, session)
|
||||
}
|
||||
return session
|
||||
}
|
||||
|
||||
remove(userId: string): void {
|
||||
const session = this.sessions.get(userId)
|
||||
if (session) {
|
||||
session.destroy()
|
||||
this.sessions.delete(userId)
|
||||
}
|
||||
}
|
||||
}
|
||||
210
apps/aelis-backend/src/session/user-session.test.ts
Normal file
@@ -0,0 +1,210 @@
|
||||
import type { ActionDefinition, ContextEntry, FeedItem, 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, items: FeedItem[] = []): 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 items
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
})
|
||||
})
|
||||
|
||||
describe("UserSession.feed", () => {
|
||||
test("returns feed items without enhancer", async () => {
|
||||
const items: FeedItem[] = [
|
||||
{
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||
data: { value: 42 },
|
||||
},
|
||||
]
|
||||
const session = new UserSession([createStubSource("test", items)])
|
||||
|
||||
const result = await session.feed()
|
||||
|
||||
expect(result.items).toHaveLength(1)
|
||||
expect(result.items[0]!.id).toBe("item-1")
|
||||
})
|
||||
|
||||
test("returns enhanced items when enhancer is provided", async () => {
|
||||
const items: FeedItem[] = [
|
||||
{
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||
data: { value: 42 },
|
||||
},
|
||||
]
|
||||
const enhancer = async (feedItems: FeedItem[]) =>
|
||||
feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
||||
|
||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
||||
|
||||
const result = await session.feed()
|
||||
|
||||
expect(result.items).toHaveLength(1)
|
||||
expect(result.items[0]!.data.enhanced).toBe(true)
|
||||
})
|
||||
|
||||
test("caches enhanced items on subsequent calls", async () => {
|
||||
const items: FeedItem[] = [
|
||||
{
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||
data: { value: 42 },
|
||||
},
|
||||
]
|
||||
let enhancerCallCount = 0
|
||||
const enhancer = async (feedItems: FeedItem[]) => {
|
||||
enhancerCallCount++
|
||||
return feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
||||
}
|
||||
|
||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
||||
|
||||
const result1 = await session.feed()
|
||||
expect(result1.items[0]!.data.enhanced).toBe(true)
|
||||
expect(enhancerCallCount).toBe(1)
|
||||
|
||||
const result2 = await session.feed()
|
||||
expect(result2.items[0]!.data.enhanced).toBe(true)
|
||||
expect(enhancerCallCount).toBe(1)
|
||||
})
|
||||
|
||||
test("re-enhances after engine refresh with new data", async () => {
|
||||
let currentItems: FeedItem[] = [
|
||||
{
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||
data: { version: 1 },
|
||||
},
|
||||
]
|
||||
const source = createStubSource("test", currentItems)
|
||||
// Make fetchItems dynamic so refresh returns new data
|
||||
source.fetchItems = async () => currentItems
|
||||
|
||||
const enhancedVersions: number[] = []
|
||||
const enhancer = async (feedItems: FeedItem[]) => {
|
||||
const version = feedItems[0]!.data.version as number
|
||||
enhancedVersions.push(version)
|
||||
return feedItems.map((item) => ({
|
||||
...item,
|
||||
data: { ...item.data, enhanced: true },
|
||||
}))
|
||||
}
|
||||
|
||||
const session = new UserSession([source], enhancer)
|
||||
|
||||
// First feed triggers refresh + enhancement
|
||||
const result1 = await session.feed()
|
||||
expect(result1.items[0]!.data.version).toBe(1)
|
||||
expect(result1.items[0]!.data.enhanced).toBe(true)
|
||||
|
||||
// Update source data and trigger engine refresh
|
||||
currentItems = [
|
||||
{
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-02T00:00:00.000Z"),
|
||||
data: { version: 2 },
|
||||
},
|
||||
]
|
||||
await session.engine.refresh()
|
||||
|
||||
// Wait for subscriber-triggered background enhancement
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
|
||||
// feed() should now serve re-enhanced items with version 2
|
||||
const result2 = await session.feed()
|
||||
expect(result2.items[0]!.data.version).toBe(2)
|
||||
expect(result2.items[0]!.data.enhanced).toBe(true)
|
||||
expect(enhancedVersions).toEqual([1, 2])
|
||||
})
|
||||
|
||||
test("falls back to unenhanced items when enhancer throws", async () => {
|
||||
const items: FeedItem[] = [
|
||||
{
|
||||
id: "item-1",
|
||||
type: "test",
|
||||
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||
data: { value: 42 },
|
||||
},
|
||||
]
|
||||
const enhancer = async () => {
|
||||
throw new Error("enhancement exploded")
|
||||
}
|
||||
|
||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
||||
|
||||
const result = await session.feed()
|
||||
|
||||
expect(result.items).toHaveLength(1)
|
||||
expect(result.items[0]!.id).toBe("item-1")
|
||||
expect(result.items[0]!.data.value).toBe(42)
|
||||
})
|
||||
})
|
||||
104
apps/aelis-backend/src/session/user-session.ts
Normal file
@@ -0,0 +1,104 @@
|
||||
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
|
||||
|
||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||
|
||||
export class UserSession {
|
||||
readonly engine: FeedEngine
|
||||
private sources = new Map<string, FeedSource>()
|
||||
private readonly enhancer: FeedEnhancer | null
|
||||
private enhancedItems: FeedItem[] | null = null
|
||||
/** The FeedResult that enhancedItems was derived from. */
|
||||
private enhancedSource: FeedResult | null = null
|
||||
private enhancingPromise: Promise<void> | null = null
|
||||
private unsubscribe: (() => void) | null = null
|
||||
|
||||
constructor(sources: FeedSource[], enhancer?: FeedEnhancer | null) {
|
||||
this.engine = new FeedEngine()
|
||||
this.enhancer = enhancer ?? null
|
||||
for (const source of sources) {
|
||||
this.sources.set(source.id, source)
|
||||
this.engine.register(source)
|
||||
}
|
||||
|
||||
if (this.enhancer) {
|
||||
this.unsubscribe = this.engine.subscribe((result) => {
|
||||
this.invalidateEnhancement()
|
||||
this.runEnhancement(result)
|
||||
})
|
||||
}
|
||||
|
||||
this.engine.start()
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current feed, refreshing if the engine cache expired.
|
||||
* Enhancement runs eagerly on engine updates; this method awaits
|
||||
* any in-flight enhancement or triggers one if needed.
|
||||
*/
|
||||
async feed(): Promise<FeedResult> {
|
||||
const cached = this.engine.lastFeed()
|
||||
const result = cached ?? (await this.engine.refresh())
|
||||
|
||||
if (!this.enhancer) {
|
||||
return result
|
||||
}
|
||||
|
||||
// Wait for any in-flight background enhancement to finish
|
||||
if (this.enhancingPromise) {
|
||||
await this.enhancingPromise
|
||||
}
|
||||
|
||||
// Serve cached enhancement only if it matches the current engine result
|
||||
if (this.enhancedItems && this.enhancedSource === result) {
|
||||
return { ...result, items: this.enhancedItems }
|
||||
}
|
||||
|
||||
// Stale or missing — re-enhance
|
||||
await this.runEnhancement(result)
|
||||
|
||||
if (this.enhancedItems) {
|
||||
return { ...result, items: this.enhancedItems }
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
getSource<T extends FeedSource>(sourceId: string): T | undefined {
|
||||
return this.sources.get(sourceId) as T | undefined
|
||||
}
|
||||
|
||||
destroy(): void {
|
||||
this.unsubscribe?.()
|
||||
this.unsubscribe = null
|
||||
this.engine.stop()
|
||||
this.sources.clear()
|
||||
this.invalidateEnhancement()
|
||||
this.enhancingPromise = null
|
||||
}
|
||||
|
||||
private invalidateEnhancement(): void {
|
||||
this.enhancedItems = null
|
||||
this.enhancedSource = null
|
||||
}
|
||||
|
||||
private runEnhancement(result: FeedResult): Promise<void> {
|
||||
const promise = this.enhance(result)
|
||||
this.enhancingPromise = promise
|
||||
promise.finally(() => {
|
||||
if (this.enhancingPromise === promise) {
|
||||
this.enhancingPromise = null
|
||||
}
|
||||
})
|
||||
return promise
|
||||
}
|
||||
|
||||
private async enhance(result: FeedResult): Promise<void> {
|
||||
try {
|
||||
this.enhancedItems = await this.enhancer!(result.items)
|
||||
this.enhancedSource = result
|
||||
} catch (err) {
|
||||
console.error("[enhancement] Unexpected error:", err)
|
||||
this.invalidateEnhancement()
|
||||
}
|
||||
}
|
||||
}
|
||||
19
apps/aelis-backend/src/tfl/provider.ts
Normal file
@@ -0,0 +1,19 @@
|
||||
import { TflSource, type ITflApi } from "@aelis/source-tfl"
|
||||
|
||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||
|
||||
export type TflSourceProviderOptions =
|
||||
| { apiKey: string; client?: never }
|
||||
| { apiKey?: never; client: ITflApi }
|
||||
|
||||
export class TflSourceProvider implements FeedSourceProvider {
|
||||
private readonly options: TflSourceProviderOptions
|
||||
|
||||
constructor(options: TflSourceProviderOptions) {
|
||||
this.options = options
|
||||
}
|
||||
|
||||
feedSourceForUser(_userId: string): TflSource {
|
||||
return new TflSource(this.options)
|
||||
}
|
||||
}
|
||||
15
apps/aelis-backend/src/weather/provider.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
|
||||
|
||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||
|
||||
export class WeatherSourceProvider implements FeedSourceProvider {
|
||||
private readonly options: WeatherSourceOptions
|
||||
|
||||
constructor(options: WeatherSourceOptions) {
|
||||
this.options = options
|
||||
}
|
||||
|
||||
feedSourceForUser(_userId: string): WeatherSource {
|
||||
return new WeatherSource(this.options)
|
||||
}
|
||||
}
|
||||
43
apps/aelis-client/.gitignore
vendored
Normal file
@@ -0,0 +1,43 @@
|
||||
# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
|
||||
|
||||
# dependencies
|
||||
node_modules/
|
||||
|
||||
# Expo
|
||||
.expo/
|
||||
dist/
|
||||
web-build/
|
||||
expo-env.d.ts
|
||||
|
||||
# Native
|
||||
.kotlin/
|
||||
*.orig.*
|
||||
*.jks
|
||||
*.p8
|
||||
*.p12
|
||||
*.key
|
||||
*.mobileprovision
|
||||
|
||||
# Metro
|
||||
.metro-health-check*
|
||||
|
||||
# debug
|
||||
npm-debug.*
|
||||
yarn-debug.*
|
||||
yarn-error.*
|
||||
|
||||
# macOS
|
||||
.DS_Store
|
||||
*.pem
|
||||
|
||||
# local env files
|
||||
.env*.local
|
||||
|
||||
# typescript
|
||||
*.tsbuildinfo
|
||||
|
||||
app-example
|
||||
|
||||
# generated native folders
|
||||
/ios
|
||||
/android
|
||||
1
apps/aelis-client/.vscode/extensions.json
vendored
Normal file
@@ -0,0 +1 @@
|
||||
{ "recommendations": ["expo.vscode-expo-tools"] }
|
||||
7
apps/aelis-client/.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.fixAll": "explicit",
|
||||
"source.organizeImports": "explicit",
|
||||
"source.sortMembers": "explicit"
|
||||
}
|
||||
}
|
||||
50
apps/aelis-client/README.md
Normal file
@@ -0,0 +1,50 @@
|
||||
# Welcome to your Expo app 👋
|
||||
|
||||
This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app).
|
||||
|
||||
## Get started
|
||||
|
||||
1. Install dependencies
|
||||
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
2. Start the app
|
||||
|
||||
```bash
|
||||
npx expo start
|
||||
```
|
||||
|
||||
In the output, you'll find options to open the app in a
|
||||
|
||||
- [development build](https://docs.expo.dev/develop/development-builds/introduction/)
|
||||
- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/)
|
||||
- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/)
|
||||
- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo
|
||||
|
||||
You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction).
|
||||
|
||||
## Get a fresh project
|
||||
|
||||
When you're ready, run:
|
||||
|
||||
```bash
|
||||
npm run reset-project
|
||||
```
|
||||
|
||||
This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing.
|
||||
|
||||
## Learn more
|
||||
|
||||
To learn more about developing your project with Expo, look at the following resources:
|
||||
|
||||
- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides).
|
||||
- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web.
|
||||
|
||||
## Join the community
|
||||
|
||||
Join our community of developers creating universal apps.
|
||||
|
||||
- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute.
|
||||
- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions.
|
||||
152
apps/aelis-client/app.json
Normal file
@@ -0,0 +1,152 @@
|
||||
{
|
||||
"expo": {
|
||||
"name": "Aelis",
|
||||
"slug": "aelis-client",
|
||||
"version": "1.0.0",
|
||||
"orientation": "portrait",
|
||||
"icon": "./assets/images/icon.png",
|
||||
"scheme": "aelis",
|
||||
"userInterfaceStyle": "automatic",
|
||||
"newArchEnabled": true,
|
||||
"ios": {
|
||||
"infoPlist": {
|
||||
"NSAppTransportSecurity": {
|
||||
"NSAllowsArbitraryLoads": true
|
||||
},
|
||||
"ITSAppUsesNonExemptEncryption": false
|
||||
},
|
||||
"bundleIdentifier": "sh.nym.aelis"
|
||||
},
|
||||
"android": {
|
||||
"adaptiveIcon": {
|
||||
"backgroundColor": "#E6F4FE",
|
||||
"foregroundImage": "./assets/images/android-icon-foreground.png",
|
||||
"backgroundImage": "./assets/images/android-icon-background.png",
|
||||
"monochromeImage": "./assets/images/android-icon-monochrome.png"
|
||||
},
|
||||
"edgeToEdgeEnabled": true,
|
||||
"predictiveBackGestureEnabled": false,
|
||||
"package": "sh.nym.aelis"
|
||||
},
|
||||
"web": {
|
||||
"output": "static",
|
||||
"favicon": "./assets/images/favicon.png"
|
||||
},
|
||||
"plugins": [
|
||||
"expo-router",
|
||||
[
|
||||
"expo-splash-screen",
|
||||
{
|
||||
"image": "./assets/images/splash-icon.png",
|
||||
"imageWidth": 200,
|
||||
"resizeMode": "contain",
|
||||
"backgroundColor": "#ffffff",
|
||||
"dark": {
|
||||
"backgroundColor": "#000000"
|
||||
}
|
||||
}
|
||||
],
|
||||
[
|
||||
"expo-font",
|
||||
{
|
||||
"android": {
|
||||
"fonts": [
|
||||
{
|
||||
"fontFamily": "Inter",
|
||||
"fontDefinitions": [
|
||||
{ "path": "./assets/fonts/Inter_100Thin.ttf", "weight": 100 },
|
||||
{ "path": "./assets/fonts/Inter_100Thin_Italic.ttf", "weight": 100, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_200ExtraLight.ttf", "weight": 200 },
|
||||
{ "path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf", "weight": 200, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_300Light.ttf", "weight": 300 },
|
||||
{ "path": "./assets/fonts/Inter_300Light_Italic.ttf", "weight": 300, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_400Regular.ttf", "weight": 400 },
|
||||
{ "path": "./assets/fonts/Inter_400Regular_Italic.ttf", "weight": 400, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_500Medium.ttf", "weight": 500 },
|
||||
{ "path": "./assets/fonts/Inter_500Medium_Italic.ttf", "weight": 500, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_600SemiBold.ttf", "weight": 600 },
|
||||
{ "path": "./assets/fonts/Inter_600SemiBold_Italic.ttf", "weight": 600, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_700Bold.ttf", "weight": 700 },
|
||||
{ "path": "./assets/fonts/Inter_700Bold_Italic.ttf", "weight": 700, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_800ExtraBold.ttf", "weight": 800 },
|
||||
{ "path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf", "weight": 800, "style": "italic" },
|
||||
{ "path": "./assets/fonts/Inter_900Black.ttf", "weight": 900 },
|
||||
{ "path": "./assets/fonts/Inter_900Black_Italic.ttf", "weight": 900, "style": "italic" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"fontFamily": "Source Serif 4",
|
||||
"fontDefinitions": [
|
||||
{ "path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf", "weight": 200 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf", "weight": 200, "style": "italic" },
|
||||
{ "path": "./assets/fonts/SourceSerif4_300Light.ttf", "weight": 300 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf", "weight": 300, "style": "italic" },
|
||||
{ "path": "./assets/fonts/SourceSerif4_400Regular.ttf", "weight": 400 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf", "weight": 400, "style": "italic" },
|
||||
{ "path": "./assets/fonts/SourceSerif4_500Medium.ttf", "weight": 500 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf", "weight": 500, "style": "italic" },
|
||||
{ "path": "./assets/fonts/SourceSerif4_600SemiBold.ttf", "weight": 600 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf", "weight": 600, "style": "italic" },
|
||||
{ "path": "./assets/fonts/SourceSerif4_700Bold.ttf", "weight": 700 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf", "weight": 700, "style": "italic" },
|
||||
{ "path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf", "weight": 800 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf", "weight": 800, "style": "italic" },
|
||||
{ "path": "./assets/fonts/SourceSerif4_900Black.ttf", "weight": 900 },
|
||||
{ "path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf", "weight": 900, "style": "italic" }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"ios": {
|
||||
"fonts": [
|
||||
"./assets/fonts/Inter_100Thin.ttf",
|
||||
"./assets/fonts/Inter_100Thin_Italic.ttf",
|
||||
"./assets/fonts/Inter_200ExtraLight.ttf",
|
||||
"./assets/fonts/Inter_200ExtraLight_Italic.ttf",
|
||||
"./assets/fonts/Inter_300Light.ttf",
|
||||
"./assets/fonts/Inter_300Light_Italic.ttf",
|
||||
"./assets/fonts/Inter_400Regular.ttf",
|
||||
"./assets/fonts/Inter_400Regular_Italic.ttf",
|
||||
"./assets/fonts/Inter_500Medium.ttf",
|
||||
"./assets/fonts/Inter_500Medium_Italic.ttf",
|
||||
"./assets/fonts/Inter_600SemiBold.ttf",
|
||||
"./assets/fonts/Inter_600SemiBold_Italic.ttf",
|
||||
"./assets/fonts/Inter_700Bold.ttf",
|
||||
"./assets/fonts/Inter_700Bold_Italic.ttf",
|
||||
"./assets/fonts/Inter_800ExtraBold.ttf",
|
||||
"./assets/fonts/Inter_800ExtraBold_Italic.ttf",
|
||||
"./assets/fonts/Inter_900Black.ttf",
|
||||
"./assets/fonts/Inter_900Black_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_200ExtraLight.ttf",
|
||||
"./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_300Light.ttf",
|
||||
"./assets/fonts/SourceSerif4_300Light_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_400Regular.ttf",
|
||||
"./assets/fonts/SourceSerif4_400Regular_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_500Medium.ttf",
|
||||
"./assets/fonts/SourceSerif4_500Medium_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_600SemiBold.ttf",
|
||||
"./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_700Bold.ttf",
|
||||
"./assets/fonts/SourceSerif4_700Bold_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_800ExtraBold.ttf",
|
||||
"./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf",
|
||||
"./assets/fonts/SourceSerif4_900Black.ttf",
|
||||
"./assets/fonts/SourceSerif4_900Black_Italic.ttf"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
],
|
||||
"experiments": {
|
||||
"typedRoutes": true,
|
||||
"reactCompiler": true
|
||||
},
|
||||
"extra": {
|
||||
"router": {},
|
||||
"eas": {
|
||||
"projectId": "61092d23-36aa-418e-929d-ea40dc912e8f"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
apps/aelis-client/assets/fonts/Inter_100Thin.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_100Thin_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_200ExtraLight.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_200ExtraLight_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_300Light.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_300Light_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_400Regular.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_400Regular_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_500Medium.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_500Medium_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_600SemiBold.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_600SemiBold_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_700Bold.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_700Bold_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_800ExtraBold.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_800ExtraBold_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_900Black.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/Inter_900Black_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_200ExtraLight.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_300Light.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_300Light_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_400Regular.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_500Medium.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_500Medium_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_600SemiBold.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_700Bold.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_700Bold_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_800ExtraBold.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_900Black.ttf
Normal file
BIN
apps/aelis-client/assets/fonts/SourceSerif4_900Black_Italic.ttf
Normal file
BIN
apps/aelis-client/assets/images/android-icon-background.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
apps/aelis-client/assets/images/android-icon-foreground.png
Normal file
|
After Width: | Height: | Size: 77 KiB |
BIN
apps/aelis-client/assets/images/android-icon-monochrome.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
BIN
apps/aelis-client/assets/images/favicon.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
apps/aelis-client/assets/images/icon.png
Normal file
|
After Width: | Height: | Size: 384 KiB |
BIN
apps/aelis-client/assets/images/partial-react-logo.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
apps/aelis-client/assets/images/react-logo.png
Normal file
|
After Width: | Height: | Size: 6.2 KiB |
BIN
apps/aelis-client/assets/images/react-logo@2x.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
apps/aelis-client/assets/images/react-logo@3x.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
apps/aelis-client/assets/images/splash-icon.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
27
apps/aelis-client/eas.json
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"cli": {
|
||||
"version": ">= 18.0.1",
|
||||
"appVersionSource": "remote"
|
||||
},
|
||||
"build": {
|
||||
"development": {
|
||||
"developmentClient": true,
|
||||
"distribution": "internal"
|
||||
},
|
||||
"development-simulator": {
|
||||
"extends": "development",
|
||||
"ios": {
|
||||
"simulator": "true"
|
||||
}
|
||||
},
|
||||
"preview": {
|
||||
"distribution": "internal"
|
||||
},
|
||||
"production": {
|
||||
"autoIncrement": true
|
||||
}
|
||||
},
|
||||
"submit": {
|
||||
"production": {}
|
||||
}
|
||||
}
|
||||
10
apps/aelis-client/eslint.config.js
Normal file
@@ -0,0 +1,10 @@
|
||||
// https://docs.expo.dev/guides/using-eslint/
|
||||
const { defineConfig } = require("eslint/config")
|
||||
const expoConfig = require("eslint-config-expo/flat")
|
||||
|
||||
module.exports = defineConfig([
|
||||
expoConfig,
|
||||
{
|
||||
ignores: ["dist/*"],
|
||||
},
|
||||
])
|
||||
57
apps/aelis-client/package.json
Normal file
@@ -0,0 +1,57 @@
|
||||
{
|
||||
"name": "aelis-client",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"main": "expo-router/entry",
|
||||
"scripts": {
|
||||
"start": "./scripts/run-dev-server.sh",
|
||||
"reset-project": "node ./scripts/reset-project.js",
|
||||
"android": "expo start --android",
|
||||
"ios": "expo start --ios",
|
||||
"web": "expo start --web",
|
||||
"lint": "expo lint",
|
||||
"build:ios": "eas build --profile development --platform ios --non-interactive",
|
||||
"build:ios-simulator": "eas build --profile development-simulator --platform ios --non-interactive",
|
||||
"debugger": "bun run scripts/open-debugger.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@expo-google-fonts/inter": "^0.4.2",
|
||||
"@expo-google-fonts/source-serif-4": "^0.4.1",
|
||||
"@expo/vector-icons": "^15.0.3",
|
||||
"@react-navigation/bottom-tabs": "^7.4.0",
|
||||
"@react-navigation/elements": "^2.6.3",
|
||||
"@react-navigation/native": "^7.1.8",
|
||||
"expo": "~54.0.33",
|
||||
"expo-constants": "~18.0.13",
|
||||
"expo-dev-client": "~6.0.20",
|
||||
"expo-font": "~14.0.11",
|
||||
"expo-haptics": "~15.0.8",
|
||||
"expo-image": "~3.0.11",
|
||||
"expo-linking": "~8.0.11",
|
||||
"expo-location": "~19.0.8",
|
||||
"expo-router": "~6.0.23",
|
||||
"expo-splash-screen": "~31.0.13",
|
||||
"expo-status-bar": "~3.0.9",
|
||||
"expo-symbols": "~1.0.8",
|
||||
"expo-system-ui": "~6.0.9",
|
||||
"expo-web-browser": "~15.0.10",
|
||||
"react": "19.1.0",
|
||||
"react-dom": "19.1.0",
|
||||
"react-native": "0.81.5",
|
||||
"react-native-gesture-handler": "~2.28.0",
|
||||
"react-native-reanimated": "~4.1.1",
|
||||
"react-native-safe-area-context": "~5.6.0",
|
||||
"react-native-screens": "~4.16.0",
|
||||
"react-native-svg": "15.12.1",
|
||||
"react-native-web": "~0.21.0",
|
||||
"react-native-worklets": "0.5.1",
|
||||
"twrnc": "^4.16.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "~19.1.0",
|
||||
"eas-cli": "^18.0.1",
|
||||
"eslint": "^9.25.0",
|
||||
"eslint-config-expo": "~10.0.0",
|
||||
"typescript": "~5.9.2"
|
||||
}
|
||||
}
|
||||
127
apps/aelis-client/scripts/dev-proxy.ts
Normal file
@@ -0,0 +1,127 @@
|
||||
// Reverse proxy that sits in front of Metro so that all requests
|
||||
// (including those arriving via Tailscale or Ona port-forwarding) reach
|
||||
// Metro as loopback connections. This satisfies the isLocalSocket check
|
||||
// in Expo's debug middleware, making /debugger-frontend, /json, and
|
||||
// /open-debugger accessible from a remote browser.
|
||||
|
||||
import type { ServerWebSocket } from "bun"
|
||||
|
||||
const PROXY_PORT = parseInt(process.env.PROXY_PORT || "8080", 10)
|
||||
const METRO_PORT = parseInt(process.env.METRO_PORT || "8081", 10)
|
||||
const METRO_BASE = `http://127.0.0.1:${METRO_PORT}`
|
||||
|
||||
function forwardHeaders(headers: Headers): Headers {
|
||||
const result = new Headers(headers)
|
||||
result.delete("origin")
|
||||
result.delete("referer")
|
||||
result.set("host", `127.0.0.1:${METRO_PORT}`)
|
||||
return result
|
||||
}
|
||||
|
||||
interface WsData {
|
||||
upstream: WebSocket
|
||||
isDevice: boolean
|
||||
}
|
||||
|
||||
Bun.serve<WsData>({
|
||||
port: PROXY_PORT,
|
||||
|
||||
async fetch(req, server) {
|
||||
const url = new URL(req.url)
|
||||
|
||||
// WebSocket upgrade — bridge to Metro's ws endpoint
|
||||
if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
|
||||
const wsUrl = `ws://127.0.0.1:${METRO_PORT}${url.pathname}${url.search}`
|
||||
const upstream = new WebSocket(wsUrl)
|
||||
|
||||
// Wait for upstream to connect before upgrading the client
|
||||
try {
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
upstream.addEventListener("open", () => resolve())
|
||||
upstream.addEventListener("error", () => reject(new Error("upstream ws failed")))
|
||||
})
|
||||
} catch {
|
||||
return new Response("Upstream WebSocket unavailable", { status: 502 })
|
||||
}
|
||||
|
||||
const isDevice = url.pathname.startsWith("/inspector/device")
|
||||
const ok = server.upgrade(req, { data: { upstream, isDevice } })
|
||||
if (!ok) {
|
||||
upstream.close()
|
||||
return new Response("WebSocket upgrade failed", { status: 500 })
|
||||
}
|
||||
return undefined
|
||||
}
|
||||
|
||||
// HTTP proxy
|
||||
const upstream = `${METRO_BASE}${url.pathname}${url.search}`
|
||||
const res = await fetch(upstream, {
|
||||
method: req.method,
|
||||
headers: forwardHeaders(req.headers),
|
||||
body: req.body,
|
||||
redirect: "manual",
|
||||
})
|
||||
|
||||
return new Response(res.body, {
|
||||
status: res.status,
|
||||
statusText: res.statusText,
|
||||
headers: res.headers,
|
||||
})
|
||||
},
|
||||
|
||||
websocket: {
|
||||
message(ws: ServerWebSocket<WsData>, msg) {
|
||||
ws.data.upstream.send(msg)
|
||||
},
|
||||
open(ws: ServerWebSocket<WsData>) {
|
||||
const { upstream } = ws.data
|
||||
upstream.addEventListener("message", (ev) => {
|
||||
if (typeof ev.data === "string") {
|
||||
ws.send(ev.data)
|
||||
} else if (ev.data instanceof ArrayBuffer) {
|
||||
ws.sendBinary(new Uint8Array(ev.data))
|
||||
}
|
||||
})
|
||||
upstream.addEventListener("close", () => ws.close())
|
||||
upstream.addEventListener("error", () => ws.close())
|
||||
|
||||
// Print debugger URL shortly after a device connects,
|
||||
// giving Metro time to register the target.
|
||||
if (ws.data.isDevice) {
|
||||
setTimeout(() => printDebuggerUrl(), 1000)
|
||||
}
|
||||
},
|
||||
close(ws: ServerWebSocket<WsData>) {
|
||||
ws.data.upstream.close()
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
const tsIp = await Bun.$`tailscale ip -4`.text().then((s) => s.trim())
|
||||
|
||||
async function printDebuggerUrl() {
|
||||
const base = `http://${tsIp}:${PROXY_PORT}`
|
||||
const res = await fetch(`${METRO_BASE}/json`)
|
||||
if (!res.ok) return
|
||||
|
||||
interface DebugTarget {
|
||||
webSocketDebuggerUrl: string
|
||||
reactNative?: {
|
||||
capabilities?: { prefersFuseboxFrontend?: boolean }
|
||||
}
|
||||
}
|
||||
|
||||
const targets: DebugTarget[] = await res.json()
|
||||
const target = targets.find((t) => t.reactNative?.capabilities?.prefersFuseboxFrontend)
|
||||
if (!target) return
|
||||
|
||||
const wsPath = target.webSocketDebuggerUrl
|
||||
.replace(/^ws:\/\//, "")
|
||||
.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)
|
||||
|
||||
console.log(
|
||||
`\n React Native DevTools:\n ${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsPath)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true\n`,
|
||||
)
|
||||
}
|
||||
|
||||
console.log(`[proxy] listening on :${PROXY_PORT}, forwarding to 127.0.0.1:${METRO_PORT}`)
|
||||
52
apps/aelis-client/scripts/open-debugger.ts
Normal file
@@ -0,0 +1,52 @@
|
||||
// Opens React Native DevTools in Chrome, connected to the first
|
||||
// available Hermes debug target. Requires Metro + proxy to be running.
|
||||
|
||||
import { $ } from "bun"
|
||||
|
||||
const PROXY_PORT = process.env.PROXY_PORT || "8080"
|
||||
const METRO_PORT = process.env.METRO_PORT || "8081"
|
||||
const tsIp = (await $`tailscale ip -4`.text()).trim()
|
||||
const base = `http://${tsIp}:${PROXY_PORT}`
|
||||
|
||||
interface DebugTarget {
|
||||
devtoolsFrontendUrl: string
|
||||
webSocketDebuggerUrl: string
|
||||
reactNative?: {
|
||||
capabilities?: {
|
||||
prefersFuseboxFrontend?: boolean
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const res = await fetch(`${base}/json`)
|
||||
if (!res.ok) {
|
||||
console.error("Failed to fetch /json — is Metro running?")
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const targets: DebugTarget[] = await res.json()
|
||||
const target = targets.find((t) => t.reactNative?.capabilities?.prefersFuseboxFrontend)
|
||||
|
||||
if (!target) {
|
||||
console.error("No debug target found. Is the app connected?")
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const wsUrl = target.webSocketDebuggerUrl
|
||||
.replace(/^ws:\/\//, "")
|
||||
.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)
|
||||
|
||||
const url = `${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsUrl)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true`
|
||||
|
||||
console.log(url)
|
||||
|
||||
// Open in Chrome app mode if on macOS
|
||||
try {
|
||||
await $`open -a "Google Chrome" --args --app=${url}`.quiet()
|
||||
} catch {
|
||||
try {
|
||||
await $`xdg-open ${url}`.quiet()
|
||||
} catch {
|
||||
console.log("Open the URL above in Chrome.")
|
||||
}
|
||||
}
|
||||
112
apps/aelis-client/scripts/reset-project.js
Executable file
@@ -0,0 +1,112 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* This script is used to reset the project to a blank state.
|
||||
* It deletes or moves the /app, /components, /hooks, /scripts, and /constants directories to /app-example based on user input and creates a new /app directory with an index.tsx and _layout.tsx file.
|
||||
* You can remove the `reset-project` script from package.json and safely delete this file after running it.
|
||||
*/
|
||||
|
||||
const fs = require("fs")
|
||||
const path = require("path")
|
||||
const readline = require("readline")
|
||||
|
||||
const root = process.cwd()
|
||||
const oldDirs = ["app", "components", "hooks", "constants", "scripts"]
|
||||
const exampleDir = "app-example"
|
||||
const newAppDir = "app"
|
||||
const exampleDirPath = path.join(root, exampleDir)
|
||||
|
||||
const indexContent = `import { Text, View } from "react-native";
|
||||
|
||||
export default function Index() {
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
<Text>Edit app/index.tsx to edit this screen.</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
`
|
||||
|
||||
const layoutContent = `import { Stack } from "expo-router";
|
||||
|
||||
export default function RootLayout() {
|
||||
return <Stack />;
|
||||
}
|
||||
`
|
||||
|
||||
const rl = readline.createInterface({
|
||||
input: process.stdin,
|
||||
output: process.stdout,
|
||||
})
|
||||
|
||||
const moveDirectories = async (userInput) => {
|
||||
try {
|
||||
if (userInput === "y") {
|
||||
// Create the app-example directory
|
||||
await fs.promises.mkdir(exampleDirPath, { recursive: true })
|
||||
console.log(`📁 /${exampleDir} directory created.`)
|
||||
}
|
||||
|
||||
// Move old directories to new app-example directory or delete them
|
||||
for (const dir of oldDirs) {
|
||||
const oldDirPath = path.join(root, dir)
|
||||
if (fs.existsSync(oldDirPath)) {
|
||||
if (userInput === "y") {
|
||||
const newDirPath = path.join(root, exampleDir, dir)
|
||||
await fs.promises.rename(oldDirPath, newDirPath)
|
||||
console.log(`➡️ /${dir} moved to /${exampleDir}/${dir}.`)
|
||||
} else {
|
||||
await fs.promises.rm(oldDirPath, { recursive: true, force: true })
|
||||
console.log(`❌ /${dir} deleted.`)
|
||||
}
|
||||
} else {
|
||||
console.log(`➡️ /${dir} does not exist, skipping.`)
|
||||
}
|
||||
}
|
||||
|
||||
// Create new /app directory
|
||||
const newAppDirPath = path.join(root, newAppDir)
|
||||
await fs.promises.mkdir(newAppDirPath, { recursive: true })
|
||||
console.log("\n📁 New /app directory created.")
|
||||
|
||||
// Create index.tsx
|
||||
const indexPath = path.join(newAppDirPath, "index.tsx")
|
||||
await fs.promises.writeFile(indexPath, indexContent)
|
||||
console.log("📄 app/index.tsx created.")
|
||||
|
||||
// Create _layout.tsx
|
||||
const layoutPath = path.join(newAppDirPath, "_layout.tsx")
|
||||
await fs.promises.writeFile(layoutPath, layoutContent)
|
||||
console.log("📄 app/_layout.tsx created.")
|
||||
|
||||
console.log("\n✅ Project reset complete. Next steps:")
|
||||
console.log(
|
||||
`1. Run \`npx expo start\` to start a development server.\n2. Edit app/index.tsx to edit the main screen.${
|
||||
userInput === "y"
|
||||
? `\n3. Delete the /${exampleDir} directory when you're done referencing it.`
|
||||
: ""
|
||||
}`,
|
||||
)
|
||||
} catch (error) {
|
||||
console.error(`❌ Error during script execution: ${error.message}`)
|
||||
}
|
||||
}
|
||||
|
||||
rl.question(
|
||||
"Do you want to move existing files to /app-example instead of deleting them? (Y/n): ",
|
||||
(answer) => {
|
||||
const userInput = answer.trim().toLowerCase() || "y"
|
||||
if (userInput === "y" || userInput === "n") {
|
||||
moveDirectories(userInput).finally(() => rl.close())
|
||||
} else {
|
||||
console.log("❌ Invalid input. Please enter 'Y' or 'N'.")
|
||||
rl.close()
|
||||
}
|
||||
},
|
||||
)
|
||||
15
apps/aelis-client/scripts/run-dev-server.sh
Executable file
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
PROXY_PORT=8080
|
||||
METRO_PORT=8081
|
||||
|
||||
# Start a reverse proxy so Metro sees all requests as loopback.
|
||||
# This makes debugger endpoints (/debugger-frontend, /json, /open-debugger)
|
||||
# accessible through the Tailscale IP.
|
||||
PROXY_PORT=$PROXY_PORT METRO_PORT=$METRO_PORT bun run scripts/dev-proxy.ts &
|
||||
PROXY_PID=$!
|
||||
trap "kill $PROXY_PID 2>/dev/null" EXIT
|
||||
|
||||
EXPO_PACKAGER_PROXY_URL=http://$(tailscale ip -4):$PROXY_PORT bunx expo start --localhost -p $METRO_PORT
|
||||
|
||||
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" />
|
||||
</>
|
||||
)
|
||||
}
|
||||
46
apps/aelis-client/src/app/components/[name].tsx
Normal file
@@ -0,0 +1,46 @@
|
||||
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>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<ScrollView style={tw`bg-stone-100 dark:bg-stone-900 flex-1`} contentContainerStyle={tw`px-5 pb-10 pt-4 gap-6`}>
|
||||
{showcase.component()}
|
||||
</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.ReactNode
|
||||
}
|
||||
|
||||
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>
|
||||
)
|
||||
}
|
||||
60
apps/aelis-client/src/components/themed-text.tsx
Normal file
@@ -0,0 +1,60 @@
|
||||
import { StyleSheet, Text, type TextProps } from "react-native"
|
||||
|
||||
import { useThemeColor } from "@/hooks/use-theme-color"
|
||||
|
||||
export type ThemedTextProps = TextProps & {
|
||||
lightColor?: string
|
||||
darkColor?: string
|
||||
type?: "default" | "title" | "defaultSemiBold" | "subtitle" | "link"
|
||||
}
|
||||
|
||||
export function ThemedText({
|
||||
style,
|
||||
lightColor,
|
||||
darkColor,
|
||||
type = "default",
|
||||
...rest
|
||||
}: ThemedTextProps) {
|
||||
const color = useThemeColor({ light: lightColor, dark: darkColor }, "text")
|
||||
|
||||
return (
|
||||
<Text
|
||||
style={[
|
||||
{ color },
|
||||
type === "default" ? styles.default : undefined,
|
||||
type === "title" ? styles.title : undefined,
|
||||
type === "defaultSemiBold" ? styles.defaultSemiBold : undefined,
|
||||
type === "subtitle" ? styles.subtitle : undefined,
|
||||
type === "link" ? styles.link : undefined,
|
||||
style,
|
||||
]}
|
||||
{...rest}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
default: {
|
||||
fontSize: 16,
|
||||
lineHeight: 24,
|
||||
},
|
||||
defaultSemiBold: {
|
||||
fontSize: 16,
|
||||
lineHeight: 24,
|
||||
fontWeight: "600",
|
||||
},
|
||||
title: {
|
||||
fontSize: 32,
|
||||
fontWeight: "bold",
|
||||
lineHeight: 32,
|
||||
},
|
||||
subtitle: {
|
||||
fontSize: 20,
|
||||
fontWeight: "bold",
|
||||
},
|
||||
link: {
|
||||
lineHeight: 30,
|
||||
fontSize: 16,
|
||||
color: "#0a7ea4",
|
||||
},
|
||||
})
|
||||
43
apps/aelis-client/src/components/ui/button.showcase.tsx
Normal file
@@ -0,0 +1,43 @@
|
||||
import Feather from "@expo/vector-icons/Feather"
|
||||
import { View } from "react-native"
|
||||
import tw from "twrnc"
|
||||
|
||||
import { Button } from "./button"
|
||||
import { type Showcase, Section } from "../showcase"
|
||||
|
||||
function ButtonShowcase() {
|
||||
return (
|
||||
<View style={tw`gap-6`}>
|
||||
<Section title="Default">
|
||||
<Button style={tw`self-start`} label="Press me" />
|
||||
</Section>
|
||||
<Section title="Leading icon">
|
||||
<Button
|
||||
style={tw`self-start`}
|
||||
label="Add item"
|
||||
leadingIcon={<Feather name="plus" size={18} color="#e7e5e4" />}
|
||||
/>
|
||||
</Section>
|
||||
<Section title="Trailing icon">
|
||||
<Button
|
||||
style={tw`self-start`}
|
||||
label="Next"
|
||||
trailingIcon={<Feather name="arrow-right" size={18} color="#e7e5e4" />}
|
||||
/>
|
||||
</Section>
|
||||
<Section title="Both icons">
|
||||
<Button
|
||||
style={tw`self-start`}
|
||||
label="Download"
|
||||
leadingIcon={<Feather name="download" size={18} color="#e7e5e4" />}
|
||||
trailingIcon={<Feather name="chevron-down" size={18} color="#e7e5e4" />}
|
||||
/>
|
||||
</Section>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
export const buttonShowcase: Showcase = {
|
||||
title: "Button",
|
||||
component: ButtonShowcase,
|
||||
}
|
||||
30
apps/aelis-client/src/components/ui/button.tsx
Normal file
@@ -0,0 +1,30 @@
|
||||
import { type PressableProps, Pressable, View } from "react-native"
|
||||
import tw from "twrnc"
|
||||
|
||||
import { SansSerifText } from "./sans-serif-text"
|
||||
|
||||
type ButtonProps = Omit<PressableProps, "children"> & {
|
||||
label: string
|
||||
leadingIcon?: React.ReactNode
|
||||
trailingIcon?: React.ReactNode
|
||||
}
|
||||
|
||||
export function Button({ style, label, leadingIcon, trailingIcon, ...props }: ButtonProps) {
|
||||
const hasIcons = leadingIcon != null || trailingIcon != null
|
||||
|
||||
const textElement = <SansSerifText style={tw`text-stone-200 font-medium`}>{label}</SansSerifText>
|
||||
|
||||
return (
|
||||
<Pressable style={[tw`rounded-full bg-teal-600 px-4 py-3 w-fit`, style]} {...props}>
|
||||
{hasIcons ? (
|
||||
<View style={tw`flex-row items-center gap-1.5`}>
|
||||
{leadingIcon}
|
||||
{textElement}
|
||||
{trailingIcon}
|
||||
</View>
|
||||
) : (
|
||||
textElement
|
||||
)}
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||