Compare commits
2 Commits
feat/rende
...
2b1a50349c
| Author | SHA1 | Date | |
|---|---|---|---|
|
2b1a50349c
|
|||
|
bb92c9f227
|
@@ -1,8 +1,8 @@
|
|||||||
services:
|
services:
|
||||||
expo:
|
expo:
|
||||||
name: Expo Dev Server
|
name: Expo Dev Server
|
||||||
description: Expo development server for aelis-client
|
description: Expo development server for aris-client
|
||||||
triggeredBy:
|
triggeredBy:
|
||||||
- postDevcontainerStart
|
- postDevcontainerStart
|
||||||
commands:
|
commands:
|
||||||
start: cd apps/aelis-client && ./scripts/run-dev-server.sh
|
start: cd apps/aris-client && ./scripts/run-dev-server.sh
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
## Project
|
## Project
|
||||||
|
|
||||||
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).
|
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).
|
||||||
|
|
||||||
## Commands
|
## Commands
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# aelis
|
# aris
|
||||||
|
|
||||||
To install dependencies:
|
To install dependencies:
|
||||||
|
|
||||||
@@ -8,14 +8,14 @@ bun install
|
|||||||
|
|
||||||
## Packages
|
## Packages
|
||||||
|
|
||||||
### @aelis/source-tfl
|
### @aris/source-tfl
|
||||||
|
|
||||||
TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.
|
TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.
|
||||||
|
|
||||||
#### Testing
|
#### Testing
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd packages/aelis-source-tfl
|
cd packages/aris-source-tfl
|
||||||
bun run test
|
bun run test
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -1,176 +0,0 @@
|
|||||||
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")
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "@aelis/backend",
|
"name": "@aris/backend",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "src/server.ts",
|
"main": "src/server.ts",
|
||||||
@@ -9,12 +9,12 @@
|
|||||||
"test": "bun test src/"
|
"test": "bun test src/"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aelis/core": "workspace:*",
|
"@aris/core": "workspace:*",
|
||||||
"@aelis/source-caldav": "workspace:*",
|
"@aris/source-caldav": "workspace:*",
|
||||||
"@aelis/source-google-calendar": "workspace:*",
|
"@aris/source-google-calendar": "workspace:*",
|
||||||
"@aelis/source-location": "workspace:*",
|
"@aris/source-location": "workspace:*",
|
||||||
"@aelis/source-tfl": "workspace:*",
|
"@aris/source-tfl": "workspace:*",
|
||||||
"@aelis/source-weatherkit": "workspace:*",
|
"@aris/source-weatherkit": "workspace:*",
|
||||||
"@openrouter/sdk": "^0.9.11",
|
"@openrouter/sdk": "^0.9.11",
|
||||||
"arktype": "^2.1.29",
|
"arktype": "^2.1.29",
|
||||||
"better-auth": "^1",
|
"better-auth": "^1",
|
||||||
@@ -61,7 +61,7 @@ export async function getSessionFromHeaders(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Dev/test middleware that injects a fake user and session.
|
* Test-only middleware that injects a fake user and session.
|
||||||
* Pass userId to simulate an authenticated request, or omit to get 401.
|
* Pass userId to simulate an authenticated request, or omit to get 401.
|
||||||
*/
|
*/
|
||||||
export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddleware {
|
export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddleware {
|
||||||
@@ -69,34 +69,8 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
|
|||||||
if (!userId) {
|
if (!userId) {
|
||||||
return c.json({ error: "Unauthorized" }, 401)
|
return c.json({ error: "Unauthorized" }, 401)
|
||||||
}
|
}
|
||||||
|
c.set("user", { id: userId } as AuthUser)
|
||||||
const now = new Date()
|
c.set("session", { id: "mock-session" } as AuthSession)
|
||||||
const expiresAt = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000)
|
|
||||||
|
|
||||||
const user: AuthUser = {
|
|
||||||
id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
|
|
||||||
name: "Dev User",
|
|
||||||
email: "dev@aelis.local",
|
|
||||||
emailVerified: true,
|
|
||||||
image: null,
|
|
||||||
createdAt: now,
|
|
||||||
updatedAt: now,
|
|
||||||
}
|
|
||||||
|
|
||||||
const session: AuthSession = {
|
|
||||||
id: "Wt3FvBpXaQrMhD8sKjE6LcYn0gUz5iRo",
|
|
||||||
userId: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
|
|
||||||
token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4",
|
|
||||||
expiresAt,
|
|
||||||
ipAddress: "127.0.0.1",
|
|
||||||
userAgent: "aelis-dev",
|
|
||||||
createdAt: now,
|
|
||||||
updatedAt: now,
|
|
||||||
}
|
|
||||||
|
|
||||||
c.set("user", user)
|
|
||||||
c.set("session", session)
|
|
||||||
|
|
||||||
await next()
|
await next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@aelis/core"
|
import type { FeedItem } from "@aris/core"
|
||||||
|
|
||||||
import type { LlmClient } from "./llm-client.ts"
|
import type { LlmClient } from "./llm-client.ts"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@aelis/core"
|
import type { FeedItem } from "@aris/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@aelis/core"
|
import type { FeedItem } from "@aris/core"
|
||||||
|
|
||||||
import type { EnhancementResult } from "./schema.ts"
|
import type { EnhancementResult } from "./schema.ts"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedItem } from "@aelis/core"
|
import type { FeedItem } from "@aris/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { FeedItem } from "@aelis/core"
|
import type { FeedItem } from "@aris/core"
|
||||||
|
|
||||||
import { CalDavFeedItemType } from "@aelis/source-caldav"
|
import { CalDavFeedItemType } from "@aris/source-caldav"
|
||||||
import { CalendarFeedItemType } from "@aelis/source-google-calendar"
|
import { CalendarFeedItemType } from "@aris/source-google-calendar"
|
||||||
|
|
||||||
import systemPromptBase from "./prompts/system.txt"
|
import systemPromptBase from "./prompts/system.txt"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
You are AELIS, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
|
You are ARIS, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
|
||||||
|
|
||||||
The user message is a JSON object with:
|
The user message is a JSON object with:
|
||||||
- "items": feed items with data and named slots to fill. Each slot has a description of what to write.
|
- "items": feed items with data and named slots to fill. Each slot has a description of what to write.
|
||||||
89
apps/aris-backend/src/enhancement/schema.test.ts
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
|
import { emptyEnhancementResult, 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([])
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -1,24 +1,24 @@
|
|||||||
import { type } from "arktype"
|
import { type } from "arktype"
|
||||||
|
|
||||||
const SyntheticItem = type({
|
const syntheticItemSchema = type({
|
||||||
id: "string",
|
id: "string",
|
||||||
type: "string",
|
type: "string",
|
||||||
text: "string",
|
text: "string",
|
||||||
})
|
})
|
||||||
|
|
||||||
const EnhancementResult = type({
|
const enhancementResultSchema = type({
|
||||||
slotFills: "Record<string, Record<string, string | null>>",
|
slotFills: "Record<string, Record<string, string | null>>",
|
||||||
syntheticItems: SyntheticItem.array(),
|
syntheticItems: syntheticItemSchema.array(),
|
||||||
})
|
})
|
||||||
|
|
||||||
export type SyntheticItem = typeof SyntheticItem.infer
|
export type SyntheticItem = typeof syntheticItemSchema.infer
|
||||||
export type EnhancementResult = typeof EnhancementResult.infer
|
export type EnhancementResult = typeof enhancementResultSchema.infer
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JSON Schema passed to OpenRouter's structured output.
|
* JSON Schema passed to OpenRouter's structured output.
|
||||||
* OpenRouter doesn't support arktype, so this is maintained separately.
|
* OpenRouter doesn't support arktype, so this is maintained separately.
|
||||||
*
|
*
|
||||||
* ⚠️ Must stay in sync with EnhancementResult above.
|
* ⚠️ Must stay in sync with enhancementResultSchema above.
|
||||||
* If you add/remove fields, update both schemas.
|
* If you add/remove fields, update both schemas.
|
||||||
*/
|
*/
|
||||||
export const enhancementResultJsonSchema = {
|
export const enhancementResultJsonSchema = {
|
||||||
@@ -76,7 +76,7 @@ export function parseEnhancementResult(json: string): EnhancementResult | null {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = EnhancementResult(parsed)
|
const result = enhancementResultSchema(parsed)
|
||||||
if (result instanceof type.errors) {
|
if (result instanceof type.errors) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aris/core"
|
||||||
|
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
@@ -45,7 +45,7 @@ async function handleUpdateLocation(c: Context<Env>) {
|
|||||||
const user = c.get("user")!
|
const user = c.get("user")!
|
||||||
const sessionManager = c.get("sessionManager")
|
const sessionManager = c.get("sessionManager")
|
||||||
const session = sessionManager.getOrCreate(user.id)
|
const session = sessionManager.getOrCreate(user.id)
|
||||||
await session.engine.executeAction("aelis.location", "update-location", {
|
await session.engine.executeAction("aris.location", "update-location", {
|
||||||
lat: result.lat,
|
lat: result.lat,
|
||||||
lng: result.lng,
|
lng: result.lng,
|
||||||
accuracy: result.accuracy,
|
accuracy: result.accuracy,
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import { LocationSource } from "@aelis/source-location"
|
import { LocationSource } from "@aris/source-location"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
|
|
||||||
import { registerAuthHandlers } from "./auth/http.ts"
|
import { registerAuthHandlers } from "./auth/http.ts"
|
||||||
import { mockAuthSessionMiddleware, requireSession } from "./auth/session-middleware.ts"
|
import { requireSession } from "./auth/session-middleware.ts"
|
||||||
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
||||||
import { createLlmClient } from "./enhancement/llm-client.ts"
|
import { createLlmClient } from "./enhancement/llm-client.ts"
|
||||||
import { registerFeedHttpHandlers } from "./feed/http.ts"
|
import { registerFeedHttpHandlers } from "./feed/http.ts"
|
||||||
@@ -43,16 +43,10 @@ function main() {
|
|||||||
|
|
||||||
app.get("/health", (c) => c.json({ status: "ok" }))
|
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)
|
registerAuthHandlers(app)
|
||||||
}
|
|
||||||
|
|
||||||
registerFeedHttpHandlers(app, {
|
registerFeedHttpHandlers(app, {
|
||||||
sessionManager,
|
sessionManager,
|
||||||
authSessionMiddleware,
|
authSessionMiddleware: requireSession,
|
||||||
})
|
})
|
||||||
registerLocationHttpHandlers(app, { sessionManager })
|
registerLocationHttpHandlers(app, { sessionManager })
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { FeedSource } from "@aelis/core"
|
import type { FeedSource } from "@aris/core"
|
||||||
|
|
||||||
export interface FeedSourceProvider {
|
export interface FeedSourceProvider {
|
||||||
feedSourceForUser(userId: string): FeedSource
|
feedSourceForUser(userId: string): FeedSource
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { WeatherKitClient, WeatherKitResponse } from "@aelis/source-weatherkit"
|
import type { WeatherKitClient, WeatherKitResponse } from "@aris/source-weatherkit"
|
||||||
|
|
||||||
import { LocationSource } from "@aelis/source-location"
|
import { LocationSource } from "@aris/source-location"
|
||||||
import { describe, expect, mock, test } from "bun:test"
|
import { describe, expect, mock, test } from "bun:test"
|
||||||
|
|
||||||
import { WeatherSourceProvider } from "../weather/provider.ts"
|
import { WeatherSourceProvider } from "../weather/provider.ts"
|
||||||
@@ -44,8 +44,8 @@ describe("UserSessionManager", () => {
|
|||||||
const session1 = manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
const session2 = manager.getOrCreate("user-2")
|
const session2 = manager.getOrCreate("user-2")
|
||||||
|
|
||||||
const source1 = session1.getSource<LocationSource>("aelis.location")
|
const source1 = session1.getSource<LocationSource>("aris.location")
|
||||||
const source2 = session2.getSource<LocationSource>("aelis.location")
|
const source2 = session2.getSource<LocationSource>("aris.location")
|
||||||
|
|
||||||
expect(source1).not.toBe(source2)
|
expect(source1).not.toBe(source2)
|
||||||
})
|
})
|
||||||
@@ -83,7 +83,7 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session.getSource("aelis.weather")).toBeDefined()
|
expect(session.getSource("aris.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("accepts mixed providers", () => {
|
test("accepts mixed providers", () => {
|
||||||
@@ -94,8 +94,8 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session.getSource("aelis.location")).toBeDefined()
|
expect(session.getSource("aris.location")).toBeDefined()
|
||||||
expect(session.getSource("aelis.weather")).toBeDefined()
|
expect(session.getSource("aris.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("refresh returns feed result through session", async () => {
|
test("refresh returns feed result through session", async () => {
|
||||||
@@ -114,14 +114,14 @@ describe("UserSessionManager", () => {
|
|||||||
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
await session.engine.executeAction("aelis.location", "update-location", {
|
await session.engine.executeAction("aris.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
timestamp: new Date(),
|
timestamp: new Date(),
|
||||||
})
|
})
|
||||||
|
|
||||||
const source = session.getSource<LocationSource>("aelis.location")
|
const source = session.getSource<LocationSource>("aris.location")
|
||||||
expect(source?.lastLocation?.lat).toBe(51.5074)
|
expect(source?.lastLocation?.lat).toBe(51.5074)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -132,7 +132,7 @@ describe("UserSessionManager", () => {
|
|||||||
const session = manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
session.engine.subscribe(callback)
|
session.engine.subscribe(callback)
|
||||||
|
|
||||||
await session.engine.executeAction("aelis.location", "update-location", {
|
await session.engine.executeAction("aris.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
@@ -156,7 +156,7 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
// Create new session and push location — old callback should not fire
|
// Create new session and push location — old callback should not fire
|
||||||
const session2 = manager.getOrCreate("user-1")
|
const session2 = manager.getOrCreate("user-1")
|
||||||
await session2.engine.executeAction("aelis.location", "update-location", {
|
await session2.engine.executeAction("aris.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aris/core"
|
||||||
|
|
||||||
import { LocationSource } from "@aelis/source-location"
|
import { LocationSource } from "@aris/source-location"
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
@@ -36,7 +36,7 @@ describe("UserSession", () => {
|
|||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession([location])
|
const session = new UserSession([location])
|
||||||
|
|
||||||
const result = session.getSource<LocationSource>("aelis.location")
|
const result = session.getSource<LocationSource>("aris.location")
|
||||||
|
|
||||||
expect(result).toBe(location)
|
expect(result).toBe(location)
|
||||||
})
|
})
|
||||||
@@ -59,7 +59,7 @@ describe("UserSession", () => {
|
|||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession([location])
|
const session = new UserSession([location])
|
||||||
|
|
||||||
await session.engine.executeAction("aelis.location", "update-location", {
|
await session.engine.executeAction("aris.location", "update-location", {
|
||||||
lat: 51.5,
|
lat: 51.5,
|
||||||
lng: -0.1,
|
lng: -0.1,
|
||||||
accuracy: 10,
|
accuracy: 10,
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
|
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aris/core"
|
||||||
|
|
||||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { TflSource, type ITflApi } from "@aelis/source-tfl"
|
import { TflSource, type ITflApi } from "@aris/source-tfl"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
|
import { WeatherSource, type WeatherSourceOptions } from "@aris/source-weatherkit"
|
||||||
|
|
||||||
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
|
||||||
|
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"expo": {
|
"expo": {
|
||||||
"name": "Aelis",
|
"name": "Aris",
|
||||||
"slug": "aelis-client",
|
"slug": "aris-client",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"orientation": "portrait",
|
"orientation": "portrait",
|
||||||
"icon": "./assets/images/icon.png",
|
"icon": "./assets/images/icon.png",
|
||||||
"scheme": "aelis",
|
"scheme": "aris",
|
||||||
"userInterfaceStyle": "automatic",
|
"userInterfaceStyle": "automatic",
|
||||||
"newArchEnabled": true,
|
"newArchEnabled": true,
|
||||||
"ios": {
|
"ios": {
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"ITSAppUsesNonExemptEncryption": false
|
"ITSAppUsesNonExemptEncryption": false
|
||||||
},
|
},
|
||||||
"bundleIdentifier": "sh.nym.aelis"
|
"bundleIdentifier": "sh.nym.aris"
|
||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"adaptiveIcon": {
|
"adaptiveIcon": {
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
},
|
},
|
||||||
"edgeToEdgeEnabled": true,
|
"edgeToEdgeEnabled": true,
|
||||||
"predictiveBackGestureEnabled": false,
|
"predictiveBackGestureEnabled": false,
|
||||||
"package": "sh.nym.aelis"
|
"package": "sh.nym.aris"
|
||||||
},
|
},
|
||||||
"web": {
|
"web": {
|
||||||
"output": "static",
|
"output": "static",
|
||||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 384 KiB After Width: | Height: | Size: 384 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "aelis-client",
|
"name": "aris-client",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"main": "expo-router/entry",
|
"main": "expo-router/entry",
|
||||||