mirror of
https://github.com/kennethnym/aris.git
synced 2026-03-20 17:11:17 +00:00
Compare commits
6 Commits
feat/feed-
...
feat/tfl-s
| Author | SHA1 | Date | |
|---|---|---|---|
|
54e4b0dcf7
|
|||
| d1102fe1ac | |||
| 9e3fe2ea16 | |||
| 949b7c8571 | |||
| bd6cc3c963 | |||
| aff9464245 |
@@ -11,7 +11,11 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aris/core": "workspace:*",
|
"@aris/core": "workspace:*",
|
||||||
"@aris/source-location": "workspace:*",
|
"@aris/source-location": "workspace:*",
|
||||||
|
"@aris/source-tfl": "workspace:*",
|
||||||
"@aris/source-weatherkit": "workspace:*",
|
"@aris/source-weatherkit": "workspace:*",
|
||||||
|
"@hono/trpc-server": "^0.3",
|
||||||
|
"@trpc/server": "^11",
|
||||||
|
"arktype": "^2.1.29",
|
||||||
"better-auth": "^1",
|
"better-auth": "^1",
|
||||||
"hono": "^4",
|
"hono": "^4",
|
||||||
"pg": "^8"
|
"pg": "^8"
|
||||||
|
|||||||
33
apps/aris-backend/src/location/router.ts
Normal file
33
apps/aris-backend/src/location/router.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { TRPCError } from "@trpc/server"
|
||||||
|
import { type } from "arktype"
|
||||||
|
|
||||||
|
import { UserNotFoundError } from "../lib/error.ts"
|
||||||
|
import type { TRPC } from "../trpc/router.ts"
|
||||||
|
import type { LocationService } from "./service.ts"
|
||||||
|
|
||||||
|
const locationInput = type({
|
||||||
|
lat: "number",
|
||||||
|
lng: "number",
|
||||||
|
accuracy: "number",
|
||||||
|
timestamp: "Date",
|
||||||
|
})
|
||||||
|
|
||||||
|
export function createLocationRouter(t: TRPC, { locationService }: { locationService: LocationService }) {
|
||||||
|
return t.router({
|
||||||
|
update: t.procedure.input(locationInput).mutation(({ input, ctx }) => {
|
||||||
|
try {
|
||||||
|
locationService.updateUserLocation(ctx.user.id, {
|
||||||
|
lat: input.lat,
|
||||||
|
lng: input.lng,
|
||||||
|
accuracy: input.accuracy,
|
||||||
|
timestamp: input.timestamp,
|
||||||
|
})
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof UserNotFoundError) {
|
||||||
|
throw new TRPCError({ code: "NOT_FOUND", message: error.message })
|
||||||
|
}
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -1,6 +1,15 @@
|
|||||||
|
import { trpcServer } from "@hono/trpc-server"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
|
|
||||||
import { registerAuthHandlers } from "./auth/http.ts"
|
import { registerAuthHandlers } from "./auth/http.ts"
|
||||||
|
import { LocationService } from "./location/service.ts"
|
||||||
|
import { createContext } from "./trpc/context.ts"
|
||||||
|
import { createTRPCRouter } from "./trpc/router.ts"
|
||||||
|
|
||||||
|
function main() {
|
||||||
|
const locationService = new LocationService()
|
||||||
|
|
||||||
|
const trpcRouter = createTRPCRouter({ locationService })
|
||||||
|
|
||||||
const app = new Hono()
|
const app = new Hono()
|
||||||
|
|
||||||
@@ -8,6 +17,19 @@ app.get("/health", (c) => c.json({ status: "ok" }))
|
|||||||
|
|
||||||
registerAuthHandlers(app)
|
registerAuthHandlers(app)
|
||||||
|
|
||||||
|
app.use(
|
||||||
|
"/trpc/*",
|
||||||
|
trpcServer({
|
||||||
|
router: trpcRouter,
|
||||||
|
createContext,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
return app
|
||||||
|
}
|
||||||
|
|
||||||
|
const app = main()
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
port: 3000,
|
port: 3000,
|
||||||
fetch: app.fetch,
|
fetch: app.fetch,
|
||||||
|
|||||||
206
apps/aris-backend/src/tfl/service.test.ts
Normal file
206
apps/aris-backend/src/tfl/service.test.ts
Normal file
@@ -0,0 +1,206 @@
|
|||||||
|
import type { Context } from "@aris/core"
|
||||||
|
import type { ITflApi, StationLocation, TflLineId, TflLineStatus } from "@aris/source-tfl"
|
||||||
|
|
||||||
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
|
import { UserNotFoundError } from "../lib/error.ts"
|
||||||
|
import { TflService } from "./service.ts"
|
||||||
|
|
||||||
|
class StubTflApi implements ITflApi {
|
||||||
|
private statuses: TflLineStatus[]
|
||||||
|
|
||||||
|
constructor(statuses: TflLineStatus[] = []) {
|
||||||
|
this.statuses = statuses
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchLineStatuses(lines?: TflLineId[]): Promise<TflLineStatus[]> {
|
||||||
|
if (lines) {
|
||||||
|
return this.statuses.filter((s) => lines.includes(s.lineId))
|
||||||
|
}
|
||||||
|
return this.statuses
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchStations(): Promise<StationLocation[]> {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: "940GZZLUKSX",
|
||||||
|
name: "King's Cross",
|
||||||
|
lat: 51.5308,
|
||||||
|
lng: -0.1238,
|
||||||
|
lines: ["northern", "victoria"],
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function createContext(): Context {
|
||||||
|
return { time: new Date("2026-01-15T12:00:00Z") }
|
||||||
|
}
|
||||||
|
|
||||||
|
const sampleStatuses: TflLineStatus[] = [
|
||||||
|
{
|
||||||
|
lineId: "northern",
|
||||||
|
lineName: "Northern",
|
||||||
|
severity: "minor-delays",
|
||||||
|
description: "Minor delays on the Northern line",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
lineId: "victoria",
|
||||||
|
lineName: "Victoria",
|
||||||
|
severity: "major-delays",
|
||||||
|
description: "Severe delays on the Victoria line",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
lineId: "central",
|
||||||
|
lineName: "Central",
|
||||||
|
severity: "closure",
|
||||||
|
description: "Central line suspended",
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
describe("TflService", () => {
|
||||||
|
test("feedSourceForUser creates source on first call", () => {
|
||||||
|
const service = new TflService(new StubTflApi())
|
||||||
|
const source = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
expect(source).toBeDefined()
|
||||||
|
expect(source.id).toBe("tfl")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("feedSourceForUser returns same source for same user", () => {
|
||||||
|
const service = new TflService(new StubTflApi())
|
||||||
|
const source1 = service.feedSourceForUser("user-1")
|
||||||
|
const source2 = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
expect(source1).toBe(source2)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("feedSourceForUser returns different sources for different users", () => {
|
||||||
|
const service = new TflService(new StubTflApi())
|
||||||
|
const source1 = service.feedSourceForUser("user-1")
|
||||||
|
const source2 = service.feedSourceForUser("user-2")
|
||||||
|
|
||||||
|
expect(source1).not.toBe(source2)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("updateLinesOfInterest mutates the existing source in place", () => {
|
||||||
|
const service = new TflService(new StubTflApi())
|
||||||
|
const original = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
service.updateLinesOfInterest("user-1", ["northern", "victoria"])
|
||||||
|
const after = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
expect(after).toBe(original)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("updateLinesOfInterest throws if source does not exist", () => {
|
||||||
|
const service = new TflService(new StubTflApi())
|
||||||
|
|
||||||
|
expect(() => service.updateLinesOfInterest("user-1", ["northern"])).toThrow(UserNotFoundError)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("removeUser removes the source", () => {
|
||||||
|
const service = new TflService(new StubTflApi())
|
||||||
|
const source1 = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
service.removeUser("user-1")
|
||||||
|
const source2 = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
expect(source1).not.toBe(source2)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("removeUser clears line configuration", async () => {
|
||||||
|
const api = new StubTflApi(sampleStatuses)
|
||||||
|
const service = new TflService(api)
|
||||||
|
service.feedSourceForUser("user-1")
|
||||||
|
service.updateLinesOfInterest("user-1", ["northern"])
|
||||||
|
|
||||||
|
service.removeUser("user-1")
|
||||||
|
const items = await service.feedSourceForUser("user-1").fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(items.length).toBe(3)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("shares single api instance across users", () => {
|
||||||
|
const api = new StubTflApi()
|
||||||
|
const service = new TflService(api)
|
||||||
|
|
||||||
|
service.feedSourceForUser("user-1")
|
||||||
|
service.feedSourceForUser("user-2")
|
||||||
|
|
||||||
|
expect(service.feedSourceForUser("user-1").id).toBe("tfl")
|
||||||
|
expect(service.feedSourceForUser("user-2").id).toBe("tfl")
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("returned source fetches items", () => {
|
||||||
|
test("source returns feed items from api", async () => {
|
||||||
|
const api = new StubTflApi(sampleStatuses)
|
||||||
|
const service = new TflService(api)
|
||||||
|
const source = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(items.length).toBe(3)
|
||||||
|
for (const item of items) {
|
||||||
|
expect(item.type).toBe("tfl-alert")
|
||||||
|
expect(item.id).toMatch(/^tfl-alert-/)
|
||||||
|
expect(typeof item.priority).toBe("number")
|
||||||
|
expect(item.timestamp).toBeInstanceOf(Date)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test("source returns items sorted by priority descending", async () => {
|
||||||
|
const api = new StubTflApi(sampleStatuses)
|
||||||
|
const service = new TflService(api)
|
||||||
|
const source = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
for (let i = 1; i < items.length; i++) {
|
||||||
|
expect(items[i - 1]!.priority).toBeGreaterThanOrEqual(items[i]!.priority)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test("source returns empty array when no disruptions", async () => {
|
||||||
|
const api = new StubTflApi([])
|
||||||
|
const service = new TflService(api)
|
||||||
|
const source = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(items).toEqual([])
|
||||||
|
})
|
||||||
|
|
||||||
|
test("updateLinesOfInterest filters items to configured lines", async () => {
|
||||||
|
const api = new StubTflApi(sampleStatuses)
|
||||||
|
const service = new TflService(api)
|
||||||
|
|
||||||
|
const before = await service.feedSourceForUser("user-1").fetchItems(createContext())
|
||||||
|
expect(before.length).toBe(3)
|
||||||
|
|
||||||
|
service.updateLinesOfInterest("user-1", ["northern"])
|
||||||
|
const after = await service.feedSourceForUser("user-1").fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(after.length).toBe(1)
|
||||||
|
expect(after[0]!.data.line).toBe("northern")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("different users get independent line configs", async () => {
|
||||||
|
const api = new StubTflApi(sampleStatuses)
|
||||||
|
const service = new TflService(api)
|
||||||
|
service.feedSourceForUser("user-1")
|
||||||
|
service.feedSourceForUser("user-2")
|
||||||
|
|
||||||
|
service.updateLinesOfInterest("user-1", ["northern"])
|
||||||
|
service.updateLinesOfInterest("user-2", ["central"])
|
||||||
|
|
||||||
|
const items1 = await service.feedSourceForUser("user-1").fetchItems(createContext())
|
||||||
|
const items2 = await service.feedSourceForUser("user-2").fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(items1.length).toBe(1)
|
||||||
|
expect(items1[0]!.data.line).toBe("northern")
|
||||||
|
expect(items2.length).toBe(1)
|
||||||
|
expect(items2[0]!.data.line).toBe("central")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
40
apps/aris-backend/src/tfl/service.ts
Normal file
40
apps/aris-backend/src/tfl/service.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { TflSource, type ITflApi, type TflLineId } from "@aris/source-tfl"
|
||||||
|
|
||||||
|
import type { FeedSourceProvider } from "../feed/service.ts"
|
||||||
|
|
||||||
|
import { UserNotFoundError } from "../lib/error.ts"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages per-user TflSource instances with individual line configuration.
|
||||||
|
*/
|
||||||
|
export class TflService implements FeedSourceProvider {
|
||||||
|
private sources = new Map<string, TflSource>()
|
||||||
|
|
||||||
|
constructor(private readonly api: ITflApi) {}
|
||||||
|
|
||||||
|
feedSourceForUser(userId: string): TflSource {
|
||||||
|
let source = this.sources.get(userId)
|
||||||
|
if (!source) {
|
||||||
|
source = new TflSource({ client: this.api })
|
||||||
|
this.sources.set(userId, source)
|
||||||
|
}
|
||||||
|
return source
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update monitored lines for a user. Mutates the existing TflSource
|
||||||
|
* so that references held by FeedEngine remain valid.
|
||||||
|
* @throws {UserNotFoundError} If no source exists for the user
|
||||||
|
*/
|
||||||
|
updateLinesOfInterest(userId: string, lines: TflLineId[]): void {
|
||||||
|
const source = this.sources.get(userId)
|
||||||
|
if (!source) {
|
||||||
|
throw new UserNotFoundError(userId)
|
||||||
|
}
|
||||||
|
source.setLinesOfInterest(lines)
|
||||||
|
}
|
||||||
|
|
||||||
|
removeUser(userId: string): void {
|
||||||
|
this.sources.delete(userId)
|
||||||
|
}
|
||||||
|
}
|
||||||
14
apps/aris-backend/src/trpc/context.ts
Normal file
14
apps/aris-backend/src/trpc/context.ts
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import type { FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch"
|
||||||
|
|
||||||
|
import { auth } from "../auth/index.ts"
|
||||||
|
|
||||||
|
export async function createContext(opts: FetchCreateContextFnOptions) {
|
||||||
|
const session = await auth.api.getSession({ headers: opts.req.headers })
|
||||||
|
|
||||||
|
return {
|
||||||
|
user: session?.user ?? null,
|
||||||
|
session: session?.session ?? null,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export type Context = Awaited<ReturnType<typeof createContext>>
|
||||||
47
apps/aris-backend/src/trpc/router.ts
Normal file
47
apps/aris-backend/src/trpc/router.ts
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import { initTRPC, TRPCError } from "@trpc/server"
|
||||||
|
|
||||||
|
import { createLocationRouter } from "../location/router.ts"
|
||||||
|
import type { LocationService } from "../location/service.ts"
|
||||||
|
import type { Context } from "./context.ts"
|
||||||
|
|
||||||
|
interface AuthedContext {
|
||||||
|
user: NonNullable<Context["user"]>
|
||||||
|
session: NonNullable<Context["session"]>
|
||||||
|
}
|
||||||
|
|
||||||
|
function createTRPC() {
|
||||||
|
const t = initTRPC.context<Context>().create()
|
||||||
|
|
||||||
|
const isAuthed = t.middleware(({ ctx, next }) => {
|
||||||
|
if (!ctx.user || !ctx.session) {
|
||||||
|
throw new TRPCError({ code: "UNAUTHORIZED" })
|
||||||
|
}
|
||||||
|
return next({
|
||||||
|
ctx: {
|
||||||
|
user: ctx.user,
|
||||||
|
session: ctx.session,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
return {
|
||||||
|
router: t.router,
|
||||||
|
procedure: t.procedure.use(isAuthed),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export type TRPC = ReturnType<typeof createTRPC>
|
||||||
|
|
||||||
|
export interface TRPCRouterDeps {
|
||||||
|
locationService: LocationService
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createTRPCRouter({ locationService }: TRPCRouterDeps) {
|
||||||
|
const t = createTRPC()
|
||||||
|
|
||||||
|
return t.router({
|
||||||
|
location: createLocationRouter(t, { locationService }),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export type TRPCRouter = ReturnType<typeof createTRPCRouter>
|
||||||
8
bun.lock
8
bun.lock
@@ -19,7 +19,11 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aris/core": "workspace:*",
|
"@aris/core": "workspace:*",
|
||||||
"@aris/source-location": "workspace:*",
|
"@aris/source-location": "workspace:*",
|
||||||
|
"@aris/source-tfl": "workspace:*",
|
||||||
"@aris/source-weatherkit": "workspace:*",
|
"@aris/source-weatherkit": "workspace:*",
|
||||||
|
"@hono/trpc-server": "^0.3",
|
||||||
|
"@trpc/server": "^11",
|
||||||
|
"arktype": "^2.1.29",
|
||||||
"better-auth": "^1",
|
"better-auth": "^1",
|
||||||
"hono": "^4",
|
"hono": "^4",
|
||||||
"pg": "^8",
|
"pg": "^8",
|
||||||
@@ -91,6 +95,8 @@
|
|||||||
|
|
||||||
"@better-fetch/fetch": ["@better-fetch/fetch@1.1.21", "", {}, "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A=="],
|
"@better-fetch/fetch": ["@better-fetch/fetch@1.1.21", "", {}, "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A=="],
|
||||||
|
|
||||||
|
"@hono/trpc-server": ["@hono/trpc-server@0.3.4", "", { "peerDependencies": { "@trpc/server": "^10.10.0 || >11.0.0-rc", "hono": ">=4.*" } }, "sha512-xFOPjUPnII70FgicDzOJy1ufIoBTu8eF578zGiDOrYOrYN8CJe140s9buzuPkX+SwJRYK8LjEBHywqZtxdm8aA=="],
|
||||||
|
|
||||||
"@noble/ciphers": ["@noble/ciphers@2.1.1", "", {}, "sha512-bysYuiVfhxNJuldNXlFEitTVdNnYUc+XNJZd7Qm2a5j1vZHgY+fazadNFWFaMK/2vye0JVlxV3gHmC0WDfAOQw=="],
|
"@noble/ciphers": ["@noble/ciphers@2.1.1", "", {}, "sha512-bysYuiVfhxNJuldNXlFEitTVdNnYUc+XNJZd7Qm2a5j1vZHgY+fazadNFWFaMK/2vye0JVlxV3gHmC0WDfAOQw=="],
|
||||||
|
|
||||||
"@noble/hashes": ["@noble/hashes@2.0.1", "", {}, "sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw=="],
|
"@noble/hashes": ["@noble/hashes@2.0.1", "", {}, "sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw=="],
|
||||||
@@ -129,6 +135,8 @@
|
|||||||
|
|
||||||
"@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
|
"@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
|
||||||
|
|
||||||
|
"@trpc/server": ["@trpc/server@11.8.1", "", { "peerDependencies": { "typescript": ">=5.7.2" } }, "sha512-P4rzZRpEL7zDFgjxK65IdyH0e41FMFfTkQkuq0BA5tKcr7E6v9/v38DEklCpoDN6sPiB1Sigy/PUEzHENhswDA=="],
|
||||||
|
|
||||||
"@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="],
|
"@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="],
|
||||||
|
|
||||||
"@types/node": ["@types/node@25.0.9", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw=="],
|
"@types/node": ["@types/node@25.0.9", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw=="],
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ export { TflSource } from "./tfl-source.ts"
|
|||||||
export { TflApi } from "./tfl-api.ts"
|
export { TflApi } from "./tfl-api.ts"
|
||||||
export type { TflLineId } from "./tfl-api.ts"
|
export type { TflLineId } from "./tfl-api.ts"
|
||||||
export type {
|
export type {
|
||||||
|
ITflApi,
|
||||||
StationLocation,
|
StationLocation,
|
||||||
TflAlertData,
|
TflAlertData,
|
||||||
TflAlertFeedItem,
|
TflAlertFeedItem,
|
||||||
|
|||||||
@@ -112,6 +112,49 @@ describe("TflSource", () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("setLinesOfInterest", () => {
|
||||||
|
const lineFilteringApi: ITflApi = {
|
||||||
|
async fetchLineStatuses(lines?: TflLineId[]): Promise<TflLineStatus[]> {
|
||||||
|
const all: TflLineStatus[] = [
|
||||||
|
{
|
||||||
|
lineId: "northern",
|
||||||
|
lineName: "Northern",
|
||||||
|
severity: "minor-delays",
|
||||||
|
description: "Delays",
|
||||||
|
},
|
||||||
|
{ lineId: "central", lineName: "Central", severity: "closure", description: "Closed" },
|
||||||
|
]
|
||||||
|
return lines ? all.filter((s) => lines.includes(s.lineId)) : all
|
||||||
|
},
|
||||||
|
async fetchStations(): Promise<StationLocation[]> {
|
||||||
|
return []
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
test("changes which lines are fetched", async () => {
|
||||||
|
const source = new TflSource({ client: lineFilteringApi })
|
||||||
|
const before = await source.fetchItems(createContext())
|
||||||
|
expect(before.length).toBe(2)
|
||||||
|
|
||||||
|
source.setLinesOfInterest(["northern"])
|
||||||
|
const after = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(after.length).toBe(1)
|
||||||
|
expect(after[0]!.data.line).toBe("northern")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("DEFAULT_LINES_OF_INTEREST restores all lines", async () => {
|
||||||
|
const source = new TflSource({ client: lineFilteringApi, lines: ["northern"] })
|
||||||
|
const filtered = await source.fetchItems(createContext())
|
||||||
|
expect(filtered.length).toBe(1)
|
||||||
|
|
||||||
|
source.setLinesOfInterest([...TflSource.DEFAULT_LINES_OF_INTEREST])
|
||||||
|
const all = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(all.length).toBe(2)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
describe("fetchItems", () => {
|
describe("fetchItems", () => {
|
||||||
test("returns feed items array", async () => {
|
test("returns feed items array", async () => {
|
||||||
const source = new TflSource({ client: api })
|
const source = new TflSource({ client: api })
|
||||||
|
|||||||
@@ -42,18 +42,46 @@ const SEVERITY_PRIORITY: Record<TflAlertSeverity, number> = {
|
|||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
export class TflSource implements FeedSource<TflAlertFeedItem> {
|
export class TflSource implements FeedSource<TflAlertFeedItem> {
|
||||||
|
static readonly DEFAULT_LINES_OF_INTEREST: readonly TflLineId[] = [
|
||||||
|
"bakerloo",
|
||||||
|
"central",
|
||||||
|
"circle",
|
||||||
|
"district",
|
||||||
|
"hammersmith-city",
|
||||||
|
"jubilee",
|
||||||
|
"metropolitan",
|
||||||
|
"northern",
|
||||||
|
"piccadilly",
|
||||||
|
"victoria",
|
||||||
|
"waterloo-city",
|
||||||
|
"lioness",
|
||||||
|
"mildmay",
|
||||||
|
"windrush",
|
||||||
|
"weaver",
|
||||||
|
"suffragette",
|
||||||
|
"liberty",
|
||||||
|
"elizabeth",
|
||||||
|
]
|
||||||
|
|
||||||
readonly id = "tfl"
|
readonly id = "tfl"
|
||||||
readonly dependencies = ["location"]
|
readonly dependencies = ["location"]
|
||||||
|
|
||||||
private readonly client: ITflApi
|
private readonly client: ITflApi
|
||||||
private readonly lines?: TflLineId[]
|
private lines: TflLineId[]
|
||||||
|
|
||||||
constructor(options: TflSourceOptions) {
|
constructor(options: TflSourceOptions) {
|
||||||
if (!options.client && !options.apiKey) {
|
if (!options.client && !options.apiKey) {
|
||||||
throw new Error("Either client or apiKey must be provided")
|
throw new Error("Either client or apiKey must be provided")
|
||||||
}
|
}
|
||||||
this.client = options.client ?? new TflApi(options.apiKey!)
|
this.client = options.client ?? new TflApi(options.apiKey!)
|
||||||
this.lines = options.lines
|
this.lines = options.lines ?? [...TflSource.DEFAULT_LINES_OF_INTEREST]
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the set of monitored lines. Takes effect on the next fetchItems call.
|
||||||
|
*/
|
||||||
|
setLinesOfInterest(lines: TflLineId[]): void {
|
||||||
|
this.lines = lines
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchItems(context: Context): Promise<TflAlertFeedItem[]> {
|
async fetchItems(context: Context): Promise<TflAlertFeedItem[]> {
|
||||||
|
|||||||
Reference in New Issue
Block a user