mirror of
https://github.com/kennethnym/aris.git
synced 2026-03-20 09:01:19 +00:00
Compare commits
1 Commits
fix/remove
...
feat/feed-
| Author | SHA1 | Date | |
|---|---|---|---|
|
0145976a9f
|
@@ -15,6 +15,7 @@
|
|||||||
"@aelis/source-location": "workspace:*",
|
"@aelis/source-location": "workspace:*",
|
||||||
"@aelis/source-tfl": "workspace:*",
|
"@aelis/source-tfl": "workspace:*",
|
||||||
"@aelis/source-weatherkit": "workspace:*",
|
"@aelis/source-weatherkit": "workspace:*",
|
||||||
|
"@nym.sh/jrx": "^0.2.0",
|
||||||
"@openrouter/sdk": "^0.9.11",
|
"@openrouter/sdk": "^0.9.11",
|
||||||
"arktype": "^2.1.29",
|
"arktype": "^2.1.29",
|
||||||
"better-auth": "^1",
|
"better-auth": "^1",
|
||||||
|
|||||||
7
apps/aelis-backend/src/caldav/renderer-provider.ts
Normal file
7
apps/aelis-backend/src/caldav/renderer-provider.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import type { FeedItemRenderer } from "@aelis/core"
|
||||||
|
|
||||||
|
import { renderCalDavFeedItem } from "@aelis/source-caldav"
|
||||||
|
|
||||||
|
export const CALDAV_SOURCE_ID = "aelis.caldav"
|
||||||
|
|
||||||
|
export const calDavRenderer: FeedItemRenderer = renderCalDavFeedItem as FeedItemRenderer
|
||||||
@@ -1,10 +1,19 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
import type {
|
||||||
|
ActionDefinition,
|
||||||
|
ContextEntry,
|
||||||
|
FeedItem,
|
||||||
|
FeedItemRenderer,
|
||||||
|
FeedSource,
|
||||||
|
} from "@aelis/core"
|
||||||
|
import type { Spec } from "@json-render/core"
|
||||||
|
|
||||||
import { contextKey } from "@aelis/core"
|
import { contextKey } from "@aelis/core"
|
||||||
import { describe, expect, spyOn, test } from "bun:test"
|
import { JRX_NODE } from "@nym.sh/jrx"
|
||||||
|
import { describe, expect, test } from "bun:test"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
|
|
||||||
import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
|
import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
|
import { FeedRenderer } from "../session/feed-renderer.ts"
|
||||||
import { UserSessionManager } from "../session/index.ts"
|
import { UserSessionManager } from "../session/index.ts"
|
||||||
import { registerFeedHttpHandlers } from "./http.ts"
|
import { registerFeedHttpHandlers } from "./http.ts"
|
||||||
|
|
||||||
@@ -19,6 +28,17 @@ interface FeedResponse {
|
|||||||
errors: Array<{ sourceId: string; error: string }>
|
errors: Array<{ sourceId: string; error: string }>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface RenderedFeedResponse {
|
||||||
|
items: Array<{
|
||||||
|
id: string
|
||||||
|
type: string
|
||||||
|
timestamp: string
|
||||||
|
data: Record<string, unknown>
|
||||||
|
ui: Spec
|
||||||
|
}>
|
||||||
|
errors: Array<{ sourceId: string; error: string }>
|
||||||
|
}
|
||||||
|
|
||||||
function createStubSource(
|
function createStubSource(
|
||||||
id: string,
|
id: string,
|
||||||
items: FeedItem[] = [],
|
items: FeedItem[] = [],
|
||||||
@@ -72,12 +92,12 @@ describe("GET /api/feed", () => {
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
providers: [async () => createStubSource("test", items)],
|
providers: [() => createStubSource("test", items)],
|
||||||
})
|
})
|
||||||
const app = buildTestApp(manager, "user-1")
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
// Prime the cache
|
// Prime the cache
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
expect(session.engine.lastFeed()).not.toBeNull()
|
expect(session.engine.lastFeed()).not.toBeNull()
|
||||||
|
|
||||||
@@ -105,7 +125,7 @@ describe("GET /api/feed", () => {
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
providers: [async () => createStubSource("test", items)],
|
providers: [() => createStubSource("test", items)],
|
||||||
})
|
})
|
||||||
const app = buildTestApp(manager, "user-1")
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
@@ -136,7 +156,7 @@ describe("GET /api/feed", () => {
|
|||||||
throw new Error("connection timeout")
|
throw new Error("connection timeout")
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
const manager = new UserSessionManager({ providers: [async () => failingSource] })
|
const manager = new UserSessionManager({ providers: [() => failingSource] })
|
||||||
const app = buildTestApp(manager, "user-1")
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
const res = await app.request("/api/feed")
|
const res = await app.request("/api/feed")
|
||||||
@@ -148,26 +168,167 @@ describe("GET /api/feed", () => {
|
|||||||
expect(body.errors[0]!.sourceId).toBe("failing")
|
expect(body.errors[0]!.sourceId).toBe("failing")
|
||||||
expect(body.errors[0]!.error).toBe("connection timeout")
|
expect(body.errors[0]!.error).toBe("connection timeout")
|
||||||
})
|
})
|
||||||
|
})
|
||||||
|
|
||||||
test("returns 503 when all providers fail", async () => {
|
describe("GET /api/feed?render=json-render", () => {
|
||||||
const manager = new UserSessionManager({
|
const stubRenderer: FeedItemRenderer = (item) => ({
|
||||||
providers: [
|
$$typeof: JRX_NODE,
|
||||||
async () => {
|
type: "FeedCard",
|
||||||
throw new Error("provider down")
|
props: {},
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
$$typeof: JRX_NODE,
|
||||||
|
type: "SansSerifText",
|
||||||
|
props: { content: `Rendered: ${item.data.value}` },
|
||||||
|
children: [],
|
||||||
|
key: undefined,
|
||||||
|
visible: undefined,
|
||||||
|
on: undefined,
|
||||||
|
repeat: undefined,
|
||||||
|
watch: undefined,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
key: undefined,
|
||||||
|
visible: undefined,
|
||||||
|
on: undefined,
|
||||||
|
repeat: undefined,
|
||||||
|
watch: undefined,
|
||||||
|
})
|
||||||
|
|
||||||
|
const rendererProvider = {
|
||||||
|
feedRendererForUser: () => new FeedRenderer({ "test-source": stubRenderer }),
|
||||||
|
}
|
||||||
|
|
||||||
|
test("returns rendered items with ui field as Spec", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "item-1",
|
||||||
|
sourceId: "test-source",
|
||||||
|
type: "renderable",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: "hello" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
})
|
})
|
||||||
const app = buildTestApp(manager, "user-1")
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
const spy = spyOn(console, "error").mockImplementation(() => {})
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as RenderedFeedResponse
|
||||||
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!.id).toBe("item-1")
|
||||||
|
expect(body.items[0]!.ui).toBeDefined()
|
||||||
|
expect(body.items[0]!.ui.root).toBeDefined()
|
||||||
|
expect(body.items[0]!.ui.elements).toBeDefined()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("drops items without a renderer", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "renderable-1",
|
||||||
|
sourceId: "test-source",
|
||||||
|
type: "renderable",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: "yes" },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "unrenderable-1",
|
||||||
|
sourceId: "other-source",
|
||||||
|
type: "no-renderer",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: "no" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as RenderedFeedResponse
|
||||||
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!.id).toBe("renderable-1")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns empty items when no renderers match", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "item-1",
|
||||||
|
sourceId: "other-source",
|
||||||
|
type: "no-renderer",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: 42 },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as RenderedFeedResponse
|
||||||
|
expect(body.items).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 400 for unknown render format", async () => {
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test")],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=unknown")
|
||||||
|
|
||||||
|
expect(res.status).toBe(400)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("unknown")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 500 when renderer is not available", async () => {
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test")],
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/feed?render=json-render")
|
||||||
|
|
||||||
|
expect(res.status).toBe(500)
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body.error).toContain("not available")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("without render param returns raw items (no ui field)", async () => {
|
||||||
|
const items: FeedItem[] = [
|
||||||
|
{
|
||||||
|
id: "item-1",
|
||||||
|
sourceId: "test-source",
|
||||||
|
type: "renderable",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: 42 },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const manager = new UserSessionManager({
|
||||||
|
providers: [() => createStubSource("test", items)],
|
||||||
|
rendererProvider,
|
||||||
|
})
|
||||||
|
const app = buildTestApp(manager, "user-1")
|
||||||
|
|
||||||
const res = await app.request("/api/feed")
|
const res = await app.request("/api/feed")
|
||||||
|
|
||||||
expect(res.status).toBe(503)
|
expect(res.status).toBe(200)
|
||||||
const body = (await res.json()) as { error: string }
|
const body = (await res.json()) as FeedResponse
|
||||||
expect(body.error).toBe("Service unavailable")
|
expect(body.items).toHaveLength(1)
|
||||||
|
expect(body.items[0]!).not.toHaveProperty("ui")
|
||||||
spy.mockRestore()
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -179,12 +340,12 @@ describe("GET /api/context", () => {
|
|||||||
// The mock auth middleware always injects this hardcoded user ID
|
// The mock auth middleware always injects this hardcoded user ID
|
||||||
const mockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
|
const mockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
|
||||||
|
|
||||||
async function buildContextApp(userId?: string) {
|
function buildContextApp(userId?: string) {
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
providers: [async () => createStubSource("weather", [], contextEntries)],
|
providers: [() => createStubSource("weather", [], contextEntries)],
|
||||||
})
|
})
|
||||||
const app = buildTestApp(manager, userId)
|
const app = buildTestApp(manager, userId)
|
||||||
const session = await manager.getOrCreate(mockUserId)
|
const session = manager.getOrCreate(mockUserId)
|
||||||
return { app, session }
|
return { app, session }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,7 +359,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when key param is missing", async () => {
|
test("returns 400 when key param is missing", async () => {
|
||||||
const { app } = await buildContextApp("user-1")
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
const res = await app.request("/api/context")
|
const res = await app.request("/api/context")
|
||||||
|
|
||||||
@@ -208,7 +369,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when key is invalid JSON", async () => {
|
test("returns 400 when key is invalid JSON", async () => {
|
||||||
const { app } = await buildContextApp("user-1")
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
const res = await app.request("/api/context?key=notjson")
|
const res = await app.request("/api/context?key=notjson")
|
||||||
|
|
||||||
@@ -218,7 +379,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when key is not an array", async () => {
|
test("returns 400 when key is not an array", async () => {
|
||||||
const { app } = await buildContextApp("user-1")
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
const res = await app.request('/api/context?key="string"')
|
const res = await app.request('/api/context?key="string"')
|
||||||
|
|
||||||
@@ -228,7 +389,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when key contains invalid element types", async () => {
|
test("returns 400 when key contains invalid element types", async () => {
|
||||||
const { app } = await buildContextApp("user-1")
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
const res = await app.request("/api/context?key=[true,null,[1,2]]")
|
const res = await app.request("/api/context?key=[true,null,[1,2]]")
|
||||||
|
|
||||||
@@ -238,7 +399,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when key is an empty array", async () => {
|
test("returns 400 when key is an empty array", async () => {
|
||||||
const { app } = await buildContextApp("user-1")
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
const res = await app.request("/api/context?key=[]")
|
const res = await app.request("/api/context?key=[]")
|
||||||
|
|
||||||
@@ -248,7 +409,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 400 when match param is invalid", async () => {
|
test("returns 400 when match param is invalid", async () => {
|
||||||
const { app } = await buildContextApp("user-1")
|
const { app } = buildContextApp("user-1")
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["aelis.weather"]&match=invalid')
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=invalid')
|
||||||
|
|
||||||
@@ -258,7 +419,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns exact match with match=exact", async () => {
|
test("returns exact match with match=exact", async () => {
|
||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["aelis.weather","weather"]&match=exact')
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]&match=exact')
|
||||||
@@ -270,7 +431,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 with match=exact when only prefix would match", async () => {
|
test("returns 404 with match=exact when only prefix would match", async () => {
|
||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["aelis.weather"]&match=exact')
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=exact')
|
||||||
@@ -279,7 +440,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns prefix match with match=prefix", async () => {
|
test("returns prefix match with match=prefix", async () => {
|
||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["aelis.weather"]&match=prefix')
|
const res = await app.request('/api/context?key=["aelis.weather"]&match=prefix')
|
||||||
@@ -296,7 +457,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("default mode returns exact match when available", async () => {
|
test("default mode returns exact match when available", async () => {
|
||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["aelis.weather","weather"]')
|
const res = await app.request('/api/context?key=["aelis.weather","weather"]')
|
||||||
@@ -308,7 +469,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("default mode falls back to prefix when no exact match", async () => {
|
test("default mode falls back to prefix when no exact match", async () => {
|
||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["aelis.weather"]')
|
const res = await app.request('/api/context?key=["aelis.weather"]')
|
||||||
@@ -324,7 +485,7 @@ describe("GET /api/context", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("returns 404 when neither exact nor prefix matches", async () => {
|
test("returns 404 when neither exact nor prefix matches", async () => {
|
||||||
const { app, session } = await buildContextApp("user-1")
|
const { app, session } = buildContextApp("user-1")
|
||||||
await session.engine.refresh()
|
await session.engine.refresh()
|
||||||
|
|
||||||
const res = await app.request('/api/context?key=["nonexistent"]')
|
const res = await app.request('/api/context?key=["nonexistent"]')
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { Context, Hono } from "hono"
|
import type { Context, Hono } from "hono"
|
||||||
|
|
||||||
import { contextKey } from "@aelis/core"
|
import { contextKey } from "@aelis/core"
|
||||||
|
import { render } from "@nym.sh/jrx"
|
||||||
import { createMiddleware } from "hono/factory"
|
import { createMiddleware } from "hono/factory"
|
||||||
|
|
||||||
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
@@ -33,17 +34,35 @@ export function registerFeedHttpHandlers(
|
|||||||
async function handleGetFeed(c: Context<Env>) {
|
async function handleGetFeed(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)
|
||||||
let session
|
|
||||||
try {
|
|
||||||
session = await sessionManager.getOrCreate(user.id)
|
|
||||||
} catch (err) {
|
|
||||||
console.error("[handleGetFeed] Failed to create session:", err)
|
|
||||||
return c.json({ error: "Service unavailable" }, 503)
|
|
||||||
}
|
|
||||||
|
|
||||||
const feed = await session.feed()
|
const feed = await session.feed()
|
||||||
|
|
||||||
|
const renderParam = c.req.query("render")
|
||||||
|
|
||||||
|
if (renderParam !== undefined) {
|
||||||
|
if (renderParam !== "json-render") {
|
||||||
|
return c.json({ error: `Unknown render format: "${renderParam}"` }, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!session.renderer) {
|
||||||
|
return c.json({ error: "Rendering is not available" }, 500)
|
||||||
|
}
|
||||||
|
|
||||||
|
const renderedItems = session.renderer.render(feed.items).map((item) => ({
|
||||||
|
...item,
|
||||||
|
ui: render(item.ui),
|
||||||
|
}))
|
||||||
|
|
||||||
|
return c.json({
|
||||||
|
items: renderedItems,
|
||||||
|
errors: feed.errors.map((e) => ({
|
||||||
|
sourceId: e.sourceId,
|
||||||
|
error: e.error.message,
|
||||||
|
})),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return c.json({
|
return c.json({
|
||||||
items: feed.items,
|
items: feed.items,
|
||||||
errors: feed.errors.map((e) => ({
|
errors: feed.errors.map((e) => ({
|
||||||
@@ -53,7 +72,7 @@ async function handleGetFeed(c: Context<Env>) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleGetContext(c: Context<Env>) {
|
function handleGetContext(c: Context<Env>) {
|
||||||
const keyParam = c.req.query("key")
|
const keyParam = c.req.query("key")
|
||||||
if (!keyParam) {
|
if (!keyParam) {
|
||||||
return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
|
return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
|
||||||
@@ -77,15 +96,7 @@ async function handleGetContext(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)
|
||||||
let session
|
|
||||||
try {
|
|
||||||
session = await sessionManager.getOrCreate(user.id)
|
|
||||||
} catch (err) {
|
|
||||||
console.error("[handleGetContext] Failed to create session:", err)
|
|
||||||
return c.json({ error: "Service unavailable" }, 503)
|
|
||||||
}
|
|
||||||
|
|
||||||
const context = session.engine.currentContext()
|
const context = session.engine.currentContext()
|
||||||
const key = contextKey(...parsed)
|
const key = contextKey(...parsed)
|
||||||
|
|
||||||
|
|||||||
@@ -44,15 +44,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)
|
||||||
let session
|
|
||||||
try {
|
|
||||||
session = await sessionManager.getOrCreate(user.id)
|
|
||||||
} catch (err) {
|
|
||||||
console.error("[handleUpdateLocation] Failed to create session:", err)
|
|
||||||
return c.json({ error: "Service unavailable" }, 503)
|
|
||||||
}
|
|
||||||
|
|
||||||
await session.engine.executeAction("aelis.location", "update-location", {
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: result.lat,
|
lat: result.lat,
|
||||||
lng: result.lng,
|
lng: result.lng,
|
||||||
|
|||||||
@@ -2,12 +2,14 @@ import { LocationSource } from "@aelis/source-location"
|
|||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
|
|
||||||
import { registerAuthHandlers } from "./auth/http.ts"
|
import { registerAuthHandlers } from "./auth/http.ts"
|
||||||
import { requireSession } from "./auth/session-middleware.ts"
|
import { mockAuthSessionMiddleware, requireSession } from "./auth/session-middleware.ts"
|
||||||
|
import { CALDAV_SOURCE_ID, calDavRenderer } from "./caldav/renderer-provider.ts"
|
||||||
import { registerFeedHttpHandlers } from "./engine/http.ts"
|
import { registerFeedHttpHandlers } from "./engine/http.ts"
|
||||||
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
||||||
import { createLlmClient } from "./enhancement/llm-client.ts"
|
import { createLlmClient } from "./enhancement/llm-client.ts"
|
||||||
import { registerLocationHttpHandlers } from "./location/http.ts"
|
import { registerLocationHttpHandlers } from "./location/http.ts"
|
||||||
import { UserSessionManager } from "./session/index.ts"
|
import { FeedRenderer, UserSessionManager } from "./session/index.ts"
|
||||||
|
import { TFL_SOURCE_ID, tflRenderer } from "./tfl/renderer-provider.ts"
|
||||||
import { WeatherSourceProvider } from "./weather/provider.ts"
|
import { WeatherSourceProvider } from "./weather/provider.ts"
|
||||||
|
|
||||||
function main() {
|
function main() {
|
||||||
@@ -24,9 +26,14 @@ function main() {
|
|||||||
console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
|
console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const allRenderers = {
|
||||||
|
[TFL_SOURCE_ID]: tflRenderer,
|
||||||
|
[CALDAV_SOURCE_ID]: calDavRenderer,
|
||||||
|
}
|
||||||
|
|
||||||
const sessionManager = new UserSessionManager({
|
const sessionManager = new UserSessionManager({
|
||||||
providers: [
|
providers: [
|
||||||
async () => new LocationSource(),
|
() => new LocationSource(),
|
||||||
new WeatherSourceProvider({
|
new WeatherSourceProvider({
|
||||||
credentials: {
|
credentials: {
|
||||||
privateKey: process.env.WEATHERKIT_PRIVATE_KEY!,
|
privateKey: process.env.WEATHERKIT_PRIVATE_KEY!,
|
||||||
@@ -36,6 +43,9 @@ function main() {
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
rendererProvider: {
|
||||||
|
feedRendererForUser: (_userId) => new FeedRenderer(allRenderers),
|
||||||
|
},
|
||||||
feedEnhancer,
|
feedEnhancer,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -43,11 +53,16 @@ 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: requireSession,
|
authSessionMiddleware,
|
||||||
})
|
})
|
||||||
registerLocationHttpHandlers(app, { sessionManager })
|
registerLocationHttpHandlers(app, { sessionManager })
|
||||||
|
|
||||||
|
|||||||
30
apps/aelis-backend/src/session/feed-renderer.ts
Normal file
30
apps/aelis-backend/src/session/feed-renderer.ts
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
import type { FeedItem, FeedItemRenderer, RenderedFeedItem } from "@aelis/core"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders feed items using registered renderers.
|
||||||
|
*
|
||||||
|
* Constructed with a map of source ID to renderer function.
|
||||||
|
* Items whose source has no renderer are silently dropped.
|
||||||
|
*/
|
||||||
|
export class FeedRenderer {
|
||||||
|
private readonly renderers: Map<string, FeedItemRenderer>
|
||||||
|
|
||||||
|
constructor(renderers: Record<string, FeedItemRenderer>) {
|
||||||
|
this.renderers = new Map(Object.entries(renderers))
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders an array of feed items. Items whose sourceId has no
|
||||||
|
* registered renderer are silently dropped from the result.
|
||||||
|
*/
|
||||||
|
render(items: FeedItem[]): RenderedFeedItem[] {
|
||||||
|
const result: RenderedFeedItem[] = []
|
||||||
|
for (const item of items) {
|
||||||
|
const renderer = this.renderers.get(item.sourceId)
|
||||||
|
if (renderer) {
|
||||||
|
result.push({ ...item, ui: renderer(item) })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
import type { FeedSource } from "@aelis/core"
|
import type { FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
export interface FeedSourceProvider {
|
export interface FeedSourceProvider {
|
||||||
feedSourceForUser(userId: string): Promise<FeedSource>
|
feedSourceForUser(userId: string): FeedSource
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FeedSourceProviderFn = (userId: string) => Promise<FeedSource>
|
export type FeedSourceProviderFn = (userId: string) => FeedSource
|
||||||
|
|
||||||
export type FeedSourceProviderInput = FeedSourceProvider | FeedSourceProviderFn
|
export type FeedSourceProviderInput = FeedSourceProvider | FeedSourceProviderFn
|
||||||
|
|||||||
@@ -3,5 +3,7 @@ export type {
|
|||||||
FeedSourceProviderFn,
|
FeedSourceProviderFn,
|
||||||
FeedSourceProviderInput,
|
FeedSourceProviderInput,
|
||||||
} from "./feed-source-provider.ts"
|
} from "./feed-source-provider.ts"
|
||||||
|
export { FeedRenderer } from "./feed-renderer.ts"
|
||||||
|
export type { FeedRendererProvider } from "./renderer-provider.ts"
|
||||||
export { UserSession } from "./user-session.ts"
|
export { UserSession } from "./user-session.ts"
|
||||||
export { UserSessionManager } from "./user-session-manager.ts"
|
export { UserSessionManager } from "./user-session-manager.ts"
|
||||||
|
|||||||
5
apps/aelis-backend/src/session/renderer-provider.ts
Normal file
5
apps/aelis-backend/src/session/renderer-provider.ts
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
import type { FeedRenderer } from "./feed-renderer.ts"
|
||||||
|
|
||||||
|
export interface FeedRendererProvider {
|
||||||
|
feedRendererForUser(userId: string): FeedRenderer
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { WeatherKitClient, WeatherKitResponse } from "@aelis/source-weatherkit"
|
import type { WeatherKitClient, WeatherKitResponse } from "@aelis/source-weatherkit"
|
||||||
|
|
||||||
import { LocationSource } from "@aelis/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
import { describe, expect, mock, spyOn, test } from "bun:test"
|
import { describe, expect, mock, test } from "bun:test"
|
||||||
|
|
||||||
import { WeatherSourceProvider } from "../weather/provider.ts"
|
import { WeatherSourceProvider } from "../weather/provider.ts"
|
||||||
import { UserSessionManager } from "./user-session-manager.ts"
|
import { UserSessionManager } from "./user-session-manager.ts"
|
||||||
@@ -11,38 +11,38 @@ const mockWeatherClient: WeatherKitClient = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe("UserSessionManager", () => {
|
describe("UserSessionManager", () => {
|
||||||
test("getOrCreate creates session on first call", async () => {
|
test("getOrCreate creates session on first call", () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session).toBeDefined()
|
expect(session).toBeDefined()
|
||||||
expect(session.engine).toBeDefined()
|
expect(session.engine).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("getOrCreate returns same session for same user", async () => {
|
test("getOrCreate returns same session for same user", () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
const session2 = await manager.getOrCreate("user-1")
|
const session2 = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session1).toBe(session2)
|
expect(session1).toBe(session2)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("getOrCreate returns different sessions for different users", async () => {
|
test("getOrCreate returns different sessions for different users", () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
const session2 = await manager.getOrCreate("user-2")
|
const session2 = manager.getOrCreate("user-2")
|
||||||
|
|
||||||
expect(session1).not.toBe(session2)
|
expect(session1).not.toBe(session2)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("each user gets independent source instances", async () => {
|
test("each user gets independent source instances", () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
const session2 = await manager.getOrCreate("user-2")
|
const session2 = manager.getOrCreate("user-2")
|
||||||
|
|
||||||
const source1 = session1.getSource<LocationSource>("aelis.location")
|
const source1 = session1.getSource<LocationSource>("aelis.location")
|
||||||
const source2 = session2.getSource<LocationSource>("aelis.location")
|
const source2 = session2.getSource<LocationSource>("aelis.location")
|
||||||
@@ -50,58 +50,58 @@ describe("UserSessionManager", () => {
|
|||||||
expect(source1).not.toBe(source2)
|
expect(source1).not.toBe(source2)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("remove destroys session and allows re-creation", async () => {
|
test("remove destroys session and allows re-creation", () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session1 = await manager.getOrCreate("user-1")
|
const session1 = manager.getOrCreate("user-1")
|
||||||
manager.remove("user-1")
|
manager.remove("user-1")
|
||||||
const session2 = await manager.getOrCreate("user-1")
|
const session2 = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session1).not.toBe(session2)
|
expect(session1).not.toBe(session2)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("remove is no-op for unknown user", () => {
|
test("remove is no-op for unknown user", () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
expect(() => manager.remove("unknown")).not.toThrow()
|
expect(() => manager.remove("unknown")).not.toThrow()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("accepts function providers", async () => {
|
test("accepts function providers", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
const result = await session.engine.refresh()
|
const result = await session.engine.refresh()
|
||||||
|
|
||||||
expect(result.errors).toHaveLength(0)
|
expect(result.errors).toHaveLength(0)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("accepts object providers", async () => {
|
test("accepts object providers", () => {
|
||||||
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
providers: [async () => new LocationSource(), provider],
|
providers: [() => new LocationSource(), provider],
|
||||||
})
|
})
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session.getSource("aelis.weather")).toBeDefined()
|
expect(session.getSource("aelis.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("accepts mixed providers", async () => {
|
test("accepts mixed providers", () => {
|
||||||
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
const provider = new WeatherSourceProvider({ client: mockWeatherClient })
|
||||||
const manager = new UserSessionManager({
|
const manager = new UserSessionManager({
|
||||||
providers: [async () => new LocationSource(), provider],
|
providers: [() => new LocationSource(), provider],
|
||||||
})
|
})
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
|
|
||||||
expect(session.getSource("aelis.location")).toBeDefined()
|
expect(session.getSource("aelis.location")).toBeDefined()
|
||||||
expect(session.getSource("aelis.weather")).toBeDefined()
|
expect(session.getSource("aelis.weather")).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("refresh returns feed result through session", async () => {
|
test("refresh returns feed result through session", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
const result = await session.engine.refresh()
|
const result = await session.engine.refresh()
|
||||||
|
|
||||||
expect(result).toHaveProperty("context")
|
expect(result).toHaveProperty("context")
|
||||||
@@ -111,9 +111,9 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("location update via executeAction works", async () => {
|
test("location update via executeAction works", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
await session.engine.executeAction("aelis.location", "update-location", {
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
@@ -126,10 +126,10 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("subscribe receives updates after location push", async () => {
|
test("subscribe receives updates after location push", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
const callback = mock()
|
const callback = mock()
|
||||||
|
|
||||||
const session = await 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("aelis.location", "update-location", {
|
||||||
@@ -146,16 +146,16 @@ describe("UserSessionManager", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("remove stops reactive updates", async () => {
|
test("remove stops reactive updates", async () => {
|
||||||
const manager = new UserSessionManager({ providers: [async () => new LocationSource()] })
|
const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
|
||||||
const callback = mock()
|
const callback = mock()
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
const session = manager.getOrCreate("user-1")
|
||||||
session.engine.subscribe(callback)
|
session.engine.subscribe(callback)
|
||||||
|
|
||||||
manager.remove("user-1")
|
manager.remove("user-1")
|
||||||
|
|
||||||
// Create new session and push location — old callback should not fire
|
// Create new session and push location — old callback should not fire
|
||||||
const session2 = await manager.getOrCreate("user-1")
|
const session2 = manager.getOrCreate("user-1")
|
||||||
await session2.engine.executeAction("aelis.location", "update-location", {
|
await session2.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: 51.5074,
|
lat: 51.5074,
|
||||||
lng: -0.1278,
|
lng: -0.1278,
|
||||||
@@ -167,93 +167,4 @@ describe("UserSessionManager", () => {
|
|||||||
|
|
||||||
expect(callback).not.toHaveBeenCalled()
|
expect(callback).not.toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("creates session with successful providers when some fail", async () => {
|
|
||||||
const manager = new UserSessionManager({
|
|
||||||
providers: [
|
|
||||||
async () => new LocationSource(),
|
|
||||||
async () => {
|
|
||||||
throw new Error("provider failed")
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
const spy = spyOn(console, "error").mockImplementation(() => {})
|
|
||||||
|
|
||||||
const session = await manager.getOrCreate("user-1")
|
|
||||||
|
|
||||||
expect(session).toBeDefined()
|
|
||||||
expect(session.getSource("aelis.location")).toBeDefined()
|
|
||||||
expect(spy).toHaveBeenCalled()
|
|
||||||
|
|
||||||
spy.mockRestore()
|
|
||||||
})
|
|
||||||
|
|
||||||
test("throws AggregateError when all providers fail", async () => {
|
|
||||||
const manager = new UserSessionManager({
|
|
||||||
providers: [
|
|
||||||
async () => {
|
|
||||||
throw new Error("first failed")
|
|
||||||
},
|
|
||||||
async () => {
|
|
||||||
throw new Error("second failed")
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
await expect(manager.getOrCreate("user-1")).rejects.toBeInstanceOf(AggregateError)
|
|
||||||
})
|
|
||||||
|
|
||||||
test("concurrent getOrCreate for same user returns same session", async () => {
|
|
||||||
let callCount = 0
|
|
||||||
const manager = new UserSessionManager({
|
|
||||||
providers: [
|
|
||||||
async () => {
|
|
||||||
callCount++
|
|
||||||
// Simulate async work to widen the race window
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
|
||||||
return new LocationSource()
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
const [session1, session2] = await Promise.all([
|
|
||||||
manager.getOrCreate("user-1"),
|
|
||||||
manager.getOrCreate("user-1"),
|
|
||||||
])
|
|
||||||
|
|
||||||
expect(session1).toBe(session2)
|
|
||||||
expect(callCount).toBe(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
test("remove during in-flight getOrCreate prevents session from being stored", async () => {
|
|
||||||
let resolveProvider: () => void
|
|
||||||
const providerGate = new Promise<void>((r) => {
|
|
||||||
resolveProvider = r
|
|
||||||
})
|
|
||||||
|
|
||||||
const manager = new UserSessionManager({
|
|
||||||
providers: [
|
|
||||||
async () => {
|
|
||||||
await providerGate
|
|
||||||
return new LocationSource()
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
const sessionPromise = manager.getOrCreate("user-1")
|
|
||||||
|
|
||||||
// remove() while provider is still resolving
|
|
||||||
manager.remove("user-1")
|
|
||||||
|
|
||||||
// Let the provider finish
|
|
||||||
resolveProvider!()
|
|
||||||
|
|
||||||
await expect(sessionPromise).rejects.toThrow("removed during creation")
|
|
||||||
|
|
||||||
// A fresh getOrCreate should produce a new session, not the cancelled one
|
|
||||||
const freshSession = await manager.getOrCreate("user-1")
|
|
||||||
expect(freshSession).toBeDefined()
|
|
||||||
expect(freshSession.engine).toBeDefined()
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,48 +1,41 @@
|
|||||||
import type { FeedSource } from "@aelis/core"
|
|
||||||
|
|
||||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||||
import type { FeedSourceProviderInput } from "./feed-source-provider.ts"
|
import type { FeedSourceProviderInput } from "./feed-source-provider.ts"
|
||||||
|
import type { FeedRendererProvider } from "./renderer-provider.ts"
|
||||||
|
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
|
|
||||||
export interface UserSessionManagerConfig {
|
export interface UserSessionManagerConfig {
|
||||||
providers: FeedSourceProviderInput[]
|
providers: FeedSourceProviderInput[]
|
||||||
|
rendererProvider?: FeedRendererProvider | null
|
||||||
feedEnhancer?: FeedEnhancer | null
|
feedEnhancer?: FeedEnhancer | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UserSessionManager {
|
export class UserSessionManager {
|
||||||
private sessions = new Map<string, UserSession>()
|
private sessions = new Map<string, UserSession>()
|
||||||
private pending = new Map<string, Promise<UserSession>>()
|
|
||||||
private readonly providers: FeedSourceProviderInput[]
|
private readonly providers: FeedSourceProviderInput[]
|
||||||
|
private readonly rendererProvider: FeedRendererProvider | null
|
||||||
private readonly feedEnhancer: FeedEnhancer | null
|
private readonly feedEnhancer: FeedEnhancer | null
|
||||||
|
|
||||||
constructor(config: UserSessionManagerConfig) {
|
constructor(config: UserSessionManagerConfig) {
|
||||||
this.providers = config.providers
|
this.providers = config.providers
|
||||||
|
this.rendererProvider = config.rendererProvider ?? null
|
||||||
this.feedEnhancer = config.feedEnhancer ?? null
|
this.feedEnhancer = config.feedEnhancer ?? null
|
||||||
}
|
}
|
||||||
|
|
||||||
async getOrCreate(userId: string): Promise<UserSession> {
|
getOrCreate(userId: string): UserSession {
|
||||||
const existing = this.sessions.get(userId)
|
let session = this.sessions.get(userId)
|
||||||
if (existing) return existing
|
if (!session) {
|
||||||
|
const sources = this.providers.map((p) =>
|
||||||
const inflight = this.pending.get(userId)
|
typeof p === "function" ? p(userId) : p.feedSourceForUser(userId),
|
||||||
if (inflight) return inflight
|
)
|
||||||
|
session = new UserSession({
|
||||||
const promise = this.createSession(userId)
|
sources,
|
||||||
this.pending.set(userId, promise)
|
enhancer: this.feedEnhancer,
|
||||||
try {
|
renderer: this.rendererProvider?.feedRendererForUser(userId) ?? null,
|
||||||
const session = await promise
|
})
|
||||||
// If remove() was called while we were awaiting, it clears the
|
|
||||||
// pending entry. Detect that and destroy the session immediately.
|
|
||||||
if (!this.pending.has(userId)) {
|
|
||||||
session.destroy()
|
|
||||||
throw new Error(`Session for user ${userId} was removed during creation`)
|
|
||||||
}
|
|
||||||
this.sessions.set(userId, session)
|
this.sessions.set(userId, session)
|
||||||
return session
|
|
||||||
} finally {
|
|
||||||
this.pending.delete(userId)
|
|
||||||
}
|
}
|
||||||
|
return session
|
||||||
}
|
}
|
||||||
|
|
||||||
remove(userId: string): void {
|
remove(userId: string): void {
|
||||||
@@ -51,36 +44,5 @@ export class UserSessionManager {
|
|||||||
session.destroy()
|
session.destroy()
|
||||||
this.sessions.delete(userId)
|
this.sessions.delete(userId)
|
||||||
}
|
}
|
||||||
// Cancel any in-flight creation so getOrCreate won't store the session
|
|
||||||
this.pending.delete(userId)
|
|
||||||
}
|
|
||||||
|
|
||||||
private async createSession(userId: string): Promise<UserSession> {
|
|
||||||
const results = await Promise.allSettled(
|
|
||||||
this.providers.map((p) =>
|
|
||||||
typeof p === "function" ? p(userId) : p.feedSourceForUser(userId),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
const sources: FeedSource[] = []
|
|
||||||
const errors: unknown[] = []
|
|
||||||
|
|
||||||
for (const result of results) {
|
|
||||||
if (result.status === "fulfilled") {
|
|
||||||
sources.push(result.value)
|
|
||||||
} else {
|
|
||||||
errors.push(result.reason)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sources.length === 0 && errors.length > 0) {
|
|
||||||
throw new AggregateError(errors, "All feed source providers failed")
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const error of errors) {
|
|
||||||
console.error("[UserSessionManager] Feed source provider failed:", error)
|
|
||||||
}
|
|
||||||
|
|
||||||
return new UserSession(sources, this.feedEnhancer)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,16 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
|
import type {
|
||||||
|
ActionDefinition,
|
||||||
|
ContextEntry,
|
||||||
|
FeedItem,
|
||||||
|
FeedItemRenderer,
|
||||||
|
FeedSource,
|
||||||
|
} from "@aelis/core"
|
||||||
|
|
||||||
import { LocationSource } from "@aelis/source-location"
|
import { LocationSource } from "@aelis/source-location"
|
||||||
|
import { JRX_NODE } from "@nym.sh/jrx"
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
|
import { FeedRenderer } from "./feed-renderer.ts"
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
|
|
||||||
function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
||||||
@@ -25,7 +33,9 @@ function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
|||||||
|
|
||||||
describe("UserSession", () => {
|
describe("UserSession", () => {
|
||||||
test("registers sources and starts engine", async () => {
|
test("registers sources and starts engine", async () => {
|
||||||
const session = new UserSession([createStubSource("test-a"), createStubSource("test-b")])
|
const session = new UserSession({
|
||||||
|
sources: [createStubSource("test-a"), createStubSource("test-b")],
|
||||||
|
})
|
||||||
|
|
||||||
const result = await session.engine.refresh()
|
const result = await session.engine.refresh()
|
||||||
|
|
||||||
@@ -34,7 +44,7 @@ describe("UserSession", () => {
|
|||||||
|
|
||||||
test("getSource returns registered source", () => {
|
test("getSource returns registered source", () => {
|
||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession([location])
|
const session = new UserSession({ sources: [location] })
|
||||||
|
|
||||||
const result = session.getSource<LocationSource>("aelis.location")
|
const result = session.getSource<LocationSource>("aelis.location")
|
||||||
|
|
||||||
@@ -42,13 +52,13 @@ describe("UserSession", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("getSource returns undefined for unknown source", () => {
|
test("getSource returns undefined for unknown source", () => {
|
||||||
const session = new UserSession([createStubSource("test")])
|
const session = new UserSession({ sources: [createStubSource("test")] })
|
||||||
|
|
||||||
expect(session.getSource("unknown")).toBeUndefined()
|
expect(session.getSource("unknown")).toBeUndefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("destroy stops engine and clears sources", () => {
|
test("destroy stops engine and clears sources", () => {
|
||||||
const session = new UserSession([createStubSource("test")])
|
const session = new UserSession({ sources: [createStubSource("test")] })
|
||||||
|
|
||||||
session.destroy()
|
session.destroy()
|
||||||
|
|
||||||
@@ -57,7 +67,7 @@ describe("UserSession", () => {
|
|||||||
|
|
||||||
test("engine.executeAction routes to correct source", async () => {
|
test("engine.executeAction routes to correct source", async () => {
|
||||||
const location = new LocationSource()
|
const location = new LocationSource()
|
||||||
const session = new UserSession([location])
|
const session = new UserSession({ sources: [location] })
|
||||||
|
|
||||||
await session.engine.executeAction("aelis.location", "update-location", {
|
await session.engine.executeAction("aelis.location", "update-location", {
|
||||||
lat: 51.5,
|
lat: 51.5,
|
||||||
@@ -82,7 +92,7 @@ describe("UserSession.feed", () => {
|
|||||||
data: { value: 42 },
|
data: { value: 42 },
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
const session = new UserSession([createStubSource("test", items)])
|
const session = new UserSession({ sources: [createStubSource("test", items)] })
|
||||||
|
|
||||||
const result = await session.feed()
|
const result = await session.feed()
|
||||||
|
|
||||||
@@ -103,7 +113,7 @@ describe("UserSession.feed", () => {
|
|||||||
const enhancer = async (feedItems: FeedItem[]) =>
|
const enhancer = async (feedItems: FeedItem[]) =>
|
||||||
feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
||||||
|
|
||||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
|
||||||
|
|
||||||
const result = await session.feed()
|
const result = await session.feed()
|
||||||
|
|
||||||
@@ -127,7 +137,7 @@ describe("UserSession.feed", () => {
|
|||||||
return feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
return feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
|
||||||
|
|
||||||
const result1 = await session.feed()
|
const result1 = await session.feed()
|
||||||
expect(result1.items[0]!.data.enhanced).toBe(true)
|
expect(result1.items[0]!.data.enhanced).toBe(true)
|
||||||
@@ -162,7 +172,7 @@ describe("UserSession.feed", () => {
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = new UserSession([source], enhancer)
|
const session = new UserSession({ sources: [source], enhancer })
|
||||||
|
|
||||||
// First feed triggers refresh + enhancement
|
// First feed triggers refresh + enhancement
|
||||||
const result1 = await session.feed()
|
const result1 = await session.feed()
|
||||||
@@ -205,7 +215,7 @@ describe("UserSession.feed", () => {
|
|||||||
throw new Error("enhancement exploded")
|
throw new Error("enhancement exploded")
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = new UserSession([createStubSource("test", items)], enhancer)
|
const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
|
||||||
|
|
||||||
const result = await session.feed()
|
const result = await session.feed()
|
||||||
|
|
||||||
@@ -214,3 +224,81 @@ describe("UserSession.feed", () => {
|
|||||||
expect(result.items[0]!.data.value).toBe(42)
|
expect(result.items[0]!.data.value).toBe(42)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("FeedRenderer", () => {
|
||||||
|
const stubRenderer: FeedItemRenderer = (item) => ({
|
||||||
|
$$typeof: JRX_NODE,
|
||||||
|
type: "FeedCard",
|
||||||
|
props: { content: item.data.value },
|
||||||
|
children: [],
|
||||||
|
key: undefined,
|
||||||
|
visible: undefined,
|
||||||
|
on: undefined,
|
||||||
|
repeat: undefined,
|
||||||
|
watch: undefined,
|
||||||
|
})
|
||||||
|
|
||||||
|
function makeItem(sourceId: string): FeedItem {
|
||||||
|
return {
|
||||||
|
id: `item-${sourceId}`,
|
||||||
|
sourceId,
|
||||||
|
type: "some-type",
|
||||||
|
timestamp: new Date("2025-01-01T00:00:00.000Z"),
|
||||||
|
data: { value: 42 },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
test("renders items with matching sourceId", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
const result = renderer.render([makeItem("test-source")])
|
||||||
|
|
||||||
|
expect(result).toHaveLength(1)
|
||||||
|
expect(result[0]!.ui).toBeDefined()
|
||||||
|
expect(result[0]!.id).toBe("item-test-source")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("drops items without a matching renderer", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
const result = renderer.render([makeItem("unknown-source")])
|
||||||
|
|
||||||
|
expect(result).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("filters mixed items", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
const result = renderer.render([makeItem("test-source"), makeItem("unknown-source")])
|
||||||
|
|
||||||
|
expect(result).toHaveLength(1)
|
||||||
|
expect(result[0]!.id).toBe("item-test-source")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("renders empty array for empty input", () => {
|
||||||
|
const renderer = new FeedRenderer({ "test-source": stubRenderer })
|
||||||
|
|
||||||
|
expect(renderer.render([])).toHaveLength(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("renders with no renderers registered", () => {
|
||||||
|
const renderer = new FeedRenderer({})
|
||||||
|
|
||||||
|
expect(renderer.render([makeItem("test-source")])).toHaveLength(0)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("UserSession.renderer", () => {
|
||||||
|
test("exposes renderer when provided", () => {
|
||||||
|
const renderer = new FeedRenderer({})
|
||||||
|
const session = new UserSession({ sources: [createStubSource("test")], renderer })
|
||||||
|
|
||||||
|
expect(session.renderer).toBe(renderer)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("renderer is null when not provided", () => {
|
||||||
|
const session = new UserSession({ sources: [createStubSource("test")] })
|
||||||
|
|
||||||
|
expect(session.renderer).toBeNull()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
@@ -1,9 +1,17 @@
|
|||||||
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
|
import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
|
||||||
|
|
||||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||||
|
import type { FeedRenderer } from "./feed-renderer.ts"
|
||||||
|
|
||||||
|
export interface UserSessionOptions {
|
||||||
|
sources: FeedSource[]
|
||||||
|
enhancer?: FeedEnhancer | null
|
||||||
|
renderer?: FeedRenderer | null
|
||||||
|
}
|
||||||
|
|
||||||
export class UserSession {
|
export class UserSession {
|
||||||
readonly engine: FeedEngine
|
readonly engine: FeedEngine
|
||||||
|
readonly renderer: FeedRenderer | null
|
||||||
private sources = new Map<string, FeedSource>()
|
private sources = new Map<string, FeedSource>()
|
||||||
private readonly enhancer: FeedEnhancer | null
|
private readonly enhancer: FeedEnhancer | null
|
||||||
private enhancedItems: FeedItem[] | null = null
|
private enhancedItems: FeedItem[] | null = null
|
||||||
@@ -12,10 +20,11 @@ export class UserSession {
|
|||||||
private enhancingPromise: Promise<void> | null = null
|
private enhancingPromise: Promise<void> | null = null
|
||||||
private unsubscribe: (() => void) | null = null
|
private unsubscribe: (() => void) | null = null
|
||||||
|
|
||||||
constructor(sources: FeedSource[], enhancer?: FeedEnhancer | null) {
|
constructor(options: UserSessionOptions) {
|
||||||
this.engine = new FeedEngine()
|
this.engine = new FeedEngine()
|
||||||
this.enhancer = enhancer ?? null
|
this.enhancer = options.enhancer ?? null
|
||||||
for (const source of sources) {
|
this.renderer = options.renderer ?? null
|
||||||
|
for (const source of options.sources) {
|
||||||
this.sources.set(source.id, source)
|
this.sources.set(source.id, source)
|
||||||
this.engine.register(source)
|
this.engine.register(source)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export class TflSourceProvider implements FeedSourceProvider {
|
|||||||
this.options = options
|
this.options = options
|
||||||
}
|
}
|
||||||
|
|
||||||
async feedSourceForUser(_userId: string): Promise<TflSource> {
|
feedSourceForUser(_userId: string): TflSource {
|
||||||
return new TflSource(this.options)
|
return new TflSource(this.options)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
7
apps/aelis-backend/src/tfl/renderer-provider.ts
Normal file
7
apps/aelis-backend/src/tfl/renderer-provider.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import type { FeedItemRenderer } from "@aelis/core"
|
||||||
|
|
||||||
|
import { renderTflAlert } from "@aelis/source-tfl"
|
||||||
|
|
||||||
|
export const TFL_SOURCE_ID = "aelis.tfl"
|
||||||
|
|
||||||
|
export const tflRenderer: FeedItemRenderer = renderTflAlert as FeedItemRenderer
|
||||||
@@ -9,7 +9,7 @@ export class WeatherSourceProvider implements FeedSourceProvider {
|
|||||||
this.options = options
|
this.options = options
|
||||||
}
|
}
|
||||||
|
|
||||||
async feedSourceForUser(_userId: string): Promise<WeatherSource> {
|
feedSourceForUser(_userId: string): WeatherSource {
|
||||||
return new WeatherSource(this.options)
|
return new WeatherSource(this.options)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
"@react-navigation/bottom-tabs": "^7.4.0",
|
"@react-navigation/bottom-tabs": "^7.4.0",
|
||||||
"@react-navigation/elements": "^2.6.3",
|
"@react-navigation/elements": "^2.6.3",
|
||||||
"@react-navigation/native": "^7.1.8",
|
"@react-navigation/native": "^7.1.8",
|
||||||
"@tanstack/react-query": "^5.90.21",
|
|
||||||
"expo": "~54.0.33",
|
"expo": "~54.0.33",
|
||||||
"expo-constants": "~18.0.13",
|
"expo-constants": "~18.0.13",
|
||||||
"expo-dev-client": "~6.0.20",
|
"expo-dev-client": "~6.0.20",
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
import { ApiRequestMiddleware } from "./client"
|
|
||||||
|
|
||||||
export const authMiddleware: ApiRequestMiddleware = (_url, init) => {
|
|
||||||
// TODO: placeholder auth middleware
|
|
||||||
return init
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
import { createContext, useContext } from "react"
|
|
||||||
|
|
||||||
export type ApiRequestMiddleware = (
|
|
||||||
url: Parameters<typeof fetch>[0],
|
|
||||||
init: RequestInit,
|
|
||||||
) => RequestInit
|
|
||||||
|
|
||||||
export class ApiClient {
|
|
||||||
private readonly baseUrl: string
|
|
||||||
private readonly middlewares: readonly ApiRequestMiddleware[]
|
|
||||||
|
|
||||||
static noop = new ApiClient({ baseUrl: "" })
|
|
||||||
|
|
||||||
constructor({
|
|
||||||
baseUrl,
|
|
||||||
middlewares = [],
|
|
||||||
}: {
|
|
||||||
baseUrl: string
|
|
||||||
middlewares?: ApiRequestMiddleware[]
|
|
||||||
}) {
|
|
||||||
this.baseUrl = baseUrl
|
|
||||||
this.middlewares = middlewares
|
|
||||||
}
|
|
||||||
|
|
||||||
async request<T>(...[url, init = {}]: Parameters<typeof fetch>): Promise<[Response, T]> {
|
|
||||||
const finalInit = this.middlewares.reduce(
|
|
||||||
(prevInit, middleware) => middleware(url, prevInit),
|
|
||||||
init,
|
|
||||||
)
|
|
||||||
return fetch(this.baseUrl ? new URL(url.toString(), this.baseUrl) : url, finalInit).then((res) =>
|
|
||||||
Promise.all([Promise.resolve(res), res.json()]),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ApiClientContext = createContext(ApiClient.noop)
|
|
||||||
export function useApiClient() {
|
|
||||||
return useContext(ApiClientContext)
|
|
||||||
}
|
|
||||||
@@ -1,29 +1,17 @@
|
|||||||
import "react-native-reanimated"
|
import "react-native-reanimated"
|
||||||
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
|
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
import { StatusBar } from "expo-status-bar"
|
import { StatusBar } from "expo-status-bar"
|
||||||
import React from "react"
|
|
||||||
import { useColorScheme } from "react-native"
|
import { useColorScheme } from "react-native"
|
||||||
import tw, { useDeviceContext } from "twrnc"
|
import tw, { useDeviceContext } from "twrnc"
|
||||||
|
|
||||||
import { authMiddleware } from "@/api/auth-middleware"
|
|
||||||
import { ApiClient, ApiClientContext } from "@/api/client"
|
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
|
||||||
const apiClient = new ApiClient({
|
|
||||||
baseUrl: process.env.EXPO_PUBLIC_API_BASE_URL ?? "",
|
|
||||||
middlewares: [authMiddleware],
|
|
||||||
})
|
|
||||||
|
|
||||||
export default function RootLayout() {
|
export default function RootLayout() {
|
||||||
useDeviceContext(tw)
|
useDeviceContext(tw)
|
||||||
|
|
||||||
const colorScheme = useColorScheme()
|
const colorScheme = useColorScheme()
|
||||||
const headerBg = colorScheme === "dark" ? "#1c1917" : "#f5f5f4"
|
const headerBg = colorScheme === "dark" ? "#1c1917" : "#f5f5f4"
|
||||||
const headerTint = colorScheme === "dark" ? "#e7e5e4" : "#1c1917"
|
const headerTint = colorScheme === "dark" ? "#e7e5e4" : "#1c1917"
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ContextProvider>
|
<>
|
||||||
<Stack
|
<Stack
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
@@ -52,14 +40,6 @@ export default function RootLayout() {
|
|||||||
/>
|
/>
|
||||||
</Stack>
|
</Stack>
|
||||||
<StatusBar style="auto" />
|
<StatusBar style="auto" />
|
||||||
</ContextProvider>
|
</>
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function ContextProvider({ children }: React.PropsWithChildren) {
|
|
||||||
return (
|
|
||||||
<QueryClientProvider client={queryClient}>
|
|
||||||
<ApiClientContext value={apiClient}>{children}</ApiClientContext>
|
|
||||||
</QueryClientProvider>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
import { queryOptions } from "@tanstack/react-query"
|
|
||||||
|
|
||||||
import { useApiClient } from "@/api/client"
|
|
||||||
|
|
||||||
import { FeedItem } from "./types"
|
|
||||||
|
|
||||||
export function useFeedQuery() {
|
|
||||||
const api = useApiClient()
|
|
||||||
return queryOptions({
|
|
||||||
queryKey: ["feed"],
|
|
||||||
queryFn: async () => api.request<{ items: FeedItem[] }>("/feed?render=json-render"),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
import { Spec } from "@json-render/core"
|
|
||||||
|
|
||||||
export interface FeedItem {
|
|
||||||
ui: Spec
|
|
||||||
}
|
|
||||||
6
bun.lock
6
bun.lock
@@ -25,6 +25,7 @@
|
|||||||
"@aelis/source-location": "workspace:*",
|
"@aelis/source-location": "workspace:*",
|
||||||
"@aelis/source-tfl": "workspace:*",
|
"@aelis/source-tfl": "workspace:*",
|
||||||
"@aelis/source-weatherkit": "workspace:*",
|
"@aelis/source-weatherkit": "workspace:*",
|
||||||
|
"@nym.sh/jrx": "^0.2.0",
|
||||||
"@openrouter/sdk": "^0.9.11",
|
"@openrouter/sdk": "^0.9.11",
|
||||||
"arktype": "^2.1.29",
|
"arktype": "^2.1.29",
|
||||||
"better-auth": "^1",
|
"better-auth": "^1",
|
||||||
@@ -46,7 +47,6 @@
|
|||||||
"@react-navigation/bottom-tabs": "^7.4.0",
|
"@react-navigation/bottom-tabs": "^7.4.0",
|
||||||
"@react-navigation/elements": "^2.6.3",
|
"@react-navigation/elements": "^2.6.3",
|
||||||
"@react-navigation/native": "^7.1.8",
|
"@react-navigation/native": "^7.1.8",
|
||||||
"@tanstack/react-query": "^5.90.21",
|
|
||||||
"expo": "~54.0.33",
|
"expo": "~54.0.33",
|
||||||
"expo-constants": "~18.0.13",
|
"expo-constants": "~18.0.13",
|
||||||
"expo-dev-client": "~6.0.20",
|
"expo-dev-client": "~6.0.20",
|
||||||
@@ -1190,10 +1190,6 @@
|
|||||||
|
|
||||||
"@tailwindcss/vite": ["@tailwindcss/vite@4.2.1", "", { "dependencies": { "@tailwindcss/node": "4.2.1", "@tailwindcss/oxide": "4.2.1", "tailwindcss": "4.2.1" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7" } }, "sha512-TBf2sJjYeb28jD2U/OhwdW0bbOsxkWPwQ7SrqGf9sVcoYwZj7rkXljroBO9wKBut9XnmQLXanuDUeqQK0lGg/w=="],
|
"@tailwindcss/vite": ["@tailwindcss/vite@4.2.1", "", { "dependencies": { "@tailwindcss/node": "4.2.1", "@tailwindcss/oxide": "4.2.1", "tailwindcss": "4.2.1" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7" } }, "sha512-TBf2sJjYeb28jD2U/OhwdW0bbOsxkWPwQ7SrqGf9sVcoYwZj7rkXljroBO9wKBut9XnmQLXanuDUeqQK0lGg/w=="],
|
||||||
|
|
||||||
"@tanstack/query-core": ["@tanstack/query-core@5.90.20", "", {}, "sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg=="],
|
|
||||||
|
|
||||||
"@tanstack/react-query": ["@tanstack/react-query@5.90.21", "", { "dependencies": { "@tanstack/query-core": "5.90.20" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg=="],
|
|
||||||
|
|
||||||
"@tsconfig/node10": ["@tsconfig/node10@1.0.12", "", {}, "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ=="],
|
"@tsconfig/node10": ["@tsconfig/node10@1.0.12", "", {}, "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ=="],
|
||||||
|
|
||||||
"@tsconfig/node12": ["@tsconfig/node12@1.0.11", "", {}, "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="],
|
"@tsconfig/node12": ["@tsconfig/node12@1.0.11", "", {}, "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="],
|
||||||
|
|||||||
Reference in New Issue
Block a user