mirror of
https://github.com/kennethnym/aris.git
synced 2026-03-20 17:11:17 +00:00
Compare commits
10 Commits
feat/apple
...
f987253e53
| Author | SHA1 | Date | |
|---|---|---|---|
| f987253e53 | |||
|
699155e0d8
|
|||
| 4d6cac7ec8 | |||
|
1f2920a7ad
|
|||
| 476c6f06d9 | |||
|
bfdc5e67b7
|
|||
|
2cf6536e48
|
|||
|
c7a1048320
|
|||
|
512faf191e
|
|||
| e5d65816dc |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -32,3 +32,4 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
|
|||||||
|
|
||||||
# Finder (MacOS) folder config
|
# Finder (MacOS) folder config
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
core
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ describe("LocationService", () => {
|
|||||||
const source = service.feedSourceForUser("user-1")
|
const source = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
expect(source).toBeDefined()
|
expect(source).toBeDefined()
|
||||||
expect(source.id).toBe("location")
|
expect(source.id).toBe("aris.location")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("feedSourceForUser returns same source for same user", () => {
|
test("feedSourceForUser returns same source for same user", () => {
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ describe("TflService", () => {
|
|||||||
const source = service.feedSourceForUser("user-1")
|
const source = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
expect(source).toBeDefined()
|
expect(source).toBeDefined()
|
||||||
expect(source.id).toBe("tfl")
|
expect(source.id).toBe("aris.tfl")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("feedSourceForUser returns same source for same user", () => {
|
test("feedSourceForUser returns same source for same user", () => {
|
||||||
@@ -128,8 +128,8 @@ describe("TflService", () => {
|
|||||||
service.feedSourceForUser("user-1")
|
service.feedSourceForUser("user-1")
|
||||||
service.feedSourceForUser("user-2")
|
service.feedSourceForUser("user-2")
|
||||||
|
|
||||||
expect(service.feedSourceForUser("user-1").id).toBe("tfl")
|
expect(service.feedSourceForUser("user-1").id).toBe("aris.tfl")
|
||||||
expect(service.feedSourceForUser("user-2").id).toBe("tfl")
|
expect(service.feedSourceForUser("user-2").id).toBe("aris.tfl")
|
||||||
})
|
})
|
||||||
|
|
||||||
describe("returned source fetches items", () => {
|
describe("returned source fetches items", () => {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ describe("WeatherService", () => {
|
|||||||
const source = service.feedSourceForUser("user-1")
|
const source = service.feedSourceForUser("user-1")
|
||||||
|
|
||||||
expect(source).toBeDefined()
|
expect(source).toBeDefined()
|
||||||
expect(source.id).toBe("weather")
|
expect(source.id).toBe("aris.weather")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("feedSourceForUser returns same source for same user", () => {
|
test("feedSourceForUser returns same source for same user", () => {
|
||||||
|
|||||||
78
bun.lock
78
bun.lock
@@ -35,6 +35,9 @@
|
|||||||
"packages/aris-core": {
|
"packages/aris-core": {
|
||||||
"name": "@aris/core",
|
"name": "@aris/core",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@standard-schema/spec": "^1.1.0",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"packages/aris-data-source-weatherkit": {
|
"packages/aris-data-source-weatherkit": {
|
||||||
"name": "@aris/data-source-weatherkit",
|
"name": "@aris/data-source-weatherkit",
|
||||||
@@ -53,11 +56,20 @@
|
|||||||
"tsdav": "^2.1.7",
|
"tsdav": "^2.1.7",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"packages/aris-source-google-calendar": {
|
||||||
|
"name": "@aris/source-google-calendar",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aris/core": "workspace:*",
|
||||||
|
"arktype": "^2.1.0",
|
||||||
|
},
|
||||||
|
},
|
||||||
"packages/aris-source-location": {
|
"packages/aris-source-location": {
|
||||||
"name": "@aris/source-location",
|
"name": "@aris/source-location",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aris/core": "workspace:*",
|
"@aris/core": "workspace:*",
|
||||||
|
"arktype": "^2.1.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"packages/aris-source-tfl": {
|
"packages/aris-source-tfl": {
|
||||||
@@ -88,6 +100,8 @@
|
|||||||
|
|
||||||
"@aris/source-apple-calendar": ["@aris/source-apple-calendar@workspace:packages/aris-source-apple-calendar"],
|
"@aris/source-apple-calendar": ["@aris/source-apple-calendar@workspace:packages/aris-source-apple-calendar"],
|
||||||
|
|
||||||
|
"@aris/source-google-calendar": ["@aris/source-google-calendar@workspace:packages/aris-source-google-calendar"],
|
||||||
|
|
||||||
"@aris/source-location": ["@aris/source-location@workspace:packages/aris-source-location"],
|
"@aris/source-location": ["@aris/source-location@workspace:packages/aris-source-location"],
|
||||||
|
|
||||||
"@aris/source-tfl": ["@aris/source-tfl@workspace:packages/aris-source-tfl"],
|
"@aris/source-tfl": ["@aris/source-tfl@workspace:packages/aris-source-tfl"],
|
||||||
@@ -98,9 +112,9 @@
|
|||||||
|
|
||||||
"@ark/util": ["@ark/util@0.56.0", "", {}, "sha512-BghfRC8b9pNs3vBoDJhcta0/c1J1rsoS1+HgVUreMFPdhz/CRAKReAu57YEllNaSy98rWAdY1gE+gFup7OXpgA=="],
|
"@ark/util": ["@ark/util@0.56.0", "", {}, "sha512-BghfRC8b9pNs3vBoDJhcta0/c1J1rsoS1+HgVUreMFPdhz/CRAKReAu57YEllNaSy98rWAdY1gE+gFup7OXpgA=="],
|
||||||
|
|
||||||
"@better-auth/core": ["@better-auth/core@1.4.17", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "zod": "^4.3.5" }, "peerDependencies": { "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21", "better-call": "1.1.8", "jose": "^6.1.0", "kysely": "^0.28.5", "nanostores": "^1.0.1" } }, "sha512-WSaEQDdUO6B1CzAmissN6j0lx9fM9lcslEYzlApB5UzFaBeAOHNUONTdglSyUs6/idiZBoRvt0t/qMXCgIU8ug=="],
|
"@better-auth/core": ["@better-auth/core@1.4.18", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "zod": "^4.3.5" }, "peerDependencies": { "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21", "better-call": "1.1.8", "jose": "^6.1.0", "kysely": "^0.28.5", "nanostores": "^1.0.1" } }, "sha512-q+awYgC7nkLEBdx2sW0iJjkzgSHlIxGnOpsN1r/O1+a4m7osJNHtfK2mKJSL1I+GfNyIlxJF8WvD/NLuYMpmcg=="],
|
||||||
|
|
||||||
"@better-auth/telemetry": ["@better-auth/telemetry@1.4.17", "", { "dependencies": { "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21" }, "peerDependencies": { "@better-auth/core": "1.4.17" } }, "sha512-R1BC4e/bNjQbXu7lG6ubpgmsPj7IMqky5DvMlzAtnAJWJhh99pMh/n6w5gOHa0cqDZgEAuj75IPTxv+q3YiInA=="],
|
"@better-auth/telemetry": ["@better-auth/telemetry@1.4.18", "", { "dependencies": { "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21" }, "peerDependencies": { "@better-auth/core": "1.4.18" } }, "sha512-e5rDF8S4j3Um/0LIVATL2in9dL4lfO2fr2v1Wio4qTMRbfxqnUDTa+6SZtwdeJrbc4O+a3c+IyIpjG9Q/6GpfQ=="],
|
||||||
|
|
||||||
"@better-auth/utils": ["@better-auth/utils@0.3.0", "", {}, "sha512-W+Adw6ZA6mgvnSnhOki270rwJ42t4XzSK6YWGF//BbVXL6SwCLWfyzBc1lN2m/4RM28KubdBKQ4X5VMoLRNPQw=="],
|
"@better-auth/utils": ["@better-auth/utils@0.3.0", "", {}, "sha512-W+Adw6ZA6mgvnSnhOki270rwJ42t4XzSK6YWGF//BbVXL6SwCLWfyzBc1lN2m/4RM28KubdBKQ4X5VMoLRNPQw=="],
|
||||||
|
|
||||||
@@ -128,29 +142,51 @@
|
|||||||
|
|
||||||
"@oxfmt/win32-x64": ["@oxfmt/win32-x64@0.24.0", "", { "os": "win32", "cpu": "x64" }, "sha512-0tmlNzcyewAnauNeBCq0xmAkmiKzl+H09p0IdHy+QKrTQdtixtf+AOjDAADbRfihkS+heF15Pjc4IyJMdAAJjw=="],
|
"@oxfmt/win32-x64": ["@oxfmt/win32-x64@0.24.0", "", { "os": "win32", "cpu": "x64" }, "sha512-0tmlNzcyewAnauNeBCq0xmAkmiKzl+H09p0IdHy+QKrTQdtixtf+AOjDAADbRfihkS+heF15Pjc4IyJMdAAJjw=="],
|
||||||
|
|
||||||
"@oxlint/darwin-arm64": ["@oxlint/darwin-arm64@1.39.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-lT3hNhIa02xCujI6YGgjmYGg3Ht/X9ag5ipUVETaMpx5Rd4BbTNWUPif1WN1YZHxt3KLCIqaAe7zVhatv83HOQ=="],
|
"@oxlint/binding-android-arm-eabi": ["@oxlint/binding-android-arm-eabi@1.47.0", "", { "os": "android", "cpu": "arm" }, "sha512-UHqo3te9K/fh29brCuQdHjN+kfpIi9cnTPABuD5S9wb9ykXYRGTOOMVuSV/CK43sOhU4wwb2nT1RVjcbrrQjFw=="],
|
||||||
|
|
||||||
"@oxlint/darwin-x64": ["@oxlint/darwin-x64@1.39.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-UT+rfTWd+Yr7iJeSLd/7nF8X4gTYssKh+n77hxl6Oilp3NnG1CKRHxZDy3o3lIBnwgzJkdyUAiYWO1bTMXQ1lA=="],
|
"@oxlint/binding-android-arm64": ["@oxlint/binding-android-arm64@1.47.0", "", { "os": "android", "cpu": "arm64" }, "sha512-xh02lsTF1TAkR+SZrRMYHR/xCx8Wg2MAHxJNdHVpAKELh9/yE9h4LJeqAOBbIb3YYn8o/D97U9VmkvkfJfrHfw=="],
|
||||||
|
|
||||||
"@oxlint/linux-arm64-gnu": ["@oxlint/linux-arm64-gnu@1.39.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-qocBkvS2V6rH0t9AT3DfQunMnj3xkM7srs5/Ycj2j5ZqMoaWd/FxHNVJDFP++35roKSvsRJoS0mtA8/77jqm6Q=="],
|
"@oxlint/binding-darwin-arm64": ["@oxlint/binding-darwin-arm64@1.47.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-OSOfNJqabOYbkyQDGT5pdoL+05qgyrmlQrvtCO58M4iKGEQ/xf3XkkKj7ws+hO+k8Y4VF4zGlBsJlwqy7qBcHA=="],
|
||||||
|
|
||||||
"@oxlint/linux-arm64-musl": ["@oxlint/linux-arm64-musl@1.39.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-arZzAc1PPcz9epvGBBCMHICeyQloKtHX3eoOe62B3Dskn7gf6Q14wnDHr1r9Vp4vtcBATNq6HlKV14smdlC/qA=="],
|
"@oxlint/binding-darwin-x64": ["@oxlint/binding-darwin-x64@1.47.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-hP2bOI4IWNS+F6pVXWtRshSTuJ1qCRZgDgVUg6EBUqsRy+ExkEPJkx+YmIuxgdCduYK1LKptLNFuQLJP8voPbQ=="],
|
||||||
|
|
||||||
"@oxlint/linux-x64-gnu": ["@oxlint/linux-x64-gnu@1.39.0", "", { "os": "linux", "cpu": "x64" }, "sha512-ZVt5qsECpuNprdWxAPpDBwoixr1VTcZ4qAEQA2l/wmFyVPDYFD3oBY/SWACNnWBddMrswjTg9O8ALxYWoEpmXw=="],
|
"@oxlint/binding-freebsd-x64": ["@oxlint/binding-freebsd-x64@1.47.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-F55jIEH5xmGu7S661Uho8vGiLFk0bY3A/g4J8CTKiLJnYu/PSMZ2WxFoy5Hji6qvFuujrrM9Q8XXbMO0fKOYPg=="],
|
||||||
|
|
||||||
"@oxlint/linux-x64-musl": ["@oxlint/linux-x64-musl@1.39.0", "", { "os": "linux", "cpu": "x64" }, "sha512-pB0hlGyKPbxr9NMIV783lD6cWL3MpaqnZRM9MWni4yBdHPTKyFNYdg5hGD0Bwg+UP4S2rOevq/+OO9x9Bi7E6g=="],
|
"@oxlint/binding-linux-arm-gnueabihf": ["@oxlint/binding-linux-arm-gnueabihf@1.47.0", "", { "os": "linux", "cpu": "arm" }, "sha512-wxmOn/wns/WKPXUC1fo5mu9pMZPVOu8hsynaVDrgmmXMdHKS7on6bA5cPauFFN9tJXNdsjW26AK9lpfu3IfHBQ=="],
|
||||||
|
|
||||||
"@oxlint/win32-arm64": ["@oxlint/win32-arm64@1.39.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-Gg2SFaJohI9+tIQVKXlPw3FsPQFi/eCSWiCgwPtPn5uzQxHRTeQEZKuluz1fuzR5U70TXubb2liZi4Dgl8LJQA=="],
|
"@oxlint/binding-linux-arm-musleabihf": ["@oxlint/binding-linux-arm-musleabihf@1.47.0", "", { "os": "linux", "cpu": "arm" }, "sha512-KJTmVIA/GqRlM2K+ZROH30VMdydEU7bDTY35fNg3tOPzQRIs2deLZlY/9JWwdWo1F/9mIYmpbdCmPqtKhWNOPg=="],
|
||||||
|
|
||||||
"@oxlint/win32-x64": ["@oxlint/win32-x64@1.39.0", "", { "os": "win32", "cpu": "x64" }, "sha512-sbi25lfj74hH+6qQtb7s1wEvd1j8OQbTaH8v3xTcDjrwm579Cyh0HBv1YSZ2+gsnVwfVDiCTL1D0JsNqYXszVA=="],
|
"@oxlint/binding-linux-arm64-gnu": ["@oxlint/binding-linux-arm64-gnu@1.47.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-PF7ELcFg1GVlS0X0ZB6aWiXobjLrAKer3T8YEkwIoO8RwWiAMkL3n3gbleg895BuZkHVlJ2kPRUwfrhHrVkD1A=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-linux-arm64-musl": ["@oxlint/binding-linux-arm64-musl@1.47.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-4BezLRO5cu0asf0Jp1gkrnn2OHiXrPPPEfBTxq1k5/yJ2zdGGTmZxHD2KF2voR23wb8Elyu3iQawXo7wvIZq0Q=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-linux-ppc64-gnu": ["@oxlint/binding-linux-ppc64-gnu@1.47.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-aI5ds9jq2CPDOvjeapiIj48T/vlWp+f4prkxs+FVzrmVN9BWIj0eqeJ/hV8WgXg79HVMIz9PU6deI2ki09bR1w=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-linux-riscv64-gnu": ["@oxlint/binding-linux-riscv64-gnu@1.47.0", "", { "os": "linux", "cpu": "none" }, "sha512-mO7ycp9Elvgt5EdGkQHCwJA6878xvo9tk+vlMfT1qg++UjvOMB8INsOCQIOH2IKErF/8/P21LULkdIrocMw9xA=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-linux-riscv64-musl": ["@oxlint/binding-linux-riscv64-musl@1.47.0", "", { "os": "linux", "cpu": "none" }, "sha512-24D0wsYT/7hDFn3Ow32m3/+QT/1ZwrUhShx4/wRDAmz11GQHOZ1k+/HBuK/MflebdnalmXWITcPEy4BWTi7TCA=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-linux-s390x-gnu": ["@oxlint/binding-linux-s390x-gnu@1.47.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-8tPzPne882mtML/uy3mApvdCyuVOpthJ7xUv3b67gVfz63hOOM/bwO0cysSkPyYYFDFRn6/FnUb7Jhmsesntvg=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-linux-x64-gnu": ["@oxlint/binding-linux-x64-gnu@1.47.0", "", { "os": "linux", "cpu": "x64" }, "sha512-q58pIyGIzeffEBhEgbRxLFHmHfV9m7g1RnkLiahQuEvyjKNiJcvdHOwKH2BdgZxdzc99Cs6hF5xTa86X40WzPw=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-linux-x64-musl": ["@oxlint/binding-linux-x64-musl@1.47.0", "", { "os": "linux", "cpu": "x64" }, "sha512-e7DiLZtETZUCwTa4EEHg9G+7g3pY+afCWXvSeMG7m0TQ29UHHxMARPaEQUE4mfKgSqIWnJaUk2iZzRPMRdga5g=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-openharmony-arm64": ["@oxlint/binding-openharmony-arm64@1.47.0", "", { "os": "none", "cpu": "arm64" }, "sha512-3AFPfQ0WKMleT/bKd7zsks3xoawtZA6E/wKf0DjwysH7wUiMMJkNKXOzYq1R/00G98JFgSU1AkrlOQrSdNNhlg=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-win32-arm64-msvc": ["@oxlint/binding-win32-arm64-msvc@1.47.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-cLMVVM6TBxp+N7FldQJ2GQnkcLYEPGgiuEaXdvhgvSgODBk9ov3jed+khIXSAWtnFOW0wOnG3RjwqPh0rCuheA=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-win32-ia32-msvc": ["@oxlint/binding-win32-ia32-msvc@1.47.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-VpFOSzvTnld77/Edje3ZdHgZWnlTb5nVWXyTgjD3/DKF/6t5bRRbwn3z77zOdnGy44xAMvbyAwDNOSeOdVUmRA=="],
|
||||||
|
|
||||||
|
"@oxlint/binding-win32-x64-msvc": ["@oxlint/binding-win32-x64-msvc@1.47.0", "", { "os": "win32", "cpu": "x64" }, "sha512-+q8IWptxXx2HMTM6JluR67284t0h8X/oHJgqpxH1siowxPMqZeIpAcWCUq+tY+Rv2iQK8TUugjZnSBQAVV5CmA=="],
|
||||||
|
|
||||||
"@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=="],
|
"@trpc/server": ["@trpc/server@11.10.0", "", { "peerDependencies": { "typescript": ">=5.7.2" } }, "sha512-zZjTrR6He61e5TiT7e/bQqab/jRcXBZM8Fg78Yoo8uh5pz60dzzbYuONNUCOkafv5ppXVMms4NHYfNZgzw50vg=="],
|
||||||
|
|
||||||
"@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="],
|
"@types/bun": ["@types/bun@1.3.9", "", { "dependencies": { "bun-types": "1.3.9" } }, "sha512-KQ571yULOdWJiMH+RIWIOZ7B2RXQGpL1YQrBtLIV3FqDcCu6FsbFUBwhdKUlCKUpS3PJDsHlJ1QKlpxoVR+xtw=="],
|
||||||
|
|
||||||
"@types/node": ["@types/node@25.0.9", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw=="],
|
"@types/node": ["@types/node@25.2.3", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-m0jEgYlYz+mDJZ2+F4v8D1AyQb+QzsNqRuI7xg1VQX/KlKS0qT9r1Mo16yo5F/MtifXFgaofIFsdFMox2SxIbQ=="],
|
||||||
|
|
||||||
"@types/pg": ["@types/pg@8.16.0", "", { "dependencies": { "@types/node": "*", "pg-protocol": "*", "pg-types": "^2.2.0" } }, "sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ=="],
|
"@types/pg": ["@types/pg@8.16.0", "", { "dependencies": { "@types/node": "*", "pg-protocol": "*", "pg-types": "^2.2.0" } }, "sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ=="],
|
||||||
|
|
||||||
@@ -160,11 +196,11 @@
|
|||||||
|
|
||||||
"base-64": ["base-64@1.0.0", "", {}, "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="],
|
"base-64": ["base-64@1.0.0", "", {}, "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="],
|
||||||
|
|
||||||
"better-auth": ["better-auth@1.4.17", "", { "dependencies": { "@better-auth/core": "1.4.17", "@better-auth/telemetry": "1.4.17", "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21", "@noble/ciphers": "^2.0.0", "@noble/hashes": "^2.0.0", "better-call": "1.1.8", "defu": "^6.1.4", "jose": "^6.1.0", "kysely": "^0.28.5", "nanostores": "^1.0.1", "zod": "^4.3.5" }, "peerDependencies": { "@lynx-js/react": "*", "@prisma/client": "^5.0.0 || ^6.0.0 || ^7.0.0", "@sveltejs/kit": "^2.0.0", "@tanstack/react-start": "^1.0.0", "@tanstack/solid-start": "^1.0.0", "better-sqlite3": "^12.0.0", "drizzle-kit": ">=0.31.4", "drizzle-orm": ">=0.41.0", "mongodb": "^6.0.0 || ^7.0.0", "mysql2": "^3.0.0", "next": "^14.0.0 || ^15.0.0 || ^16.0.0", "pg": "^8.0.0", "prisma": "^5.0.0 || ^6.0.0 || ^7.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0", "solid-js": "^1.0.0", "svelte": "^4.0.0 || ^5.0.0", "vitest": "^2.0.0 || ^3.0.0 || ^4.0.0", "vue": "^3.0.0" }, "optionalPeers": ["@lynx-js/react", "@prisma/client", "@sveltejs/kit", "@tanstack/react-start", "@tanstack/solid-start", "better-sqlite3", "drizzle-kit", "drizzle-orm", "mongodb", "mysql2", "next", "pg", "prisma", "react", "react-dom", "solid-js", "svelte", "vitest", "vue"] }, "sha512-VmHGQyKsEahkEs37qguROKg/6ypYpNF13D7v/lkbO7w7Aivz0Bv2h+VyUkH4NzrGY0QBKXi1577mGhDCVwp0ew=="],
|
"better-auth": ["better-auth@1.4.18", "", { "dependencies": { "@better-auth/core": "1.4.18", "@better-auth/telemetry": "1.4.18", "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21", "@noble/ciphers": "^2.0.0", "@noble/hashes": "^2.0.0", "better-call": "1.1.8", "defu": "^6.1.4", "jose": "^6.1.0", "kysely": "^0.28.5", "nanostores": "^1.0.1", "zod": "^4.3.5" }, "peerDependencies": { "@lynx-js/react": "*", "@prisma/client": "^5.0.0 || ^6.0.0 || ^7.0.0", "@sveltejs/kit": "^2.0.0", "@tanstack/react-start": "^1.0.0", "@tanstack/solid-start": "^1.0.0", "better-sqlite3": "^12.0.0", "drizzle-kit": ">=0.31.4", "drizzle-orm": ">=0.41.0", "mongodb": "^6.0.0 || ^7.0.0", "mysql2": "^3.0.0", "next": "^14.0.0 || ^15.0.0 || ^16.0.0", "pg": "^8.0.0", "prisma": "^5.0.0 || ^6.0.0 || ^7.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0", "solid-js": "^1.0.0", "svelte": "^4.0.0 || ^5.0.0", "vitest": "^2.0.0 || ^3.0.0 || ^4.0.0", "vue": "^3.0.0" }, "optionalPeers": ["@lynx-js/react", "@prisma/client", "@sveltejs/kit", "@tanstack/react-start", "@tanstack/solid-start", "better-sqlite3", "drizzle-kit", "drizzle-orm", "mongodb", "mysql2", "next", "pg", "prisma", "react", "react-dom", "solid-js", "svelte", "vitest", "vue"] }, "sha512-bnyifLWBPcYVltH3RhS7CM62MoelEqC6Q+GnZwfiDWNfepXoQZBjEvn4urcERC7NTKgKq5zNBM8rvPvRBa6xcg=="],
|
||||||
|
|
||||||
"better-call": ["better-call@1.1.8", "", { "dependencies": { "@better-auth/utils": "^0.3.0", "@better-fetch/fetch": "^1.1.4", "rou3": "^0.7.10", "set-cookie-parser": "^2.7.1" }, "peerDependencies": { "zod": "^4.0.0" }, "optionalPeers": ["zod"] }, "sha512-XMQ2rs6FNXasGNfMjzbyroSwKwYbZ/T3IxruSS6U2MJRsSYh3wYtG3o6H00ZlKZ/C/UPOAD97tqgQJNsxyeTXw=="],
|
"better-call": ["better-call@1.1.8", "", { "dependencies": { "@better-auth/utils": "^0.3.0", "@better-fetch/fetch": "^1.1.4", "rou3": "^0.7.10", "set-cookie-parser": "^2.7.1" }, "peerDependencies": { "zod": "^4.0.0" }, "optionalPeers": ["zod"] }, "sha512-XMQ2rs6FNXasGNfMjzbyroSwKwYbZ/T3IxruSS6U2MJRsSYh3wYtG3o6H00ZlKZ/C/UPOAD97tqgQJNsxyeTXw=="],
|
||||||
|
|
||||||
"bun-types": ["bun-types@1.3.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ=="],
|
"bun-types": ["bun-types@1.3.9", "", { "dependencies": { "@types/node": "*" } }, "sha512-+UBWWOakIP4Tswh0Bt0QD0alpTY8cb5hvgiYeWCMet9YukHbzuruIEeXC2D7nMJPB12kbh8C7XJykSexEqGKJg=="],
|
||||||
|
|
||||||
"cross-fetch": ["cross-fetch@4.1.0", "", { "dependencies": { "node-fetch": "^2.7.0" } }, "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw=="],
|
"cross-fetch": ["cross-fetch@4.1.0", "", { "dependencies": { "node-fetch": "^2.7.0" } }, "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw=="],
|
||||||
|
|
||||||
@@ -172,13 +208,13 @@
|
|||||||
|
|
||||||
"defu": ["defu@6.1.4", "", {}, "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="],
|
"defu": ["defu@6.1.4", "", {}, "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="],
|
||||||
|
|
||||||
"hono": ["hono@4.11.5", "", {}, "sha512-WemPi9/WfyMwZs+ZUXdiwcCh9Y+m7L+8vki9MzDw3jJ+W9Lc+12HGsd368Qc1vZi1xwW8BWMMsnK5efYKPdt4g=="],
|
"hono": ["hono@4.11.9", "", {}, "sha512-Eaw2YTGM6WOxA6CXbckaEvslr2Ne4NFsKrvc0v97JD5awbmeBLO5w9Ho9L9kmKonrwF9RJlW6BxT1PVv/agBHQ=="],
|
||||||
|
|
||||||
"ical.js": ["ical.js@2.2.1", "", {}, "sha512-yK/UlPbEs316igb/tjRgbFA8ZV75rCsBJp/hWOatpyaPNlgw0dGDmU+FoicOcwX4xXkeXOkYiOmCqNPFpNPkQg=="],
|
"ical.js": ["ical.js@2.2.1", "", {}, "sha512-yK/UlPbEs316igb/tjRgbFA8ZV75rCsBJp/hWOatpyaPNlgw0dGDmU+FoicOcwX4xXkeXOkYiOmCqNPFpNPkQg=="],
|
||||||
|
|
||||||
"jose": ["jose@6.1.3", "", {}, "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ=="],
|
"jose": ["jose@6.1.3", "", {}, "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ=="],
|
||||||
|
|
||||||
"kysely": ["kysely@0.28.10", "", {}, "sha512-ksNxfzIW77OcZ+QWSAPC7yDqUSaIVwkTWnTPNiIy//vifNbwsSgQ57OkkncHxxpcBHM3LRfLAZVEh7kjq5twVA=="],
|
"kysely": ["kysely@0.28.11", "", {}, "sha512-zpGIFg0HuoC893rIjYX1BETkVWdDnzTzF5e0kWXJFg5lE0k1/LfNWBejrcnOFu8Q2Rfq/hTDTU7XLUM8QOrpzg=="],
|
||||||
|
|
||||||
"ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
|
"ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
|
||||||
|
|
||||||
@@ -188,13 +224,13 @@
|
|||||||
|
|
||||||
"oxfmt": ["oxfmt@0.24.0", "", { "dependencies": { "tinypool": "2.0.0" }, "optionalDependencies": { "@oxfmt/darwin-arm64": "0.24.0", "@oxfmt/darwin-x64": "0.24.0", "@oxfmt/linux-arm64-gnu": "0.24.0", "@oxfmt/linux-arm64-musl": "0.24.0", "@oxfmt/linux-x64-gnu": "0.24.0", "@oxfmt/linux-x64-musl": "0.24.0", "@oxfmt/win32-arm64": "0.24.0", "@oxfmt/win32-x64": "0.24.0" }, "bin": { "oxfmt": "bin/oxfmt" } }, "sha512-UjeM3Peez8Tl7IJ9s5UwAoZSiDRMww7BEc21gDYxLq3S3/KqJnM3mjNxsoSHgmBvSeX6RBhoVc2MfC/+96RdSw=="],
|
"oxfmt": ["oxfmt@0.24.0", "", { "dependencies": { "tinypool": "2.0.0" }, "optionalDependencies": { "@oxfmt/darwin-arm64": "0.24.0", "@oxfmt/darwin-x64": "0.24.0", "@oxfmt/linux-arm64-gnu": "0.24.0", "@oxfmt/linux-arm64-musl": "0.24.0", "@oxfmt/linux-x64-gnu": "0.24.0", "@oxfmt/linux-x64-musl": "0.24.0", "@oxfmt/win32-arm64": "0.24.0", "@oxfmt/win32-x64": "0.24.0" }, "bin": { "oxfmt": "bin/oxfmt" } }, "sha512-UjeM3Peez8Tl7IJ9s5UwAoZSiDRMww7BEc21gDYxLq3S3/KqJnM3mjNxsoSHgmBvSeX6RBhoVc2MfC/+96RdSw=="],
|
||||||
|
|
||||||
"oxlint": ["oxlint@1.39.0", "", { "optionalDependencies": { "@oxlint/darwin-arm64": "1.39.0", "@oxlint/darwin-x64": "1.39.0", "@oxlint/linux-arm64-gnu": "1.39.0", "@oxlint/linux-arm64-musl": "1.39.0", "@oxlint/linux-x64-gnu": "1.39.0", "@oxlint/linux-x64-musl": "1.39.0", "@oxlint/win32-arm64": "1.39.0", "@oxlint/win32-x64": "1.39.0" }, "peerDependencies": { "oxlint-tsgolint": ">=0.10.0" }, "optionalPeers": ["oxlint-tsgolint"], "bin": { "oxlint": "bin/oxlint" } }, "sha512-wSiLr0wjG+KTU6c1LpVoQk7JZ7l8HCKlAkVDVTJKWmCGazsNxexxnOXl7dsar92mQcRnzko5g077ggP3RINSjA=="],
|
"oxlint": ["oxlint@1.47.0", "", { "optionalDependencies": { "@oxlint/binding-android-arm-eabi": "1.47.0", "@oxlint/binding-android-arm64": "1.47.0", "@oxlint/binding-darwin-arm64": "1.47.0", "@oxlint/binding-darwin-x64": "1.47.0", "@oxlint/binding-freebsd-x64": "1.47.0", "@oxlint/binding-linux-arm-gnueabihf": "1.47.0", "@oxlint/binding-linux-arm-musleabihf": "1.47.0", "@oxlint/binding-linux-arm64-gnu": "1.47.0", "@oxlint/binding-linux-arm64-musl": "1.47.0", "@oxlint/binding-linux-ppc64-gnu": "1.47.0", "@oxlint/binding-linux-riscv64-gnu": "1.47.0", "@oxlint/binding-linux-riscv64-musl": "1.47.0", "@oxlint/binding-linux-s390x-gnu": "1.47.0", "@oxlint/binding-linux-x64-gnu": "1.47.0", "@oxlint/binding-linux-x64-musl": "1.47.0", "@oxlint/binding-openharmony-arm64": "1.47.0", "@oxlint/binding-win32-arm64-msvc": "1.47.0", "@oxlint/binding-win32-ia32-msvc": "1.47.0", "@oxlint/binding-win32-x64-msvc": "1.47.0" }, "peerDependencies": { "oxlint-tsgolint": ">=0.11.2" }, "optionalPeers": ["oxlint-tsgolint"], "bin": { "oxlint": "bin/oxlint" } }, "sha512-v7xkK1iv1qdvTxJGclM97QzN8hHs5816AneFAQ0NGji1BMUquhiDAhXpMwp8+ls16uRVJtzVHxP9pAAXblDeGA=="],
|
||||||
|
|
||||||
"pg": ["pg@8.17.2", "", { "dependencies": { "pg-connection-string": "^2.10.1", "pg-pool": "^3.11.0", "pg-protocol": "^1.11.0", "pg-types": "2.2.0", "pgpass": "1.0.5" }, "optionalDependencies": { "pg-cloudflare": "^1.3.0" }, "peerDependencies": { "pg-native": ">=3.0.1" }, "optionalPeers": ["pg-native"] }, "sha512-vjbKdiBJRqzcYw1fNU5KuHyYvdJ1qpcQg1CeBrHFqV1pWgHeVR6j/+kX0E1AAXfyuLUGY1ICrN2ELKA/z2HWzw=="],
|
"pg": ["pg@8.18.0", "", { "dependencies": { "pg-connection-string": "^2.11.0", "pg-pool": "^3.11.0", "pg-protocol": "^1.11.0", "pg-types": "2.2.0", "pgpass": "1.0.5" }, "optionalDependencies": { "pg-cloudflare": "^1.3.0" }, "peerDependencies": { "pg-native": ">=3.0.1" }, "optionalPeers": ["pg-native"] }, "sha512-xqrUDL1b9MbkydY/s+VZ6v+xiMUmOUk7SS9d/1kpyQxoJ6U9AO1oIJyUWVZojbfe5Cc/oluutcgFG4L9RDP1iQ=="],
|
||||||
|
|
||||||
"pg-cloudflare": ["pg-cloudflare@1.3.0", "", {}, "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ=="],
|
"pg-cloudflare": ["pg-cloudflare@1.3.0", "", {}, "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ=="],
|
||||||
|
|
||||||
"pg-connection-string": ["pg-connection-string@2.10.1", "", {}, "sha512-iNzslsoeSH2/gmDDKiyMqF64DATUCWj3YJ0wP14kqcsf2TUklwimd+66yYojKwZCA7h2yRNLGug71hCBA2a4sw=="],
|
"pg-connection-string": ["pg-connection-string@2.11.0", "", {}, "sha512-kecgoJwhOpxYU21rZjULrmrBJ698U2RxXofKVzOn5UDj61BPj/qMb7diYUR1nLScCDbrztQFl1TaQZT0t1EtzQ=="],
|
||||||
|
|
||||||
"pg-int8": ["pg-int8@1.0.1", "", {}, "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="],
|
"pg-int8": ["pg-int8@1.0.1", "", {}, "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="],
|
||||||
|
|
||||||
@@ -226,7 +262,7 @@
|
|||||||
|
|
||||||
"tr46": ["tr46@0.0.3", "", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="],
|
"tr46": ["tr46@0.0.3", "", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="],
|
||||||
|
|
||||||
"tsdav": ["tsdav@2.1.7", "", { "dependencies": { "base-64": "1.0.0", "cross-fetch": "4.1.0", "debug": "4.4.3", "xml-js": "1.6.11" } }, "sha512-/qjLC9iMox/ntV9L1YkGws9Q6sQ3JknYYSgB0sbq6fH7bqrx9pa9Y3CcTC+q8lnY6v5dud3Un/zsnGvyngh4Xg=="],
|
"tsdav": ["tsdav@2.1.8", "", { "dependencies": { "base-64": "1.0.0", "cross-fetch": "4.1.0", "debug": "4.4.3", "xml-js": "1.6.11" } }, "sha512-zvQvhZLzTaEmNNgJbBlUYT/JOq9Xpw/xkxCqs7IT2d2/7o7pss0iZOlZXuHJ5VcvSvTny42Vc6+6GyzZcrCJ1g=="],
|
||||||
|
|
||||||
"typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
|
"typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
|
||||||
|
|
||||||
|
|||||||
306
docs/backend-service-architecture-spec.md
Normal file
306
docs/backend-service-architecture-spec.md
Normal file
@@ -0,0 +1,306 @@
|
|||||||
|
# Backend Service Architecture: Per-User Refactor
|
||||||
|
|
||||||
|
## Problem Statement
|
||||||
|
|
||||||
|
The current backend uses a **per-source service** pattern: each source type (Location, Weather, TFL) has its own `XxxService` class that manages a `Map<userId, SourceInstance>`. Adding a new source requires:
|
||||||
|
|
||||||
|
1. A new `XxxService` class with identical boilerplate (~30-40 lines: Map, get-or-create, removeUser)
|
||||||
|
2. Wiring it into `server.ts` constructor
|
||||||
|
3. Passing it to `FeedEngineService`
|
||||||
|
4. Optionally adding source-specific tRPC routes
|
||||||
|
|
||||||
|
With 3 sources this is manageable. With 10+ (calendar, music, transit, news, etc.) it becomes:
|
||||||
|
|
||||||
|
- **Repetitive**: Every service class repeats the same Map + get-or-create + removeUser pattern
|
||||||
|
- **Fragmented lifecycle**: User cleanup requires calling `removeUser` on every service independently
|
||||||
|
- **No user-level config**: No unified place to store which sources a user has enabled or their per-source settings
|
||||||
|
- **Hard to reason about**: User state is scattered across N independent Maps
|
||||||
|
|
||||||
|
### Current Flow
|
||||||
|
|
||||||
|
```
|
||||||
|
server.ts
|
||||||
|
├── new LocationService() ← owns Map<userId, LocationSource>
|
||||||
|
├── new WeatherService(creds) ← owns Map<userId, WeatherSource>
|
||||||
|
├── new TflService(api) ← owns Map<userId, TflSource>
|
||||||
|
└── FeedEngineService([loc, weather, tfl])
|
||||||
|
└── owns Map<userId, FeedEngine>
|
||||||
|
└── on create: asks each service for feedSourceForUser(userId)
|
||||||
|
```
|
||||||
|
|
||||||
|
4 independent Maps for 3 sources. Each user's state lives in 4 different places.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
**Backend only** (`apps/aris-backend`). No changes to `aris-core` or source packages (`packages/aris-source-*`). The `FeedSource` interface and source implementations remain unchanged.
|
||||||
|
|
||||||
|
## Architectural Options
|
||||||
|
|
||||||
|
### Option A: UserSession Object
|
||||||
|
|
||||||
|
A single `UserSession` class owns everything for one user. A `UserSessionManager` is the only top-level Map.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
class UserSession {
|
||||||
|
readonly userId: string
|
||||||
|
readonly engine: FeedEngine
|
||||||
|
private sources: Map<string, FeedSource>
|
||||||
|
|
||||||
|
constructor(userId: string, sourceFactories: SourceFactory[]) {
|
||||||
|
this.engine = new FeedEngine()
|
||||||
|
this.sources = new Map()
|
||||||
|
for (const factory of sourceFactories) {
|
||||||
|
const source = factory.create()
|
||||||
|
this.sources.set(source.id, source)
|
||||||
|
this.engine.register(source)
|
||||||
|
}
|
||||||
|
this.engine.start()
|
||||||
|
}
|
||||||
|
|
||||||
|
getSource<T extends FeedSource>(id: string): T | undefined {
|
||||||
|
return this.sources.get(id) as T | undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
destroy(): void {
|
||||||
|
this.engine.stop()
|
||||||
|
this.sources.clear()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class UserSessionManager {
|
||||||
|
private sessions = new Map<string, UserSession>()
|
||||||
|
|
||||||
|
getOrCreate(userId: string): UserSession { ... }
|
||||||
|
remove(userId: string): void { ... } // single cleanup point
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Source-specific operations** use typed accessors:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
const session = manager.getOrCreate(userId)
|
||||||
|
const location = session.getSource<LocationSource>("location")
|
||||||
|
location?.pushLocation({ lat: 51.5, lng: -0.1, ... })
|
||||||
|
```
|
||||||
|
|
||||||
|
**Pros:**
|
||||||
|
|
||||||
|
- Single Map, single cleanup point
|
||||||
|
- All user state co-located
|
||||||
|
- Easy to add TTL/eviction at one level
|
||||||
|
- Source factories are simple functions, no service classes needed
|
||||||
|
|
||||||
|
**Cons:**
|
||||||
|
|
||||||
|
- `getSource<T>("id")` requires callers to know the source ID string and cast type
|
||||||
|
- Shared resources (e.g., TFL API client) need to be passed through factories
|
||||||
|
|
||||||
|
### Option B: Source Registry with Factories
|
||||||
|
|
||||||
|
Keep `FeedEngineService` but replace per-source service classes with a registry of factory functions. No `XxxService` classes at all.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
interface SourceFactory {
|
||||||
|
readonly sourceId: string
|
||||||
|
create(userId: string): FeedSource
|
||||||
|
}
|
||||||
|
|
||||||
|
// Weather factory — closure over shared credentials
|
||||||
|
function weatherSourceFactory(creds: WeatherKitCredentials): SourceFactory {
|
||||||
|
return {
|
||||||
|
sourceId: "weather",
|
||||||
|
create: () => new WeatherSource({ credentials: creds }),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TFL factory — closure over shared API client
|
||||||
|
function tflSourceFactory(api: ITflApi): SourceFactory {
|
||||||
|
return {
|
||||||
|
sourceId: "tfl",
|
||||||
|
create: () => new TflSource({ client: api }),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class FeedEngineService {
|
||||||
|
private engines = new Map<string, FeedEngine>()
|
||||||
|
private userSources = new Map<string, Map<string, FeedSource>>()
|
||||||
|
|
||||||
|
constructor(private readonly factories: SourceFactory[]) {}
|
||||||
|
|
||||||
|
engineForUser(userId: string): FeedEngine { ... }
|
||||||
|
getSourceForUser<T extends FeedSource>(userId: string, sourceId: string): T | undefined { ... }
|
||||||
|
removeUser(userId: string): void { ... } // cleans up engine + all sources
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Pros:**
|
||||||
|
|
||||||
|
- Minimal change from current structure — `FeedEngineService` evolves, services disappear
|
||||||
|
- Factory functions are 5-10 lines each, no classes
|
||||||
|
- Shared resources handled naturally via closures
|
||||||
|
|
||||||
|
**Cons:**
|
||||||
|
|
||||||
|
- `FeedEngineService` grows in responsibility (engine + source tracking + source access)
|
||||||
|
- Still two Maps (engines + userSources), though co-located
|
||||||
|
|
||||||
|
### Option C: UserSession + Typed Source Handles (Recommended)
|
||||||
|
|
||||||
|
Combines Option A's co-location with type-safe source access. `UserSession` owns everything. Source-specific operations go through **source handles** — thin typed wrappers registered at setup time.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// Source handle: typed wrapper for source-specific operations
|
||||||
|
interface SourceHandle<T extends FeedSource = FeedSource> {
|
||||||
|
readonly source: T
|
||||||
|
}
|
||||||
|
|
||||||
|
class UserSession {
|
||||||
|
readonly engine: FeedEngine
|
||||||
|
private handles = new Map<string, SourceHandle>()
|
||||||
|
|
||||||
|
register<T extends FeedSource>(source: T): SourceHandle<T> {
|
||||||
|
this.engine.register(source)
|
||||||
|
const handle: SourceHandle<T> = { source }
|
||||||
|
this.handles.set(source.id, handle)
|
||||||
|
return handle
|
||||||
|
}
|
||||||
|
|
||||||
|
destroy(): void {
|
||||||
|
this.engine.stop()
|
||||||
|
this.handles.clear()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// In setup code — handles are typed at creation time
|
||||||
|
function createSession(userId: string, deps: SessionDeps): UserSession {
|
||||||
|
const session = new UserSession(userId)
|
||||||
|
|
||||||
|
const locationHandle = session.register(new LocationSource())
|
||||||
|
const weatherHandle = session.register(new WeatherSource(deps.weatherCreds))
|
||||||
|
const tflHandle = session.register(new TflSource({ client: deps.tflApi }))
|
||||||
|
|
||||||
|
return session
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Source-specific operations** use the typed handles returned at registration:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// In the tRPC router or wherever source-specific ops happen:
|
||||||
|
// The handle is obtained during session setup and stored where needed
|
||||||
|
locationHandle.source.pushLocation({ ... })
|
||||||
|
tflHandle.source.setLinesOfInterest(["northern"])
|
||||||
|
```
|
||||||
|
|
||||||
|
**Pros:**
|
||||||
|
|
||||||
|
- Single Map, single cleanup
|
||||||
|
- Type-safe source access without string-based lookups or casts
|
||||||
|
- No boilerplate service classes
|
||||||
|
- Handles can be extended later (e.g., add per-source config, metrics)
|
||||||
|
- Shared resources passed directly to constructors
|
||||||
|
|
||||||
|
**Cons:**
|
||||||
|
|
||||||
|
- Handles need to be threaded to where they're used (tRPC routers, etc.)
|
||||||
|
- Slightly more setup code in the factory function
|
||||||
|
|
||||||
|
## Source-Specific Operations: Approaches
|
||||||
|
|
||||||
|
Orthogonal to the session model, there are three ways to handle operations like `pushLocation` or `setLinesOfInterest`:
|
||||||
|
|
||||||
|
### Approach 1: Direct Source Access (Recommended)
|
||||||
|
|
||||||
|
Callers get a typed reference to the source and call methods directly. This is what all three options above use in different ways.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
locationSource.pushLocation(location)
|
||||||
|
tflSource.setLinesOfInterest(lines)
|
||||||
|
```
|
||||||
|
|
||||||
|
**Why this works:** Source packages already define these methods. The backend just needs to expose the source instance to the right caller. No new abstraction needed.
|
||||||
|
|
||||||
|
### Approach 2: Command Dispatch
|
||||||
|
|
||||||
|
A generic `dispatch(command)` method on the session routes typed commands to sources.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
session.dispatch({ type: "location.update", payload: { lat: 51.5, ... } })
|
||||||
|
```
|
||||||
|
|
||||||
|
**Tradeoff:** Adds indirection and a command type registry. Useful if sources are dynamically loaded plugins, but over-engineered for the current case where sources are known at compile time.
|
||||||
|
|
||||||
|
### Approach 3: Context-Only
|
||||||
|
|
||||||
|
All input goes through `FeedEngine` context updates. Sources react to context changes.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
engine.pushContext({ [LocationKey]: location })
|
||||||
|
// LocationSource picks this up via onContextUpdate
|
||||||
|
```
|
||||||
|
|
||||||
|
**Tradeoff:** Location already works this way (it's a context provider). But not all operations map to context — `setLinesOfInterest` is configuration, not context. Would require stretching the context concept.
|
||||||
|
|
||||||
|
## User Source Configuration (DB-Persisted)
|
||||||
|
|
||||||
|
Regardless of which option is chosen, user source config needs a storage model:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
CREATE TABLE user_source_config (
|
||||||
|
user_id TEXT NOT NULL REFERENCES users(id),
|
||||||
|
source_id TEXT NOT NULL, -- e.g., "weather", "tfl", "location"
|
||||||
|
enabled BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
config JSONB NOT NULL DEFAULT '{}', -- source-specific settings
|
||||||
|
PRIMARY KEY (user_id, source_id)
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
On session creation:
|
||||||
|
|
||||||
|
1. Load `user_source_config` rows for the user
|
||||||
|
2. Only create sources where `enabled = true`
|
||||||
|
3. Pass `config` JSON to the source factory/constructor
|
||||||
|
|
||||||
|
New users get default config rows inserted on first login.
|
||||||
|
|
||||||
|
## Recommendation
|
||||||
|
|
||||||
|
**Option C (UserSession + Typed Source Handles)** with **Approach 1 (Direct Source Access)**.
|
||||||
|
|
||||||
|
Rationale:
|
||||||
|
|
||||||
|
- Eliminates all per-source service boilerplate
|
||||||
|
- Single user lifecycle management point
|
||||||
|
- Type-safe without string-based lookups in hot paths
|
||||||
|
- Minimal new abstraction — `UserSession` is a thin container, not a framework
|
||||||
|
- Handles are just typed references, not a new pattern to learn
|
||||||
|
- Natural extension point for per-user config loading from DB
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
1. **No per-source service classes**: `LocationService`, `WeatherService`, `TflService` are removed
|
||||||
|
2. **Single user state container**: All per-user state (engine, sources) lives in one object
|
||||||
|
3. **Single cleanup**: Removing a user requires one call, not N
|
||||||
|
4. **Type-safe source access**: Source-specific operations don't require string-based lookups or unsafe casts at call sites
|
||||||
|
5. **Existing tests pass**: `FeedEngineService` tests are migrated to the new structure
|
||||||
|
6. **tRPC routes work**: Location update route works through the new architecture
|
||||||
|
7. **DB config table**: `user_source_config` table exists; session creation reads from it
|
||||||
|
8. **Default config**: New users get default source config on first session
|
||||||
|
|
||||||
|
## Implementation Steps
|
||||||
|
|
||||||
|
1. Create `user_source_config` DB table and migration
|
||||||
|
2. Create `UserSession` class with `register()`, `destroy()`, typed handle return
|
||||||
|
3. Create `UserSessionManager` with `getOrCreate()`, `remove()`, config loading
|
||||||
|
4. Create `createSession()` factory that reads DB config and registers enabled sources
|
||||||
|
5. Refactor `server.ts` to use `UserSessionManager` instead of individual services
|
||||||
|
6. Refactor tRPC router to receive session/handles instead of individual services
|
||||||
|
7. Delete `LocationService`, `WeatherService`, `TflService` classes
|
||||||
|
8. Migrate existing tests to new structure
|
||||||
|
9. Add tests for session lifecycle (create, destroy, config loading)
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- **TTL/eviction**: Should `UserSessionManager` handle idle session cleanup? (Currently deferred in backend-spec.md)
|
||||||
|
- **Hot reload config**: If a user changes their source config, should the session be recreated or patched in-place?
|
||||||
|
- **Shared source instances**: Some sources (e.g., TFL) share an API client. Should the factory receive shared deps, or should there be a DI container?
|
||||||
269
docs/feed-source-actions-spec.md
Normal file
269
docs/feed-source-actions-spec.md
Normal file
@@ -0,0 +1,269 @@
|
|||||||
|
# FeedSource Actions
|
||||||
|
|
||||||
|
## Problem Statement
|
||||||
|
|
||||||
|
`FeedSource` is read-only. Sources can provide context and feed items but can't expose write operations (play, RSVP, dismiss). This blocks interactive sources like Spotify, calendar, and tasks.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
**`aris-core` only.** Add action support to `FeedSource` and `FeedItem`. No changes to existing fields or methods — purely additive.
|
||||||
|
|
||||||
|
## Design
|
||||||
|
|
||||||
|
### Why Not MCP
|
||||||
|
|
||||||
|
MCP was considered. It doesn't fit because:
|
||||||
|
|
||||||
|
- MCP resources don't accept input context (FeedSource needs accumulated context as input)
|
||||||
|
- MCP has no structured feed items (priority, timestamp, type)
|
||||||
|
- MCP's isolation model conflicts with ARIS's dependency graph
|
||||||
|
- Adding these as MCP extensions would mean the extensions are the entire protocol
|
||||||
|
|
||||||
|
The interface is designed to be **protocol-compatible** — a future `RemoteFeedSource` adapter can map each field/method to a JSON-RPC operation without changing the interface:
|
||||||
|
|
||||||
|
| FeedSource field/method | Future protocol operation |
|
||||||
|
| ----------------------- | ------------------------- |
|
||||||
|
| `id`, `dependencies` | `source/describe` |
|
||||||
|
| `listActions()` | `source/listActions` |
|
||||||
|
| `fetchContext()` | `source/fetchContext` |
|
||||||
|
| `fetchItems()` | `source/fetchItems` |
|
||||||
|
| `executeAction()` | `source/executeAction` |
|
||||||
|
| `onContextUpdate()` | `source/contextUpdated` |
|
||||||
|
| `onItemsUpdate()` | `source/itemsUpdated` |
|
||||||
|
|
||||||
|
No interface changes needed when the transport layer is built.
|
||||||
|
|
||||||
|
### Source ID & Action ID Convention
|
||||||
|
|
||||||
|
Source IDs use reverse domain notation. Built-in sources use `aris.<name>`. Third parties use their own domain.
|
||||||
|
|
||||||
|
Action IDs are descriptive verb-noun pairs in kebab-case, scoped to their source. The globally unique form is `<sourceId>/<actionId>`.
|
||||||
|
|
||||||
|
| Source ID | Action IDs |
|
||||||
|
| --------------- | -------------------------------------------------------------- |
|
||||||
|
| `aris.location` | `update-location` (migrated from `pushLocation()`) |
|
||||||
|
| `aris.tfl` | `set-lines-of-interest` (migrated from `setLinesOfInterest()`) |
|
||||||
|
| `aris.weather` | _(none)_ |
|
||||||
|
| `com.spotify` | `play-track`, `pause-playback`, `skip-track`, `like-track` |
|
||||||
|
| `aris.calendar` | `rsvp`, `create-event` |
|
||||||
|
| `com.todoist` | `complete-task`, `snooze-task` |
|
||||||
|
|
||||||
|
This means existing source packages need their `id` updated (e.g., `"location"` → `"aris.location"`).
|
||||||
|
|
||||||
|
### New Types
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
/** Describes an action a source can perform. */
|
||||||
|
interface ActionDefinition<TInput = unknown> {
|
||||||
|
/** Descriptive action name in kebab-case (e.g., "update-location", "play-track") */
|
||||||
|
readonly id: string
|
||||||
|
/** Human-readable label for UI (e.g., "Play", "RSVP Yes") */
|
||||||
|
readonly label: string
|
||||||
|
/** Optional longer description */
|
||||||
|
readonly description?: string
|
||||||
|
/** Schema for input validation. Accepts any Standard Schema compatible validator (arktype, zod, valibot, etc.). Omit if no params. */
|
||||||
|
readonly input?: StandardSchemaV1<TInput>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`StandardSchemaV1` is the [Standard Schema](https://github.com/standard-schema/standard-schema) interface implemented by arktype, zod, and valibot. This means sources can use any validator:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { type } from "arktype"
|
||||||
|
import { z } from "zod"
|
||||||
|
|
||||||
|
// With arktype
|
||||||
|
{ id: "play-track", label: "Play", input: type({ trackId: "string" }) }
|
||||||
|
|
||||||
|
// With zod
|
||||||
|
{ id: "play-track", label: "Play", input: z.object({ trackId: z.string() }) }
|
||||||
|
|
||||||
|
// Without validation (e.g., remote sources using raw JSON Schema)
|
||||||
|
{ id: "play-track", label: "Play" }
|
||||||
|
|
||||||
|
/** Result of executing an action. */
|
||||||
|
interface ActionResult {
|
||||||
|
ok: boolean
|
||||||
|
data?: Record<string, unknown>
|
||||||
|
error?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Reference to an action on a specific feed item. */
|
||||||
|
interface ItemAction {
|
||||||
|
/** Action ID (matches ActionDefinition.id on the source) */
|
||||||
|
actionId: string
|
||||||
|
/** Per-item label override (e.g., "RSVP to standup") */
|
||||||
|
label?: string
|
||||||
|
/** Pre-filled params for this item (e.g., { eventId: "abc" }) */
|
||||||
|
params?: Record<string, unknown>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Changes to FeedSource
|
||||||
|
|
||||||
|
Two optional fields added. Nothing else changes.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
interface FeedSource<TItem extends FeedItem = FeedItem> {
|
||||||
|
readonly id: string // unchanged
|
||||||
|
readonly dependencies?: readonly string[] // unchanged
|
||||||
|
fetchContext(...): ... // unchanged
|
||||||
|
onContextUpdate?(...): ... // unchanged
|
||||||
|
fetchItems?(...): ... // unchanged
|
||||||
|
onItemsUpdate?(...): ... // unchanged
|
||||||
|
|
||||||
|
/** List actions this source supports. Empty record if none. Maps to: source/listActions */
|
||||||
|
listActions(): Promise<Record<string, ActionDefinition>>
|
||||||
|
|
||||||
|
/** Execute an action by ID. No-op returning { ok: false } if source has no actions. */
|
||||||
|
executeAction(
|
||||||
|
actionId: string,
|
||||||
|
params: Record<string, unknown>,
|
||||||
|
): Promise<ActionResult>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Changes to FeedItem
|
||||||
|
|
||||||
|
One optional field added.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
interface FeedItem<
|
||||||
|
TType extends string = string,
|
||||||
|
TData extends Record<string, unknown> = Record<string, unknown>,
|
||||||
|
> {
|
||||||
|
id: string // unchanged
|
||||||
|
type: TType // unchanged
|
||||||
|
priority: number // unchanged
|
||||||
|
timestamp: Date // unchanged
|
||||||
|
data: TData // unchanged
|
||||||
|
|
||||||
|
/** Actions the user can take on this item. */
|
||||||
|
actions?: readonly ItemAction[]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Changes to FeedEngine
|
||||||
|
|
||||||
|
Two new methods. Existing methods unchanged.
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
class FeedEngine {
|
||||||
|
// All existing methods unchanged...
|
||||||
|
|
||||||
|
/** Route an action call to the correct source. */
|
||||||
|
async executeAction(
|
||||||
|
sourceId: string,
|
||||||
|
actionId: string,
|
||||||
|
params: Record<string, unknown>,
|
||||||
|
): Promise<ActionResult>
|
||||||
|
|
||||||
|
/** List all actions across all registered sources. */
|
||||||
|
listActions(): { sourceId: string; actions: readonly ActionDefinition[] }[]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Example: Spotify Source
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
class SpotifySource implements FeedSource<SpotifyFeedItem> {
|
||||||
|
readonly id = "com.spotify"
|
||||||
|
|
||||||
|
async listActions() {
|
||||||
|
return {
|
||||||
|
"play-track": { id: "play-track", label: "Play", input: type({ trackId: "string" }) },
|
||||||
|
"pause-playback": { id: "pause-playback", label: "Pause" },
|
||||||
|
"skip-track": { id: "skip-track", label: "Skip" },
|
||||||
|
"like-track": { id: "like-track", label: "Like", input: type({ trackId: "string" }) },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeAction(actionId: string, params: Record<string, unknown>): Promise<ActionResult> {
|
||||||
|
switch (actionId) {
|
||||||
|
case "play-track":
|
||||||
|
await this.client.play(params.trackId as string)
|
||||||
|
return { ok: true }
|
||||||
|
case "pause-playback":
|
||||||
|
await this.client.pause()
|
||||||
|
return { ok: true }
|
||||||
|
case "skip-track":
|
||||||
|
await this.client.skip()
|
||||||
|
return { ok: true }
|
||||||
|
case "like-track":
|
||||||
|
await this.client.like(params.trackId as string)
|
||||||
|
return { ok: true }
|
||||||
|
default:
|
||||||
|
return { ok: false, error: `Unknown action: ${actionId}` }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchContext(): Promise<null> {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note: for a source with no actions, it would be:
|
||||||
|
// async listActions() { return {} }
|
||||||
|
// async executeAction(): Promise<ActionResult> {
|
||||||
|
// return { ok: false, error: "No actions supported" }
|
||||||
|
// }
|
||||||
|
|
||||||
|
async fetchItems(context: Context): Promise<SpotifyFeedItem[]> {
|
||||||
|
const track = await this.client.getCurrentTrack()
|
||||||
|
if (!track) return []
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: `spotify-${track.id}`,
|
||||||
|
type: "spotify-now-playing",
|
||||||
|
priority: 0.4,
|
||||||
|
timestamp: context.time,
|
||||||
|
data: { trackName: track.name, artist: track.artist },
|
||||||
|
actions: [
|
||||||
|
{ actionId: "pause-playback" },
|
||||||
|
{ actionId: "skip-track" },
|
||||||
|
{ actionId: "like-track", params: { trackId: track.id } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
1. `ActionDefinition` type exists with `id`, `label`, `description?`, `inputSchema?`
|
||||||
|
2. `ActionResult` type exists with `ok`, `data?`, `error?`
|
||||||
|
3. `ItemAction` type exists with `actionId`, `label?`, `params?`
|
||||||
|
4. `FeedSource.listActions()` is a required method returning `Record<string, ActionDefinition>` (empty record if no actions)
|
||||||
|
5. `FeedSource.executeAction()` is a required method (no-op for sources without actions)
|
||||||
|
6. `FeedItem.actions` is an optional readonly array of `ItemAction`
|
||||||
|
7. `FeedEngine.executeAction()` routes to correct source, returns `ActionResult`
|
||||||
|
8. `FeedEngine.listActions()` aggregates actions from all sources
|
||||||
|
9. Existing tests pass unchanged (all changes are additive)
|
||||||
|
10. New tests: action execution, unknown action ID, unknown source ID, source without actions, `listActions()` aggregation
|
||||||
|
|
||||||
|
## Implementation Steps
|
||||||
|
|
||||||
|
1. Create `action.ts` in `aris-core/src` with `ActionDefinition`, `ActionResult`, `ItemAction`
|
||||||
|
2. Add optional `actions` and `executeAction` to `FeedSource` interface in `feed-source.ts`
|
||||||
|
3. Add optional `actions` field to `FeedItem` interface in `feed.ts`
|
||||||
|
4. Add `executeAction()` and `listActions()` to `FeedEngine` in `feed-engine.ts`
|
||||||
|
5. Export new types from `aris-core/index.ts`
|
||||||
|
6. Add tests for `FeedEngine.executeAction()` routing
|
||||||
|
7. Add tests for `FeedEngine.listActions()` aggregation
|
||||||
|
8. Add tests for error cases (unknown action, unknown source, source without actions)
|
||||||
|
9. Update source IDs to reverse-domain format (`"location"` → `"aris.location"`, etc.) across all source packages
|
||||||
|
10. Migrate `LocationSource.pushLocation()` → action `update-location` on `aris.location`
|
||||||
|
11. Migrate `TflSource.setLinesOfInterest()` → action `set-lines-of-interest` on `aris.tfl`
|
||||||
|
12. Add `async listActions() { return {} }` and no-op `executeAction()` to sources without actions (WeatherSource, GoogleCalendarSource, AppleCalendarSource)
|
||||||
|
13. Update any tests or code referencing old source IDs
|
||||||
|
14. Run all tests to confirm nothing breaks
|
||||||
|
|
||||||
|
## What This Defers
|
||||||
|
|
||||||
|
- Transport layer (JSON-RPC over HTTP/WebSocket) — built when remote sources are needed
|
||||||
|
- `RemoteFeedSource` adapter — mechanical once transport exists
|
||||||
|
- MCP adapter — wraps MCP servers as FeedSource
|
||||||
|
- Runtime schema validation of action params
|
||||||
|
- Action permissions / confirmation UI
|
||||||
|
- Source discovery / registry API
|
||||||
|
- Backend service consolidation (separate spec, depends on this one)
|
||||||
@@ -6,5 +6,8 @@
|
|||||||
"types": "src/index.ts",
|
"types": "src/index.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "bun test ."
|
"test": "bun test ."
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@standard-schema/spec": "^1.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
27
packages/aris-core/src/action.ts
Normal file
27
packages/aris-core/src/action.ts
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import type { StandardSchemaV1 } from "@standard-schema/spec"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Describes an action a source can perform.
|
||||||
|
*
|
||||||
|
* Action IDs use descriptive verb-noun kebab-case (e.g., "update-location", "play-track").
|
||||||
|
* Combined with the source's reverse-domain ID, they form a globally unique identifier:
|
||||||
|
* `<sourceId>/<actionId>` (e.g., "aris.location/update-location").
|
||||||
|
*/
|
||||||
|
export class UnknownActionError extends Error {
|
||||||
|
readonly actionId: string
|
||||||
|
|
||||||
|
constructor(actionId: string) {
|
||||||
|
super(`Unknown action: ${actionId}`)
|
||||||
|
this.name = "UnknownActionError"
|
||||||
|
this.actionId = actionId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ActionDefinition<TInput = unknown> {
|
||||||
|
/** Descriptive action name in kebab-case (e.g., "update-location", "play-track") */
|
||||||
|
readonly id: string
|
||||||
|
/** Optional longer description */
|
||||||
|
readonly description?: string
|
||||||
|
/** Schema for input validation. Accepts any Standard Schema compatible validator (arktype, zod, valibot, etc.). */
|
||||||
|
readonly input?: StandardSchemaV1<TInput>
|
||||||
|
}
|
||||||
@@ -1,9 +1,19 @@
|
|||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
import type { Context, ContextKey, FeedItem, FeedSource } from "./index"
|
import type { ActionDefinition, Context, ContextKey, FeedItem, FeedSource } from "./index"
|
||||||
|
|
||||||
import { FeedEngine } from "./feed-engine"
|
import { FeedEngine } from "./feed-engine"
|
||||||
import { contextKey, contextValue } from "./index"
|
import { UnknownActionError, contextKey, contextValue } from "./index"
|
||||||
|
|
||||||
|
// No-op action methods for test sources
|
||||||
|
const noActions = {
|
||||||
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {}
|
||||||
|
},
|
||||||
|
async executeAction(actionId: string): Promise<void> {
|
||||||
|
throw new UnknownActionError(actionId)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
// CONTEXT KEYS
|
// CONTEXT KEYS
|
||||||
@@ -43,6 +53,7 @@ function createLocationSource(): SimulatedLocationSource {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
id: "location",
|
id: "location",
|
||||||
|
...noActions,
|
||||||
|
|
||||||
onContextUpdate(cb) {
|
onContextUpdate(cb) {
|
||||||
callback = cb
|
callback = cb
|
||||||
@@ -71,10 +82,11 @@ function createWeatherSource(
|
|||||||
return {
|
return {
|
||||||
id: "weather",
|
id: "weather",
|
||||||
dependencies: ["location"],
|
dependencies: ["location"],
|
||||||
|
...noActions,
|
||||||
|
|
||||||
async fetchContext(context) {
|
async fetchContext(context) {
|
||||||
const location = contextValue(context, LocationKey)
|
const location = contextValue(context, LocationKey)
|
||||||
if (!location) return {}
|
if (!location) return null
|
||||||
|
|
||||||
const weather = await fetchWeather(location)
|
const weather = await fetchWeather(location)
|
||||||
return { [WeatherKey]: weather }
|
return { [WeatherKey]: weather }
|
||||||
@@ -104,6 +116,11 @@ function createAlertSource(): FeedSource<AlertFeedItem> {
|
|||||||
return {
|
return {
|
||||||
id: "alert",
|
id: "alert",
|
||||||
dependencies: ["weather"],
|
dependencies: ["weather"],
|
||||||
|
...noActions,
|
||||||
|
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
|
||||||
async fetchItems(context) {
|
async fetchItems(context) {
|
||||||
const weather = contextValue(context, WeatherKey)
|
const weather = contextValue(context, WeatherKey)
|
||||||
@@ -164,39 +181,78 @@ describe("FeedEngine", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
describe("graph validation", () => {
|
describe("graph validation", () => {
|
||||||
test("throws on missing dependency", () => {
|
test("throws on missing dependency", async () => {
|
||||||
const engine = new FeedEngine()
|
const engine = new FeedEngine()
|
||||||
const orphan: FeedSource = {
|
const orphan: FeedSource = {
|
||||||
id: "orphan",
|
id: "orphan",
|
||||||
dependencies: ["nonexistent"],
|
dependencies: ["nonexistent"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
engine.register(orphan)
|
engine.register(orphan)
|
||||||
|
|
||||||
expect(engine.refresh()).rejects.toThrow(
|
await expect(engine.refresh()).rejects.toThrow(
|
||||||
'Source "orphan" depends on "nonexistent" which is not registered',
|
'Source "orphan" depends on "nonexistent" which is not registered',
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("throws on circular dependency", () => {
|
test("throws on circular dependency", async () => {
|
||||||
const engine = new FeedEngine()
|
const engine = new FeedEngine()
|
||||||
const a: FeedSource = { id: "a", dependencies: ["b"] }
|
const a: FeedSource = {
|
||||||
const b: FeedSource = { id: "b", dependencies: ["a"] }
|
id: "a",
|
||||||
|
dependencies: ["b"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const b: FeedSource = {
|
||||||
|
id: "b",
|
||||||
|
dependencies: ["a"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
engine.register(a).register(b)
|
engine.register(a).register(b)
|
||||||
|
|
||||||
expect(engine.refresh()).rejects.toThrow("Circular dependency detected: a → b → a")
|
await expect(engine.refresh()).rejects.toThrow("Circular dependency detected: a → b → a")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("throws on longer cycles", () => {
|
test("throws on longer cycles", async () => {
|
||||||
const engine = new FeedEngine()
|
const engine = new FeedEngine()
|
||||||
const a: FeedSource = { id: "a", dependencies: ["c"] }
|
const a: FeedSource = {
|
||||||
const b: FeedSource = { id: "b", dependencies: ["a"] }
|
id: "a",
|
||||||
const c: FeedSource = { id: "c", dependencies: ["b"] }
|
dependencies: ["c"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const b: FeedSource = {
|
||||||
|
id: "b",
|
||||||
|
dependencies: ["a"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const c: FeedSource = {
|
||||||
|
id: "c",
|
||||||
|
dependencies: ["b"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
engine.register(a).register(b).register(c)
|
engine.register(a).register(b).register(c)
|
||||||
|
|
||||||
expect(engine.refresh()).rejects.toThrow("Circular dependency detected")
|
await expect(engine.refresh()).rejects.toThrow("Circular dependency detected")
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -206,6 +262,7 @@ describe("FeedEngine", () => {
|
|||||||
|
|
||||||
const location: FeedSource = {
|
const location: FeedSource = {
|
||||||
id: "location",
|
id: "location",
|
||||||
|
...noActions,
|
||||||
async fetchContext() {
|
async fetchContext() {
|
||||||
order.push("location")
|
order.push("location")
|
||||||
return { [LocationKey]: { lat: 51.5, lng: -0.1 } }
|
return { [LocationKey]: { lat: 51.5, lng: -0.1 } }
|
||||||
@@ -215,6 +272,7 @@ describe("FeedEngine", () => {
|
|||||||
const weather: FeedSource = {
|
const weather: FeedSource = {
|
||||||
id: "weather",
|
id: "weather",
|
||||||
dependencies: ["location"],
|
dependencies: ["location"],
|
||||||
|
...noActions,
|
||||||
async fetchContext(ctx) {
|
async fetchContext(ctx) {
|
||||||
order.push("weather")
|
order.push("weather")
|
||||||
const loc = contextValue(ctx, LocationKey)
|
const loc = contextValue(ctx, LocationKey)
|
||||||
@@ -240,8 +298,14 @@ describe("FeedEngine", () => {
|
|||||||
|
|
||||||
const { context } = await engine.refresh()
|
const { context } = await engine.refresh()
|
||||||
|
|
||||||
expect(contextValue(context, LocationKey)).toEqual({ lat: 51.5, lng: -0.1 })
|
expect(contextValue(context, LocationKey)).toEqual({
|
||||||
expect(contextValue(context, WeatherKey)).toEqual({ temperature: 20, condition: "sunny" })
|
lat: 51.5,
|
||||||
|
lng: -0.1,
|
||||||
|
})
|
||||||
|
expect(contextValue(context, WeatherKey)).toEqual({
|
||||||
|
temperature: 20,
|
||||||
|
condition: "sunny",
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
test("collects items from all sources", async () => {
|
test("collects items from all sources", async () => {
|
||||||
@@ -281,8 +345,9 @@ describe("FeedEngine", () => {
|
|||||||
test("handles missing upstream context gracefully", async () => {
|
test("handles missing upstream context gracefully", async () => {
|
||||||
const location: FeedSource = {
|
const location: FeedSource = {
|
||||||
id: "location",
|
id: "location",
|
||||||
|
...noActions,
|
||||||
async fetchContext() {
|
async fetchContext() {
|
||||||
return {} // No location available
|
return null // No location available
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -299,6 +364,7 @@ describe("FeedEngine", () => {
|
|||||||
test("captures errors from fetchContext", async () => {
|
test("captures errors from fetchContext", async () => {
|
||||||
const failing: FeedSource = {
|
const failing: FeedSource = {
|
||||||
id: "failing",
|
id: "failing",
|
||||||
|
...noActions,
|
||||||
async fetchContext() {
|
async fetchContext() {
|
||||||
throw new Error("Context fetch failed")
|
throw new Error("Context fetch failed")
|
||||||
},
|
},
|
||||||
@@ -316,6 +382,10 @@ describe("FeedEngine", () => {
|
|||||||
test("captures errors from fetchItems", async () => {
|
test("captures errors from fetchItems", async () => {
|
||||||
const failing: FeedSource = {
|
const failing: FeedSource = {
|
||||||
id: "failing",
|
id: "failing",
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
async fetchItems() {
|
async fetchItems() {
|
||||||
throw new Error("Items fetch failed")
|
throw new Error("Items fetch failed")
|
||||||
},
|
},
|
||||||
@@ -333,6 +403,7 @@ describe("FeedEngine", () => {
|
|||||||
test("continues after source error", async () => {
|
test("continues after source error", async () => {
|
||||||
const failing: FeedSource = {
|
const failing: FeedSource = {
|
||||||
id: "failing",
|
id: "failing",
|
||||||
|
...noActions,
|
||||||
async fetchContext() {
|
async fetchContext() {
|
||||||
throw new Error("Failed")
|
throw new Error("Failed")
|
||||||
},
|
},
|
||||||
@@ -340,6 +411,10 @@ describe("FeedEngine", () => {
|
|||||||
|
|
||||||
const working: FeedSource = {
|
const working: FeedSource = {
|
||||||
id: "working",
|
id: "working",
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
async fetchItems() {
|
async fetchItems() {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
@@ -380,7 +455,10 @@ describe("FeedEngine", () => {
|
|||||||
await engine.refresh()
|
await engine.refresh()
|
||||||
|
|
||||||
const context = engine.currentContext()
|
const context = engine.currentContext()
|
||||||
expect(contextValue(context, LocationKey)).toEqual({ lat: 51.5, lng: -0.1 })
|
expect(contextValue(context, LocationKey)).toEqual({
|
||||||
|
lat: 51.5,
|
||||||
|
lng: -0.1,
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -455,4 +533,109 @@ describe("FeedEngine", () => {
|
|||||||
engine.stop()
|
engine.stop()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("executeAction", () => {
|
||||||
|
test("routes action to correct source", async () => {
|
||||||
|
let receivedAction = ""
|
||||||
|
let receivedParams: unknown = {}
|
||||||
|
|
||||||
|
const source: FeedSource = {
|
||||||
|
id: "test-source",
|
||||||
|
async listActions() {
|
||||||
|
return {
|
||||||
|
"do-thing": { id: "do-thing" },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async executeAction(actionId, params) {
|
||||||
|
receivedAction = actionId
|
||||||
|
receivedParams = params
|
||||||
|
},
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const engine = new FeedEngine().register(source)
|
||||||
|
await engine.executeAction("test-source", "do-thing", { key: "value" })
|
||||||
|
|
||||||
|
expect(receivedAction).toBe("do-thing")
|
||||||
|
expect(receivedParams).toEqual({ key: "value" })
|
||||||
|
})
|
||||||
|
|
||||||
|
test("throws for unknown source", async () => {
|
||||||
|
const engine = new FeedEngine()
|
||||||
|
|
||||||
|
await expect(engine.executeAction("nonexistent", "action", {})).rejects.toThrow(
|
||||||
|
"Source not found: nonexistent",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("throws for unknown action on source", async () => {
|
||||||
|
const source: FeedSource = {
|
||||||
|
id: "test-source",
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const engine = new FeedEngine().register(source)
|
||||||
|
|
||||||
|
await expect(engine.executeAction("test-source", "nonexistent", {})).rejects.toThrow(
|
||||||
|
'Action "nonexistent" not found on source "test-source"',
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("listActions", () => {
|
||||||
|
test("returns actions for a specific source", async () => {
|
||||||
|
const source: FeedSource = {
|
||||||
|
id: "test-source",
|
||||||
|
async listActions() {
|
||||||
|
return {
|
||||||
|
"action-1": { id: "action-1" },
|
||||||
|
"action-2": { id: "action-2" },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async executeAction() {},
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const engine = new FeedEngine().register(source)
|
||||||
|
const actions = await engine.listActions("test-source")
|
||||||
|
|
||||||
|
expect(Object.keys(actions)).toEqual(["action-1", "action-2"])
|
||||||
|
})
|
||||||
|
|
||||||
|
test("throws for unknown source", async () => {
|
||||||
|
const engine = new FeedEngine()
|
||||||
|
|
||||||
|
await expect(engine.listActions("nonexistent")).rejects.toThrow(
|
||||||
|
"Source not found: nonexistent",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("throws on mismatched action ID", async () => {
|
||||||
|
const source: FeedSource = {
|
||||||
|
id: "bad-source",
|
||||||
|
async listActions() {
|
||||||
|
return {
|
||||||
|
"correct-key": { id: "wrong-id" },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async executeAction() {},
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const engine = new FeedEngine().register(source)
|
||||||
|
|
||||||
|
await expect(engine.listActions("bad-source")).rejects.toThrow(
|
||||||
|
'Action ID mismatch on source "bad-source"',
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import type { ActionDefinition } from "./action"
|
||||||
import type { Context } from "./context"
|
import type { Context } from "./context"
|
||||||
import type { FeedItem } from "./feed"
|
import type { FeedItem } from "./feed"
|
||||||
import type { FeedSource } from "./feed-source"
|
import type { FeedSource } from "./feed-source"
|
||||||
@@ -89,16 +90,16 @@ export class FeedEngine<TItems extends FeedItem = FeedItem> {
|
|||||||
|
|
||||||
// Run fetchContext in topological order
|
// Run fetchContext in topological order
|
||||||
for (const source of graph.sorted) {
|
for (const source of graph.sorted) {
|
||||||
if (source.fetchContext) {
|
try {
|
||||||
try {
|
const update = await source.fetchContext(context)
|
||||||
const update = await source.fetchContext(context)
|
if (update) {
|
||||||
context = { ...context, ...update }
|
context = { ...context, ...update }
|
||||||
} catch (err) {
|
|
||||||
errors.push({
|
|
||||||
sourceId: source.id,
|
|
||||||
error: err instanceof Error ? err : new Error(String(err)),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
} catch (err) {
|
||||||
|
errors.push({
|
||||||
|
sourceId: source.id,
|
||||||
|
error: err instanceof Error ? err : new Error(String(err)),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -187,6 +188,44 @@ export class FeedEngine<TItems extends FeedItem = FeedItem> {
|
|||||||
return this.context
|
return this.context
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute an action on a registered source.
|
||||||
|
* Validates the action exists before dispatching.
|
||||||
|
*
|
||||||
|
* In pull-only mode (before `start()` is called), the action mutates source
|
||||||
|
* state but does not automatically refresh dependents. Call `refresh()`
|
||||||
|
* after to propagate changes. In reactive mode (`start()` called), sources
|
||||||
|
* that push context updates (e.g., LocationSource) will trigger dependent
|
||||||
|
* refresh automatically.
|
||||||
|
*/
|
||||||
|
async executeAction(sourceId: string, actionId: string, params: unknown): Promise<unknown> {
|
||||||
|
const actions = await this.listActions(sourceId)
|
||||||
|
if (!(actionId in actions)) {
|
||||||
|
throw new Error(`Action "${actionId}" not found on source "${sourceId}"`)
|
||||||
|
}
|
||||||
|
return this.sources.get(sourceId)!.executeAction(actionId, params)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List actions available on a specific source.
|
||||||
|
* Validates that action definition IDs match their record keys.
|
||||||
|
*/
|
||||||
|
async listActions(sourceId: string): Promise<Record<string, ActionDefinition>> {
|
||||||
|
const source = this.sources.get(sourceId)
|
||||||
|
if (!source) {
|
||||||
|
throw new Error(`Source not found: ${sourceId}`)
|
||||||
|
}
|
||||||
|
const actions = await source.listActions()
|
||||||
|
for (const [key, definition] of Object.entries(actions)) {
|
||||||
|
if (key !== definition.id) {
|
||||||
|
throw new Error(
|
||||||
|
`Action ID mismatch on source "${sourceId}": key "${key}" !== definition.id "${definition.id}"`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return actions
|
||||||
|
}
|
||||||
|
|
||||||
private ensureGraph(): SourceGraph {
|
private ensureGraph(): SourceGraph {
|
||||||
if (!this.graph) {
|
if (!this.graph) {
|
||||||
this.graph = buildGraph(Array.from(this.sources.values()))
|
this.graph = buildGraph(Array.from(this.sources.values()))
|
||||||
@@ -208,10 +247,12 @@ export class FeedEngine<TItems extends FeedItem = FeedItem> {
|
|||||||
// Re-run fetchContext for dependents in order
|
// Re-run fetchContext for dependents in order
|
||||||
for (const id of toRefresh) {
|
for (const id of toRefresh) {
|
||||||
const source = graph.sources.get(id)
|
const source = graph.sources.get(id)
|
||||||
if (source?.fetchContext) {
|
if (source) {
|
||||||
try {
|
try {
|
||||||
const update = await source.fetchContext(this.context)
|
const update = await source.fetchContext(this.context)
|
||||||
this.context = { ...this.context, ...update }
|
if (update) {
|
||||||
|
this.context = { ...this.context, ...update }
|
||||||
|
}
|
||||||
} catch {
|
} catch {
|
||||||
// Errors during reactive updates are logged but don't stop propagation
|
// Errors during reactive updates are logged but don't stop propagation
|
||||||
}
|
}
|
||||||
@@ -238,7 +279,11 @@ export class FeedEngine<TItems extends FeedItem = FeedItem> {
|
|||||||
|
|
||||||
items.sort((a, b) => b.priority - a.priority)
|
items.sort((a, b) => b.priority - a.priority)
|
||||||
|
|
||||||
this.notifySubscribers({ context: this.context, items: items as TItems[], errors })
|
this.notifySubscribers({
|
||||||
|
context: this.context,
|
||||||
|
items: items as TItems[],
|
||||||
|
errors,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
private collectDependents(sourceId: string, graph: SourceGraph): string[] {
|
private collectDependents(sourceId: string, graph: SourceGraph): string[] {
|
||||||
|
|||||||
@@ -1,8 +1,18 @@
|
|||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
import type { Context, ContextKey, FeedItem, FeedSource } from "./index"
|
import type { ActionDefinition, Context, ContextKey, FeedItem, FeedSource } from "./index"
|
||||||
|
|
||||||
import { contextKey, contextValue } from "./index"
|
import { UnknownActionError, contextKey, contextValue } from "./index"
|
||||||
|
|
||||||
|
// No-op action methods for test sources
|
||||||
|
const noActions = {
|
||||||
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {}
|
||||||
|
},
|
||||||
|
async executeAction(actionId: string): Promise<void> {
|
||||||
|
throw new UnknownActionError(actionId)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
// CONTEXT KEYS
|
// CONTEXT KEYS
|
||||||
@@ -42,6 +52,7 @@ function createLocationSource(): SimulatedLocationSource {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
id: "location",
|
id: "location",
|
||||||
|
...noActions,
|
||||||
|
|
||||||
onContextUpdate(cb) {
|
onContextUpdate(cb) {
|
||||||
callback = cb
|
callback = cb
|
||||||
@@ -70,10 +81,11 @@ function createWeatherSource(
|
|||||||
return {
|
return {
|
||||||
id: "weather",
|
id: "weather",
|
||||||
dependencies: ["location"],
|
dependencies: ["location"],
|
||||||
|
...noActions,
|
||||||
|
|
||||||
async fetchContext(context) {
|
async fetchContext(context) {
|
||||||
const location = contextValue(context, LocationKey)
|
const location = contextValue(context, LocationKey)
|
||||||
if (!location) return {}
|
if (!location) return null
|
||||||
|
|
||||||
const weather = await fetchWeather(location)
|
const weather = await fetchWeather(location)
|
||||||
return { [WeatherKey]: weather }
|
return { [WeatherKey]: weather }
|
||||||
@@ -103,6 +115,11 @@ function createAlertSource(): FeedSource<AlertFeedItem> {
|
|||||||
return {
|
return {
|
||||||
id: "alert",
|
id: "alert",
|
||||||
dependencies: ["weather"],
|
dependencies: ["weather"],
|
||||||
|
...noActions,
|
||||||
|
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
|
||||||
async fetchItems(context) {
|
async fetchItems(context) {
|
||||||
const weather = contextValue(context, WeatherKey)
|
const weather = contextValue(context, WeatherKey)
|
||||||
@@ -194,8 +211,8 @@ async function refreshGraph(graph: SourceGraph): Promise<{ context: Context; ite
|
|||||||
|
|
||||||
// Run fetchContext in topological order
|
// Run fetchContext in topological order
|
||||||
for (const source of graph.sorted) {
|
for (const source of graph.sorted) {
|
||||||
if (source.fetchContext) {
|
const update = await source.fetchContext(context)
|
||||||
const update = await source.fetchContext(context)
|
if (update) {
|
||||||
context = { ...context, ...update }
|
context = { ...context, ...update }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -245,9 +262,15 @@ describe("FeedSource", () => {
|
|||||||
|
|
||||||
expect(source.id).toBe("alert")
|
expect(source.id).toBe("alert")
|
||||||
expect(source.dependencies).toEqual(["weather"])
|
expect(source.dependencies).toEqual(["weather"])
|
||||||
expect(source.fetchContext).toBeUndefined()
|
expect(source.fetchContext).toBeDefined()
|
||||||
expect(source.fetchItems).toBeDefined()
|
expect(source.fetchItems).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test("source without context returns null from fetchContext", async () => {
|
||||||
|
const source = createAlertSource()
|
||||||
|
const result = await source.fetchContext({ time: new Date() })
|
||||||
|
expect(result).toBeNull()
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe("graph validation", () => {
|
describe("graph validation", () => {
|
||||||
@@ -255,6 +278,10 @@ describe("FeedSource", () => {
|
|||||||
const orphan: FeedSource = {
|
const orphan: FeedSource = {
|
||||||
id: "orphan",
|
id: "orphan",
|
||||||
dependencies: ["nonexistent"],
|
dependencies: ["nonexistent"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
expect(() => buildGraph([orphan])).toThrow(
|
expect(() => buildGraph([orphan])).toThrow(
|
||||||
@@ -263,16 +290,51 @@ describe("FeedSource", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("detects circular dependencies", () => {
|
test("detects circular dependencies", () => {
|
||||||
const a: FeedSource = { id: "a", dependencies: ["b"] }
|
const a: FeedSource = {
|
||||||
const b: FeedSource = { id: "b", dependencies: ["a"] }
|
id: "a",
|
||||||
|
dependencies: ["b"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const b: FeedSource = {
|
||||||
|
id: "b",
|
||||||
|
dependencies: ["a"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
expect(() => buildGraph([a, b])).toThrow("Circular dependency detected: a → b → a")
|
expect(() => buildGraph([a, b])).toThrow("Circular dependency detected: a → b → a")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("detects longer cycles", () => {
|
test("detects longer cycles", () => {
|
||||||
const a: FeedSource = { id: "a", dependencies: ["c"] }
|
const a: FeedSource = {
|
||||||
const b: FeedSource = { id: "b", dependencies: ["a"] }
|
id: "a",
|
||||||
const c: FeedSource = { id: "c", dependencies: ["b"] }
|
dependencies: ["c"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const b: FeedSource = {
|
||||||
|
id: "b",
|
||||||
|
dependencies: ["a"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const c: FeedSource = {
|
||||||
|
id: "c",
|
||||||
|
dependencies: ["b"],
|
||||||
|
...noActions,
|
||||||
|
async fetchContext() {
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
expect(() => buildGraph([a, b, c])).toThrow("Circular dependency detected")
|
expect(() => buildGraph([a, b, c])).toThrow("Circular dependency detected")
|
||||||
})
|
})
|
||||||
@@ -307,6 +369,7 @@ describe("FeedSource", () => {
|
|||||||
|
|
||||||
const location: FeedSource = {
|
const location: FeedSource = {
|
||||||
id: "location",
|
id: "location",
|
||||||
|
...noActions,
|
||||||
async fetchContext() {
|
async fetchContext() {
|
||||||
order.push("location")
|
order.push("location")
|
||||||
return { [LocationKey]: { lat: 51.5, lng: -0.1 } }
|
return { [LocationKey]: { lat: 51.5, lng: -0.1 } }
|
||||||
@@ -316,6 +379,7 @@ describe("FeedSource", () => {
|
|||||||
const weather: FeedSource = {
|
const weather: FeedSource = {
|
||||||
id: "weather",
|
id: "weather",
|
||||||
dependencies: ["location"],
|
dependencies: ["location"],
|
||||||
|
...noActions,
|
||||||
async fetchContext(ctx) {
|
async fetchContext(ctx) {
|
||||||
order.push("weather")
|
order.push("weather")
|
||||||
const loc = contextValue(ctx, LocationKey)
|
const loc = contextValue(ctx, LocationKey)
|
||||||
@@ -339,8 +403,14 @@ describe("FeedSource", () => {
|
|||||||
const graph = buildGraph([location, weather])
|
const graph = buildGraph([location, weather])
|
||||||
const { context } = await refreshGraph(graph)
|
const { context } = await refreshGraph(graph)
|
||||||
|
|
||||||
expect(contextValue(context, LocationKey)).toEqual({ lat: 51.5, lng: -0.1 })
|
expect(contextValue(context, LocationKey)).toEqual({
|
||||||
expect(contextValue(context, WeatherKey)).toEqual({ temperature: 20, condition: "sunny" })
|
lat: 51.5,
|
||||||
|
lng: -0.1,
|
||||||
|
})
|
||||||
|
expect(contextValue(context, WeatherKey)).toEqual({
|
||||||
|
temperature: 20,
|
||||||
|
condition: "sunny",
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
test("collects items from all sources", async () => {
|
test("collects items from all sources", async () => {
|
||||||
@@ -376,12 +446,13 @@ describe("FeedSource", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("source without location context returns empty items", async () => {
|
test("source without location context returns empty items", async () => {
|
||||||
// Location source exists but hasn't been updated (returns default 0,0)
|
// Location source exists but hasn't been updated
|
||||||
const location: FeedSource = {
|
const location: FeedSource = {
|
||||||
id: "location",
|
id: "location",
|
||||||
|
...noActions,
|
||||||
async fetchContext() {
|
async fetchContext() {
|
||||||
// Simulate no location available
|
// Simulate no location available
|
||||||
return {}
|
return null
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,54 +1,60 @@
|
|||||||
|
import type { ActionDefinition } from "./action"
|
||||||
import type { Context } from "./context"
|
import type { Context } from "./context"
|
||||||
import type { FeedItem } from "./feed"
|
import type { FeedItem } from "./feed"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unified interface for sources that provide context and/or feed items.
|
* Unified interface for sources that provide context, feed items, and actions.
|
||||||
*
|
*
|
||||||
* Sources form a dependency graph - a source declares which other sources
|
* Sources form a dependency graph — a source declares which other sources
|
||||||
* it depends on, and the graph ensures dependencies are resolved before
|
* it depends on, and the graph ensures dependencies are resolved before
|
||||||
* dependents run.
|
* dependents run.
|
||||||
*
|
*
|
||||||
* A source may:
|
* Source IDs use reverse domain notation. Built-in sources use `aris.<name>`,
|
||||||
* - Provide context for other sources (implement fetchContext/onContextUpdate)
|
* third parties use their own domain (e.g., `com.spotify`).
|
||||||
* - Produce feed items (implement fetchItems/onItemsUpdate)
|
*
|
||||||
* - Both
|
* Every method maps to a protocol operation for remote source support:
|
||||||
|
* - `id`, `dependencies` → source/describe
|
||||||
|
* - `listActions()` → source/listActions
|
||||||
|
* - `executeAction()` → source/executeAction
|
||||||
|
* - `fetchContext()` → source/fetchContext
|
||||||
|
* - `fetchItems()` → source/fetchItems
|
||||||
|
* - `onContextUpdate()` → source/contextUpdated (notification)
|
||||||
|
* - `onItemsUpdate()` → source/itemsUpdated (notification)
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* ```ts
|
* ```ts
|
||||||
* // Location source - provides context only
|
|
||||||
* const locationSource: FeedSource = {
|
* const locationSource: FeedSource = {
|
||||||
* id: "location",
|
* id: "aris.location",
|
||||||
* fetchContext: async () => {
|
* async listActions() { return { "update-location": { id: "update-location" } } },
|
||||||
* const pos = await getCurrentPosition()
|
* async executeAction(actionId) { throw new UnknownActionError(actionId) },
|
||||||
* return { location: { lat: pos.coords.latitude, lng: pos.coords.longitude } }
|
* async fetchContext() { ... },
|
||||||
* },
|
|
||||||
* }
|
|
||||||
*
|
|
||||||
* // Weather source - depends on location, provides both context and items
|
|
||||||
* const weatherSource: FeedSource<WeatherFeedItem> = {
|
|
||||||
* id: "weather",
|
|
||||||
* dependencies: ["location"],
|
|
||||||
* fetchContext: async (ctx) => {
|
|
||||||
* const weather = await fetchWeather(ctx.location)
|
|
||||||
* return { weather }
|
|
||||||
* },
|
|
||||||
* fetchItems: async (ctx) => {
|
|
||||||
* return createWeatherFeedItems(ctx.weather)
|
|
||||||
* },
|
|
||||||
* }
|
* }
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
export interface FeedSource<TItem extends FeedItem = FeedItem> {
|
export interface FeedSource<TItem extends FeedItem = FeedItem> {
|
||||||
/** Unique identifier for this source */
|
/** Unique identifier for this source in reverse-domain format */
|
||||||
readonly id: string
|
readonly id: string
|
||||||
|
|
||||||
/** IDs of sources this source depends on */
|
/** IDs of sources this source depends on */
|
||||||
readonly dependencies?: readonly string[]
|
readonly dependencies?: readonly string[]
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List actions this source supports. Empty record if none.
|
||||||
|
* Maps to: source/listActions
|
||||||
|
*/
|
||||||
|
listActions(): Promise<Record<string, ActionDefinition>>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute an action by ID. Throws on unknown action or invalid input.
|
||||||
|
* Maps to: source/executeAction
|
||||||
|
*/
|
||||||
|
executeAction(actionId: string, params: unknown): Promise<unknown>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Subscribe to reactive context updates.
|
* Subscribe to reactive context updates.
|
||||||
* Called when the source can push context changes proactively.
|
* Called when the source can push context changes proactively.
|
||||||
* Returns cleanup function.
|
* Returns cleanup function.
|
||||||
|
* Maps to: source/contextUpdated (notification, source → host)
|
||||||
*/
|
*/
|
||||||
onContextUpdate?(
|
onContextUpdate?(
|
||||||
callback: (update: Partial<Context>) => void,
|
callback: (update: Partial<Context>) => void,
|
||||||
@@ -58,19 +64,23 @@ export interface FeedSource<TItem extends FeedItem = FeedItem> {
|
|||||||
/**
|
/**
|
||||||
* Fetch context on-demand.
|
* Fetch context on-demand.
|
||||||
* Called during manual refresh or initial load.
|
* Called during manual refresh or initial load.
|
||||||
|
* Return null if this source cannot provide context.
|
||||||
|
* Maps to: source/fetchContext
|
||||||
*/
|
*/
|
||||||
fetchContext?(context: Context): Promise<Partial<Context>>
|
fetchContext(context: Context): Promise<Partial<Context> | null>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Subscribe to reactive feed item updates.
|
* Subscribe to reactive feed item updates.
|
||||||
* Called when the source can push item changes proactively.
|
* Called when the source can push item changes proactively.
|
||||||
* Returns cleanup function.
|
* Returns cleanup function.
|
||||||
|
* Maps to: source/itemsUpdated (notification, source → host)
|
||||||
*/
|
*/
|
||||||
onItemsUpdate?(callback: (items: TItem[]) => void, getContext: () => Context): () => void
|
onItemsUpdate?(callback: (items: TItem[]) => void, getContext: () => Context): () => void
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetch feed items on-demand.
|
* Fetch feed items on-demand.
|
||||||
* Called during manual refresh or when dependencies update.
|
* Called during manual refresh or when dependencies update.
|
||||||
|
* Maps to: source/fetchItems
|
||||||
*/
|
*/
|
||||||
fetchItems?(context: Context): Promise<TItem[]>
|
fetchItems?(context: Context): Promise<TItem[]>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
export type { Context, ContextKey } from "./context"
|
export type { Context, ContextKey } from "./context"
|
||||||
export { contextKey, contextValue } from "./context"
|
export { contextKey, contextValue } from "./context"
|
||||||
|
|
||||||
|
// Actions
|
||||||
|
export type { ActionDefinition } from "./action"
|
||||||
|
export { UnknownActionError } from "./action"
|
||||||
|
|
||||||
// Feed
|
// Feed
|
||||||
export type { FeedItem } from "./feed"
|
export type { FeedItem } from "./feed"
|
||||||
|
|
||||||
|
|||||||
@@ -26,14 +26,18 @@ const createMockContext = (location?: { lat: number; lng: number }): Context =>
|
|||||||
|
|
||||||
describe("WeatherKitDataSource", () => {
|
describe("WeatherKitDataSource", () => {
|
||||||
test("returns empty array when location is missing", async () => {
|
test("returns empty array when location is missing", async () => {
|
||||||
const dataSource = new WeatherKitDataSource({ credentials: mockCredentials })
|
const dataSource = new WeatherKitDataSource({
|
||||||
|
credentials: mockCredentials,
|
||||||
|
})
|
||||||
const items = await dataSource.query(createMockContext())
|
const items = await dataSource.query(createMockContext())
|
||||||
|
|
||||||
expect(items).toEqual([])
|
expect(items).toEqual([])
|
||||||
})
|
})
|
||||||
|
|
||||||
test("type is weather-current", () => {
|
test("type is weather-current", () => {
|
||||||
const dataSource = new WeatherKitDataSource({ credentials: mockCredentials })
|
const dataSource = new WeatherKitDataSource({
|
||||||
|
credentials: mockCredentials,
|
||||||
|
})
|
||||||
|
|
||||||
expect(dataSource.type).toBe(WeatherFeedItemType.current)
|
expect(dataSource.type).toBe(WeatherFeedItemType.current)
|
||||||
})
|
})
|
||||||
@@ -100,7 +104,9 @@ describe("WeatherKitDataSource with fixture", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("default limits are applied", () => {
|
test("default limits are applied", () => {
|
||||||
const dataSource = new WeatherKitDataSource({ credentials: mockCredentials })
|
const dataSource = new WeatherKitDataSource({
|
||||||
|
credentials: mockCredentials,
|
||||||
|
})
|
||||||
|
|
||||||
expect(dataSource["hourlyLimit"]).toBe(12)
|
expect(dataSource["hourlyLimit"]).toBe(12)
|
||||||
expect(dataSource["dailyLimit"]).toBe(7)
|
expect(dataSource["dailyLimit"]).toBe(7)
|
||||||
@@ -163,8 +169,12 @@ describe("query() with mocked client", () => {
|
|||||||
const dataSource = new WeatherKitDataSource({ client: mockClient })
|
const dataSource = new WeatherKitDataSource({ client: mockClient })
|
||||||
const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
|
const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
|
||||||
|
|
||||||
const metricItems = await dataSource.query(context, { units: Units.metric })
|
const metricItems = await dataSource.query(context, {
|
||||||
const imperialItems = await dataSource.query(context, { units: Units.imperial })
|
units: Units.metric,
|
||||||
|
})
|
||||||
|
const imperialItems = await dataSource.query(context, {
|
||||||
|
units: Units.imperial,
|
||||||
|
})
|
||||||
|
|
||||||
const metricCurrent = metricItems.find((i) => i.type === WeatherFeedItemType.current)
|
const metricCurrent = metricItems.find((i) => i.type === WeatherFeedItemType.current)
|
||||||
const imperialCurrent = imperialItems.find((i) => i.type === WeatherFeedItemType.current)
|
const imperialCurrent = imperialItems.find((i) => i.type === WeatherFeedItemType.current)
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ class MockDAVClient implements CalendarDAVClient {
|
|||||||
describe("CalendarSource", () => {
|
describe("CalendarSource", () => {
|
||||||
test("has correct id", () => {
|
test("has correct id", () => {
|
||||||
const source = new CalendarSource(new NullCredentialProvider(), "user-1")
|
const source = new CalendarSource(new NullCredentialProvider(), "user-1")
|
||||||
expect(source.id).toBe("apple-calendar")
|
expect(source.id).toBe("aris.apple-calendar")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns empty array when credentials are null", async () => {
|
test("returns empty array when credentials are null", async () => {
|
||||||
@@ -121,7 +121,10 @@ describe("CalendarSource", () => {
|
|||||||
const objects: Record<string, CalendarDAVObject[]> = {
|
const objects: Record<string, CalendarDAVObject[]> = {
|
||||||
"/cal/work": [{ url: "/cal/work/event1.ics", data: loadFixture("single-event.ics") }],
|
"/cal/work": [{ url: "/cal/work/event1.ics", data: loadFixture("single-event.ics") }],
|
||||||
"/cal/personal": [
|
"/cal/personal": [
|
||||||
{ url: "/cal/personal/event2.ics", data: loadFixture("all-day-event.ics") },
|
{
|
||||||
|
url: "/cal/personal/event2.ics",
|
||||||
|
data: loadFixture("all-day-event.ics"),
|
||||||
|
},
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
const client = new MockDAVClient(
|
const client = new MockDAVClient(
|
||||||
@@ -206,7 +209,12 @@ describe("CalendarSource", () => {
|
|||||||
|
|
||||||
test("handles calendar with non-string displayName", async () => {
|
test("handles calendar with non-string displayName", async () => {
|
||||||
const objects: Record<string, CalendarDAVObject[]> = {
|
const objects: Record<string, CalendarDAVObject[]> = {
|
||||||
"/cal/weird": [{ url: "/cal/weird/event1.ics", data: loadFixture("minimal-event.ics") }],
|
"/cal/weird": [
|
||||||
|
{
|
||||||
|
url: "/cal/weird/event1.ics",
|
||||||
|
data: loadFixture("minimal-event.ics"),
|
||||||
|
},
|
||||||
|
],
|
||||||
}
|
}
|
||||||
const client = new MockDAVClient(
|
const client = new MockDAVClient(
|
||||||
[{ url: "/cal/weird", displayName: { _cdata: "Weird Calendar" } }],
|
[{ url: "/cal/weird", displayName: { _cdata: "Weird Calendar" } }],
|
||||||
@@ -222,7 +230,12 @@ describe("CalendarSource", () => {
|
|||||||
|
|
||||||
test("handles recurring events with exceptions", async () => {
|
test("handles recurring events with exceptions", async () => {
|
||||||
const objects: Record<string, CalendarDAVObject[]> = {
|
const objects: Record<string, CalendarDAVObject[]> = {
|
||||||
"/cal/work": [{ url: "/cal/work/recurring.ics", data: loadFixture("recurring-event.ics") }],
|
"/cal/work": [
|
||||||
|
{
|
||||||
|
url: "/cal/work/recurring.ics",
|
||||||
|
data: loadFixture("recurring-event.ics"),
|
||||||
|
},
|
||||||
|
],
|
||||||
}
|
}
|
||||||
const client = new MockDAVClient([{ url: "/cal/work", displayName: "Work" }], objects)
|
const client = new MockDAVClient([{ url: "/cal/work", displayName: "Work" }], objects)
|
||||||
const source = new CalendarSource(new MockCredentialProvider(), "user-1", {
|
const source = new CalendarSource(new MockCredentialProvider(), "user-1", {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { Context, FeedSource } from "@aris/core"
|
import type { ActionDefinition, Context, FeedSource } from "@aris/core"
|
||||||
|
import { UnknownActionError } from "@aris/core"
|
||||||
|
|
||||||
import { DAVClient } from "tsdav"
|
import { DAVClient } from "tsdav"
|
||||||
|
|
||||||
@@ -37,7 +38,7 @@ const DEFAULT_LOOK_AHEAD_DAYS = 0
|
|||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
export class CalendarSource implements FeedSource<CalendarFeedItem> {
|
export class CalendarSource implements FeedSource<CalendarFeedItem> {
|
||||||
readonly id = "apple-calendar"
|
readonly id = "aris.apple-calendar"
|
||||||
|
|
||||||
private readonly credentialProvider: CalendarCredentialProvider
|
private readonly credentialProvider: CalendarCredentialProvider
|
||||||
private readonly userId: string
|
private readonly userId: string
|
||||||
@@ -58,7 +59,15 @@ export class CalendarSource implements FeedSource<CalendarFeedItem> {
|
|||||||
this.injectedClient = options?.davClient ?? null
|
this.injectedClient = options?.davClient ?? null
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchContext(context: Context): Promise<Partial<Context>> {
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeAction(actionId: string): Promise<void> {
|
||||||
|
throw new UnknownActionError(actionId)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchContext(context: Context): Promise<Partial<Context> | null> {
|
||||||
const events = await this.fetchEvents(context)
|
const events = await this.fetchEvents(context)
|
||||||
if (events.length === 0) {
|
if (events.length === 0) {
|
||||||
return {
|
return {
|
||||||
|
|||||||
72
packages/aris-source-google-calendar/fixtures/events.json
Normal file
72
packages/aris-source-google-calendar/fixtures/events.json
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
{
|
||||||
|
"kind": "calendar#events",
|
||||||
|
"summary": "primary",
|
||||||
|
"items": [
|
||||||
|
{
|
||||||
|
"id": "evt-ongoing",
|
||||||
|
"status": "confirmed",
|
||||||
|
"htmlLink": "https://calendar.google.com/event?eid=evt-ongoing",
|
||||||
|
"summary": "Team Standup",
|
||||||
|
"description": "Daily standup meeting",
|
||||||
|
"location": "Room 3A",
|
||||||
|
"start": {
|
||||||
|
"dateTime": "2026-01-20T09:30:00Z"
|
||||||
|
},
|
||||||
|
"end": {
|
||||||
|
"dateTime": "2026-01-20T10:15:00Z"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "evt-soon",
|
||||||
|
"status": "confirmed",
|
||||||
|
"htmlLink": "https://calendar.google.com/event?eid=evt-soon",
|
||||||
|
"summary": "1:1 with Manager",
|
||||||
|
"start": {
|
||||||
|
"dateTime": "2026-01-20T10:10:00Z"
|
||||||
|
},
|
||||||
|
"end": {
|
||||||
|
"dateTime": "2026-01-20T10:40:00Z"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "evt-later",
|
||||||
|
"status": "confirmed",
|
||||||
|
"htmlLink": "https://calendar.google.com/event?eid=evt-later",
|
||||||
|
"summary": "Design Review",
|
||||||
|
"description": "Review new dashboard designs",
|
||||||
|
"location": "Conference Room B",
|
||||||
|
"start": {
|
||||||
|
"dateTime": "2026-01-20T14:00:00Z"
|
||||||
|
},
|
||||||
|
"end": {
|
||||||
|
"dateTime": "2026-01-20T15:00:00Z"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "evt-tentative",
|
||||||
|
"status": "tentative",
|
||||||
|
"htmlLink": "https://calendar.google.com/event?eid=evt-tentative",
|
||||||
|
"summary": "Lunch with Alex",
|
||||||
|
"location": "Cafe Nero",
|
||||||
|
"start": {
|
||||||
|
"dateTime": "2026-01-20T12:00:00Z"
|
||||||
|
},
|
||||||
|
"end": {
|
||||||
|
"dateTime": "2026-01-20T13:00:00Z"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "evt-allday",
|
||||||
|
"status": "confirmed",
|
||||||
|
"htmlLink": "https://calendar.google.com/event?eid=evt-allday",
|
||||||
|
"summary": "Company Holiday",
|
||||||
|
"description": "Office closed",
|
||||||
|
"start": {
|
||||||
|
"date": "2026-01-20"
|
||||||
|
},
|
||||||
|
"end": {
|
||||||
|
"date": "2026-01-21"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
14
packages/aris-source-google-calendar/package.json
Normal file
14
packages/aris-source-google-calendar/package.json
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"name": "@aris/source-google-calendar",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"main": "src/index.ts",
|
||||||
|
"types": "src/index.ts",
|
||||||
|
"scripts": {
|
||||||
|
"test": "bun test ."
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@aris/core": "workspace:*",
|
||||||
|
"arktype": "^2.1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
13
packages/aris-source-google-calendar/src/calendar-context.ts
Normal file
13
packages/aris-source-google-calendar/src/calendar-context.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import type { ContextKey } from "@aris/core"
|
||||||
|
|
||||||
|
import { contextKey } from "@aris/core"
|
||||||
|
|
||||||
|
export interface NextEvent {
|
||||||
|
title: string
|
||||||
|
startTime: Date
|
||||||
|
endTime: Date
|
||||||
|
minutesUntilStart: number
|
||||||
|
location: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export const NextEventKey: ContextKey<NextEvent> = contextKey("nextEvent")
|
||||||
22
packages/aris-source-google-calendar/src/feed-items.ts
Normal file
22
packages/aris-source-google-calendar/src/feed-items.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import type { FeedItem } from "@aris/core"
|
||||||
|
|
||||||
|
import type { CalendarEventData } from "./types"
|
||||||
|
|
||||||
|
export const CalendarFeedItemType = {
|
||||||
|
event: "calendar-event",
|
||||||
|
allDay: "calendar-all-day",
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type CalendarFeedItemType = (typeof CalendarFeedItemType)[keyof typeof CalendarFeedItemType]
|
||||||
|
|
||||||
|
export interface CalendarEventFeedItem extends FeedItem<
|
||||||
|
typeof CalendarFeedItemType.event,
|
||||||
|
CalendarEventData
|
||||||
|
> {}
|
||||||
|
|
||||||
|
export interface CalendarAllDayFeedItem extends FeedItem<
|
||||||
|
typeof CalendarFeedItemType.allDay,
|
||||||
|
CalendarEventData
|
||||||
|
> {}
|
||||||
|
|
||||||
|
export type CalendarFeedItem = CalendarEventFeedItem | CalendarAllDayFeedItem
|
||||||
122
packages/aris-source-google-calendar/src/google-calendar-api.ts
Normal file
122
packages/aris-source-google-calendar/src/google-calendar-api.ts
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
// Google Calendar REST API v3 client
|
||||||
|
// https://developers.google.com/calendar/api/v3/reference/events/list
|
||||||
|
|
||||||
|
import { type } from "arktype"
|
||||||
|
|
||||||
|
import type {
|
||||||
|
ApiCalendarEvent,
|
||||||
|
GoogleCalendarClient,
|
||||||
|
GoogleOAuthProvider,
|
||||||
|
ListEventsOptions,
|
||||||
|
} from "./types"
|
||||||
|
|
||||||
|
import { EventStatus } from "./types"
|
||||||
|
|
||||||
|
const eventStatusSchema = type.enumerated(
|
||||||
|
EventStatus.Confirmed,
|
||||||
|
EventStatus.Tentative,
|
||||||
|
EventStatus.Cancelled,
|
||||||
|
)
|
||||||
|
|
||||||
|
const eventDateTimeSchema = type({
|
||||||
|
"dateTime?": "string",
|
||||||
|
"date?": "string",
|
||||||
|
"timeZone?": "string",
|
||||||
|
})
|
||||||
|
|
||||||
|
const eventSchema = type({
|
||||||
|
id: "string",
|
||||||
|
status: eventStatusSchema,
|
||||||
|
htmlLink: "string",
|
||||||
|
"summary?": "string",
|
||||||
|
"description?": "string",
|
||||||
|
"location?": "string",
|
||||||
|
start: eventDateTimeSchema,
|
||||||
|
end: eventDateTimeSchema,
|
||||||
|
})
|
||||||
|
|
||||||
|
const calendarListEntrySchema = type({
|
||||||
|
id: "string",
|
||||||
|
})
|
||||||
|
|
||||||
|
const calendarListResponseSchema = type({
|
||||||
|
"items?": calendarListEntrySchema.array(),
|
||||||
|
"nextPageToken?": "string",
|
||||||
|
})
|
||||||
|
|
||||||
|
const eventsResponseSchema = type({
|
||||||
|
"items?": eventSchema.array(),
|
||||||
|
"nextPageToken?": "string",
|
||||||
|
})
|
||||||
|
|
||||||
|
export class DefaultGoogleCalendarClient implements GoogleCalendarClient {
|
||||||
|
private static readonly API_BASE = "https://www.googleapis.com/calendar/v3"
|
||||||
|
|
||||||
|
private readonly oauthProvider: GoogleOAuthProvider
|
||||||
|
|
||||||
|
constructor(oauthProvider: GoogleOAuthProvider) {
|
||||||
|
this.oauthProvider = oauthProvider
|
||||||
|
}
|
||||||
|
|
||||||
|
async listCalendarIds(): Promise<string[]> {
|
||||||
|
const url = `${DefaultGoogleCalendarClient.API_BASE}/users/me/calendarList?fields=items(id)`
|
||||||
|
const json = await this.request(url)
|
||||||
|
const result = calendarListResponseSchema(json)
|
||||||
|
|
||||||
|
if (result instanceof type.errors) {
|
||||||
|
throw new Error(`Google Calendar API response validation failed: ${result.summary}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!result.items) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
return result.items.map((entry) => entry.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
async listEvents(options: ListEventsOptions): Promise<ApiCalendarEvent[]> {
|
||||||
|
const url = new URL(
|
||||||
|
`${DefaultGoogleCalendarClient.API_BASE}/calendars/${encodeURIComponent(options.calendarId)}/events`,
|
||||||
|
)
|
||||||
|
url.searchParams.set("timeMin", options.timeMin.toISOString())
|
||||||
|
url.searchParams.set("timeMax", options.timeMax.toISOString())
|
||||||
|
url.searchParams.set("singleEvents", "true")
|
||||||
|
url.searchParams.set("orderBy", "startTime")
|
||||||
|
|
||||||
|
const json = await this.request(url.toString())
|
||||||
|
const result = eventsResponseSchema(json)
|
||||||
|
|
||||||
|
if (result instanceof type.errors) {
|
||||||
|
throw new Error(`Google Calendar API response validation failed: ${result.summary}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!result.items) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.items
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Authenticated GET with auto token refresh on 401. */
|
||||||
|
private async request(url: string): Promise<unknown> {
|
||||||
|
const token = await this.oauthProvider.fetchAccessToken()
|
||||||
|
let response = await fetch(url, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
|
||||||
|
if (response.status === 401) {
|
||||||
|
const newToken = await this.oauthProvider.refresh()
|
||||||
|
response = await fetch(url, {
|
||||||
|
headers: { Authorization: `Bearer ${newToken}` },
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const body = await response.text()
|
||||||
|
throw new Error(
|
||||||
|
`Google Calendar API error: ${response.status} ${response.statusText}: ${body}`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,296 @@
|
|||||||
|
import { contextValue, type Context } from "@aris/core"
|
||||||
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
|
import type { ApiCalendarEvent, GoogleCalendarClient, ListEventsOptions } from "./types"
|
||||||
|
|
||||||
|
import fixture from "../fixtures/events.json"
|
||||||
|
import { NextEventKey } from "./calendar-context"
|
||||||
|
import { CalendarFeedItemType } from "./feed-items"
|
||||||
|
import { GoogleCalendarSource } from "./google-calendar-source"
|
||||||
|
|
||||||
|
const NOW = new Date("2026-01-20T10:00:00Z")
|
||||||
|
|
||||||
|
function fixtureEvents(): ApiCalendarEvent[] {
|
||||||
|
return fixture.items as unknown as ApiCalendarEvent[]
|
||||||
|
}
|
||||||
|
|
||||||
|
function createMockClient(
|
||||||
|
eventsByCalendar: Record<string, ApiCalendarEvent[]>,
|
||||||
|
): GoogleCalendarClient {
|
||||||
|
return {
|
||||||
|
listCalendarIds: async () => Object.keys(eventsByCalendar),
|
||||||
|
listEvents: async (options: ListEventsOptions) => {
|
||||||
|
const events = eventsByCalendar[options.calendarId] ?? []
|
||||||
|
return events.filter((e) => {
|
||||||
|
const startRaw = e.start.dateTime ?? e.start.date ?? ""
|
||||||
|
const endRaw = e.end.dateTime ?? e.end.date ?? ""
|
||||||
|
return (
|
||||||
|
new Date(startRaw).getTime() < options.timeMax.getTime() &&
|
||||||
|
new Date(endRaw).getTime() > options.timeMin.getTime()
|
||||||
|
)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function defaultMockClient(): GoogleCalendarClient {
|
||||||
|
return createMockClient({ primary: fixtureEvents() })
|
||||||
|
}
|
||||||
|
|
||||||
|
function createContext(time?: Date): Context {
|
||||||
|
return { time: time ?? NOW }
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("GoogleCalendarSource", () => {
|
||||||
|
describe("constructor", () => {
|
||||||
|
test("has correct id", () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
expect(source.id).toBe("aris.google-calendar")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("fetchItems", () => {
|
||||||
|
test("returns empty array when no events", async () => {
|
||||||
|
const source = new GoogleCalendarSource({
|
||||||
|
client: createMockClient({ primary: [] }),
|
||||||
|
})
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
expect(items).toEqual([])
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns feed items for all events in window", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
expect(items.length).toBe(fixture.items.length)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("assigns calendar-event type to timed events", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const timedItems = items.filter((i) => i.type === CalendarFeedItemType.event)
|
||||||
|
expect(timedItems.length).toBe(4)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("assigns calendar-all-day type to all-day events", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const allDayItems = items.filter((i) => i.type === CalendarFeedItemType.allDay)
|
||||||
|
expect(allDayItems.length).toBe(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("ongoing events get highest priority (1.0)", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const ongoing = items.find((i) => i.data.eventId === "evt-ongoing")
|
||||||
|
expect(ongoing).toBeDefined()
|
||||||
|
expect(ongoing!.priority).toBe(1.0)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("upcoming events get higher priority when sooner", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const soon = items.find((i) => i.data.eventId === "evt-soon")
|
||||||
|
const later = items.find((i) => i.data.eventId === "evt-later")
|
||||||
|
|
||||||
|
expect(soon).toBeDefined()
|
||||||
|
expect(later).toBeDefined()
|
||||||
|
expect(soon!.priority).toBeGreaterThan(later!.priority)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("all-day events get flat priority (0.4)", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const allDay = items.find((i) => i.data.eventId === "evt-allday")
|
||||||
|
expect(allDay).toBeDefined()
|
||||||
|
expect(allDay!.priority).toBe(0.4)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("generates unique IDs for each item", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const ids = items.map((i) => i.id)
|
||||||
|
const uniqueIds = new Set(ids)
|
||||||
|
expect(uniqueIds.size).toBe(ids.length)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("sets timestamp from context.time", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
for (const item of items) {
|
||||||
|
expect(item.timestamp).toEqual(NOW)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test("respects lookaheadHours", async () => {
|
||||||
|
// Only 2 hours lookahead from 10:00 → events before 12:00
|
||||||
|
const source = new GoogleCalendarSource({
|
||||||
|
client: defaultMockClient(),
|
||||||
|
lookaheadHours: 2,
|
||||||
|
})
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
// Should include: ongoing (09:30-10:15), soon (10:10-10:40), allday (00:00-next day)
|
||||||
|
// Should exclude: later (14:00), tentative lunch (12:00)
|
||||||
|
const eventIds = items.map((i) => i.data.eventId)
|
||||||
|
expect(eventIds).toContain("evt-ongoing")
|
||||||
|
expect(eventIds).toContain("evt-soon")
|
||||||
|
expect(eventIds).toContain("evt-allday")
|
||||||
|
expect(eventIds).not.toContain("evt-later")
|
||||||
|
expect(eventIds).not.toContain("evt-tentative")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("defaults to all user calendars via listCalendarIds", async () => {
|
||||||
|
const workEvent: ApiCalendarEvent = {
|
||||||
|
id: "evt-work",
|
||||||
|
status: "confirmed",
|
||||||
|
htmlLink: "https://calendar.google.com/event?eid=evt-work",
|
||||||
|
summary: "Work Meeting",
|
||||||
|
start: { dateTime: "2026-01-20T11:00:00Z" },
|
||||||
|
end: { dateTime: "2026-01-20T12:00:00Z" },
|
||||||
|
}
|
||||||
|
|
||||||
|
const client = createMockClient({
|
||||||
|
primary: fixtureEvents(),
|
||||||
|
"work@example.com": [workEvent],
|
||||||
|
})
|
||||||
|
|
||||||
|
// No calendarIds provided — should discover both calendars
|
||||||
|
const source = new GoogleCalendarSource({ client })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const eventIds = items.map((i) => i.data.eventId)
|
||||||
|
expect(eventIds).toContain("evt-work")
|
||||||
|
expect(eventIds).toContain("evt-ongoing")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("fetches from explicit calendar IDs", async () => {
|
||||||
|
const workEvent: ApiCalendarEvent = {
|
||||||
|
id: "evt-work",
|
||||||
|
status: "confirmed",
|
||||||
|
htmlLink: "https://calendar.google.com/event?eid=evt-work",
|
||||||
|
summary: "Work Meeting",
|
||||||
|
start: { dateTime: "2026-01-20T11:00:00Z" },
|
||||||
|
end: { dateTime: "2026-01-20T12:00:00Z" },
|
||||||
|
}
|
||||||
|
|
||||||
|
const client = createMockClient({
|
||||||
|
primary: fixtureEvents(),
|
||||||
|
"work@example.com": [workEvent],
|
||||||
|
})
|
||||||
|
|
||||||
|
const source = new GoogleCalendarSource({
|
||||||
|
client,
|
||||||
|
calendarIds: ["primary", "work@example.com"],
|
||||||
|
})
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const eventIds = items.map((i) => i.data.eventId)
|
||||||
|
expect(eventIds).toContain("evt-work")
|
||||||
|
expect(eventIds).toContain("evt-ongoing")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("fetchContext", () => {
|
||||||
|
test("returns null when no events", async () => {
|
||||||
|
const source = new GoogleCalendarSource({
|
||||||
|
client: createMockClient({ primary: [] }),
|
||||||
|
})
|
||||||
|
const result = await source.fetchContext(createContext())
|
||||||
|
expect(result).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns null when only all-day events", async () => {
|
||||||
|
const allDayOnly: ApiCalendarEvent[] = [
|
||||||
|
{
|
||||||
|
id: "evt-allday",
|
||||||
|
status: "confirmed",
|
||||||
|
htmlLink: "https://calendar.google.com/event?eid=evt-allday",
|
||||||
|
summary: "Holiday",
|
||||||
|
start: { date: "2026-01-20" },
|
||||||
|
end: { date: "2026-01-21" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const source = new GoogleCalendarSource({
|
||||||
|
client: createMockClient({ primary: allDayOnly }),
|
||||||
|
})
|
||||||
|
const result = await source.fetchContext(createContext())
|
||||||
|
expect(result).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns next upcoming timed event (not ongoing)", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const result = await source.fetchContext(createContext())
|
||||||
|
|
||||||
|
expect(result).not.toBeNull()
|
||||||
|
const nextEvent = contextValue(result! as Context, NextEventKey)
|
||||||
|
expect(nextEvent).toBeDefined()
|
||||||
|
// evt-soon starts at 10:10, which is the nearest future timed event
|
||||||
|
expect(nextEvent!.title).toBe("1:1 with Manager")
|
||||||
|
expect(nextEvent!.minutesUntilStart).toBe(10)
|
||||||
|
expect(nextEvent!.location).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("includes location when available", async () => {
|
||||||
|
const events: ApiCalendarEvent[] = [
|
||||||
|
{
|
||||||
|
id: "evt-loc",
|
||||||
|
status: "confirmed",
|
||||||
|
htmlLink: "https://calendar.google.com/event?eid=evt-loc",
|
||||||
|
summary: "Offsite",
|
||||||
|
location: "123 Main St",
|
||||||
|
start: { dateTime: "2026-01-20T11:00:00Z" },
|
||||||
|
end: { dateTime: "2026-01-20T12:00:00Z" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const source = new GoogleCalendarSource({
|
||||||
|
client: createMockClient({ primary: events }),
|
||||||
|
})
|
||||||
|
const result = await source.fetchContext(createContext())
|
||||||
|
|
||||||
|
expect(result).not.toBeNull()
|
||||||
|
const nextEvent = contextValue(result! as Context, NextEventKey)
|
||||||
|
expect(nextEvent).toBeDefined()
|
||||||
|
expect(nextEvent!.location).toBe("123 Main St")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("skips ongoing events for next-event context", async () => {
|
||||||
|
const events: ApiCalendarEvent[] = [
|
||||||
|
{
|
||||||
|
id: "evt-now",
|
||||||
|
status: "confirmed",
|
||||||
|
htmlLink: "https://calendar.google.com/event?eid=evt-now",
|
||||||
|
summary: "Current Meeting",
|
||||||
|
start: { dateTime: "2026-01-20T09:30:00Z" },
|
||||||
|
end: { dateTime: "2026-01-20T10:30:00Z" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const source = new GoogleCalendarSource({
|
||||||
|
client: createMockClient({ primary: events }),
|
||||||
|
})
|
||||||
|
const result = await source.fetchContext(createContext())
|
||||||
|
expect(result).toBeNull()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("priority ordering", () => {
|
||||||
|
test("ongoing > upcoming > all-day", async () => {
|
||||||
|
const source = new GoogleCalendarSource({ client: defaultMockClient() })
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
|
||||||
|
const ongoing = items.find((i) => i.data.eventId === "evt-ongoing")!
|
||||||
|
const upcoming = items.find((i) => i.data.eventId === "evt-soon")!
|
||||||
|
const allDay = items.find((i) => i.data.eventId === "evt-allday")!
|
||||||
|
|
||||||
|
expect(ongoing.priority).toBeGreaterThan(upcoming.priority)
|
||||||
|
expect(upcoming.priority).toBeGreaterThan(allDay.priority)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
import type { ActionDefinition, Context, FeedSource } from "@aris/core"
|
||||||
|
|
||||||
|
import { UnknownActionError } from "@aris/core"
|
||||||
|
|
||||||
|
import type {
|
||||||
|
ApiCalendarEvent,
|
||||||
|
CalendarEventData,
|
||||||
|
GoogleCalendarClient,
|
||||||
|
GoogleOAuthProvider,
|
||||||
|
} from "./types"
|
||||||
|
|
||||||
|
import { NextEventKey, type NextEvent } from "./calendar-context"
|
||||||
|
|
||||||
|
interface GoogleCalendarSourceBaseOptions {
|
||||||
|
calendarIds?: string[]
|
||||||
|
/** Default: 24 */
|
||||||
|
lookaheadHours?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
interface GoogleCalendarSourceWithProvider extends GoogleCalendarSourceBaseOptions {
|
||||||
|
oauthProvider: GoogleOAuthProvider
|
||||||
|
client?: never
|
||||||
|
}
|
||||||
|
|
||||||
|
interface GoogleCalendarSourceWithClient extends GoogleCalendarSourceBaseOptions {
|
||||||
|
oauthProvider?: never
|
||||||
|
client: GoogleCalendarClient
|
||||||
|
}
|
||||||
|
|
||||||
|
export type GoogleCalendarSourceOptions =
|
||||||
|
| GoogleCalendarSourceWithProvider
|
||||||
|
| GoogleCalendarSourceWithClient
|
||||||
|
import { CalendarFeedItemType, type CalendarFeedItem } from "./feed-items"
|
||||||
|
import { DefaultGoogleCalendarClient } from "./google-calendar-api"
|
||||||
|
|
||||||
|
const DEFAULT_LOOKAHEAD_HOURS = 24
|
||||||
|
|
||||||
|
const PRIORITY_ONGOING = 1.0
|
||||||
|
const PRIORITY_UPCOMING_MAX = 0.9
|
||||||
|
const PRIORITY_UPCOMING_MIN = 0.3
|
||||||
|
const PRIORITY_ALL_DAY = 0.4
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A FeedSource that provides Google Calendar events and next-event context.
|
||||||
|
*
|
||||||
|
* Fetches upcoming and all-day events within a configurable lookahead window.
|
||||||
|
* Provides a NextEvent context for downstream sources to react to the user's schedule.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```ts
|
||||||
|
* const calendarSource = new GoogleCalendarSource({
|
||||||
|
* oauthProvider: myOAuthProvider,
|
||||||
|
* calendarIds: ["primary", "work@example.com"],
|
||||||
|
* lookaheadHours: 12,
|
||||||
|
* })
|
||||||
|
*
|
||||||
|
* const engine = new FeedEngine()
|
||||||
|
* .register(calendarSource)
|
||||||
|
*
|
||||||
|
* // Access next-event context in downstream sources
|
||||||
|
* const next = contextValue(context, NextEventKey)
|
||||||
|
* if (next && next.minutesUntilStart < 15) {
|
||||||
|
* // remind user
|
||||||
|
* }
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
export class GoogleCalendarSource implements FeedSource<CalendarFeedItem> {
|
||||||
|
readonly id = "aris.google-calendar"
|
||||||
|
|
||||||
|
private readonly client: GoogleCalendarClient
|
||||||
|
private readonly calendarIds: string[] | undefined
|
||||||
|
private readonly lookaheadHours: number
|
||||||
|
|
||||||
|
constructor(options: GoogleCalendarSourceOptions) {
|
||||||
|
this.client = options.client ?? new DefaultGoogleCalendarClient(options.oauthProvider)
|
||||||
|
this.calendarIds = options.calendarIds
|
||||||
|
this.lookaheadHours = options.lookaheadHours ?? DEFAULT_LOOKAHEAD_HOURS
|
||||||
|
}
|
||||||
|
|
||||||
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeAction(actionId: string): Promise<void> {
|
||||||
|
throw new UnknownActionError(actionId)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchContext(context: Context): Promise<Partial<Context> | null> {
|
||||||
|
const events = await this.fetchAllEvents(context.time)
|
||||||
|
|
||||||
|
const now = context.time.getTime()
|
||||||
|
const nextTimedEvent = events.find((e) => !e.isAllDay && e.startTime.getTime() > now)
|
||||||
|
|
||||||
|
if (!nextTimedEvent) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
const minutesUntilStart = (nextTimedEvent.startTime.getTime() - now) / 60_000
|
||||||
|
|
||||||
|
const nextEvent: NextEvent = {
|
||||||
|
title: nextTimedEvent.title,
|
||||||
|
startTime: nextTimedEvent.startTime,
|
||||||
|
endTime: nextTimedEvent.endTime,
|
||||||
|
minutesUntilStart,
|
||||||
|
location: nextTimedEvent.location,
|
||||||
|
}
|
||||||
|
|
||||||
|
return { [NextEventKey]: nextEvent }
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchItems(context: Context): Promise<CalendarFeedItem[]> {
|
||||||
|
const events = await this.fetchAllEvents(context.time)
|
||||||
|
const now = context.time.getTime()
|
||||||
|
const lookaheadMs = this.lookaheadHours * 60 * 60 * 1000
|
||||||
|
|
||||||
|
return events.map((event) => createFeedItem(event, now, lookaheadMs))
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolveCalendarIds(): Promise<string[]> {
|
||||||
|
if (this.calendarIds) {
|
||||||
|
return this.calendarIds
|
||||||
|
}
|
||||||
|
return this.client.listCalendarIds()
|
||||||
|
}
|
||||||
|
|
||||||
|
private async fetchAllEvents(time: Date): Promise<CalendarEventData[]> {
|
||||||
|
const timeMax = new Date(time.getTime() + this.lookaheadHours * 60 * 60 * 1000)
|
||||||
|
const calendarIds = await this.resolveCalendarIds()
|
||||||
|
|
||||||
|
const results = await Promise.all(
|
||||||
|
calendarIds.map(async (calendarId) => {
|
||||||
|
const raw = await this.client.listEvents({
|
||||||
|
calendarId,
|
||||||
|
timeMin: time,
|
||||||
|
timeMax,
|
||||||
|
})
|
||||||
|
return raw.map((event) => parseEvent(event, calendarId))
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
const allEvents = results.flat()
|
||||||
|
|
||||||
|
// Sort by start time ascending
|
||||||
|
allEvents.sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
|
||||||
|
|
||||||
|
return allEvents
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseEvent(event: ApiCalendarEvent, calendarId: string): CalendarEventData {
|
||||||
|
const startRaw = event.start.dateTime ?? event.start.date
|
||||||
|
const endRaw = event.end.dateTime ?? event.end.date
|
||||||
|
|
||||||
|
if (!startRaw || !endRaw) {
|
||||||
|
throw new Error(`Event ${event.id} is missing start or end date`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const isAllDay = !event.start.dateTime
|
||||||
|
|
||||||
|
return {
|
||||||
|
eventId: event.id,
|
||||||
|
calendarId,
|
||||||
|
title: event.summary ?? "(No title)",
|
||||||
|
description: event.description ?? null,
|
||||||
|
location: event.location ?? null,
|
||||||
|
startTime: new Date(startRaw),
|
||||||
|
endTime: new Date(endRaw),
|
||||||
|
isAllDay,
|
||||||
|
status: event.status,
|
||||||
|
htmlLink: event.htmlLink,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function computePriority(event: CalendarEventData, nowMs: number, lookaheadMs: number): number {
|
||||||
|
if (event.isAllDay) {
|
||||||
|
return PRIORITY_ALL_DAY
|
||||||
|
}
|
||||||
|
|
||||||
|
const startMs = event.startTime.getTime()
|
||||||
|
const endMs = event.endTime.getTime()
|
||||||
|
|
||||||
|
// Ongoing: start <= now < end
|
||||||
|
if (startMs <= nowMs && nowMs < endMs) {
|
||||||
|
return PRIORITY_ONGOING
|
||||||
|
}
|
||||||
|
|
||||||
|
// Upcoming: linear decay from PRIORITY_UPCOMING_MAX to PRIORITY_UPCOMING_MIN
|
||||||
|
const msUntilStart = startMs - nowMs
|
||||||
|
if (msUntilStart <= 0) {
|
||||||
|
return PRIORITY_UPCOMING_MIN
|
||||||
|
}
|
||||||
|
|
||||||
|
const ratio = Math.min(msUntilStart / lookaheadMs, 1)
|
||||||
|
return PRIORITY_UPCOMING_MAX - ratio * (PRIORITY_UPCOMING_MAX - PRIORITY_UPCOMING_MIN)
|
||||||
|
}
|
||||||
|
|
||||||
|
function createFeedItem(
|
||||||
|
event: CalendarEventData,
|
||||||
|
nowMs: number,
|
||||||
|
lookaheadMs: number,
|
||||||
|
): CalendarFeedItem {
|
||||||
|
const priority = computePriority(event, nowMs, lookaheadMs)
|
||||||
|
const itemType = event.isAllDay ? CalendarFeedItemType.allDay : CalendarFeedItemType.event
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: `calendar-${event.calendarId}-${event.eventId}`,
|
||||||
|
type: itemType,
|
||||||
|
priority,
|
||||||
|
timestamp: new Date(nowMs),
|
||||||
|
data: event,
|
||||||
|
}
|
||||||
|
}
|
||||||
20
packages/aris-source-google-calendar/src/index.ts
Normal file
20
packages/aris-source-google-calendar/src/index.ts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
export { NextEventKey, type NextEvent } from "./calendar-context"
|
||||||
|
export {
|
||||||
|
CalendarFeedItemType,
|
||||||
|
type CalendarFeedItemType as CalendarFeedItemTypeType,
|
||||||
|
type CalendarAllDayFeedItem,
|
||||||
|
type CalendarEventFeedItem,
|
||||||
|
type CalendarFeedItem,
|
||||||
|
} from "./feed-items"
|
||||||
|
export { DefaultGoogleCalendarClient } from "./google-calendar-api"
|
||||||
|
export { GoogleCalendarSource, type GoogleCalendarSourceOptions } from "./google-calendar-source"
|
||||||
|
export {
|
||||||
|
EventStatus,
|
||||||
|
type EventStatus as EventStatusType,
|
||||||
|
type ApiCalendarEvent,
|
||||||
|
type ApiEventDateTime,
|
||||||
|
type CalendarEventData,
|
||||||
|
type GoogleCalendarClient,
|
||||||
|
type GoogleOAuthProvider,
|
||||||
|
type ListEventsOptions,
|
||||||
|
} from "./types"
|
||||||
55
packages/aris-source-google-calendar/src/types.ts
Normal file
55
packages/aris-source-google-calendar/src/types.ts
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
export interface GoogleOAuthProvider {
|
||||||
|
fetchAccessToken(): Promise<string>
|
||||||
|
refresh(): Promise<string>
|
||||||
|
revoke(): Promise<void>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const EventStatus = {
|
||||||
|
Confirmed: "confirmed",
|
||||||
|
Tentative: "tentative",
|
||||||
|
Cancelled: "cancelled",
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type EventStatus = (typeof EventStatus)[keyof typeof EventStatus]
|
||||||
|
|
||||||
|
/** Exactly one of dateTime or date is present. */
|
||||||
|
export interface ApiEventDateTime {
|
||||||
|
dateTime?: string
|
||||||
|
date?: string
|
||||||
|
timeZone?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ApiCalendarEvent {
|
||||||
|
id: string
|
||||||
|
status: EventStatus
|
||||||
|
htmlLink: string
|
||||||
|
summary?: string
|
||||||
|
description?: string
|
||||||
|
location?: string
|
||||||
|
start: ApiEventDateTime
|
||||||
|
end: ApiEventDateTime
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CalendarEventData = {
|
||||||
|
eventId: string
|
||||||
|
calendarId: string
|
||||||
|
title: string
|
||||||
|
description: string | null
|
||||||
|
location: string | null
|
||||||
|
startTime: Date
|
||||||
|
endTime: Date
|
||||||
|
isAllDay: boolean
|
||||||
|
status: EventStatus
|
||||||
|
htmlLink: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ListEventsOptions {
|
||||||
|
calendarId: string
|
||||||
|
timeMin: Date
|
||||||
|
timeMax: Date
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GoogleCalendarClient {
|
||||||
|
listCalendarIds(): Promise<string[]>
|
||||||
|
listEvents(options: ListEventsOptions): Promise<ApiCalendarEvent[]>
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
"test": "bun test src/"
|
"test": "bun test src/"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aris/core": "workspace:*"
|
"@aris/core": "workspace:*",
|
||||||
|
"arktype": "^2.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,2 @@
|
|||||||
export {
|
export { LocationSource, LocationKey } from "./location-source.ts"
|
||||||
LocationSource,
|
export { Location, type LocationSourceOptions } from "./types.ts"
|
||||||
LocationKey,
|
|
||||||
type Location,
|
|
||||||
type LocationSourceOptions,
|
|
||||||
} from "./location-source.ts"
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ describe("LocationSource", () => {
|
|||||||
describe("FeedSource interface", () => {
|
describe("FeedSource interface", () => {
|
||||||
test("has correct id", () => {
|
test("has correct id", () => {
|
||||||
const source = new LocationSource()
|
const source = new LocationSource()
|
||||||
expect(source.id).toBe("location")
|
expect(source.id).toBe("aris.location")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("fetchItems always returns empty array", async () => {
|
test("fetchItems always returns empty array", async () => {
|
||||||
@@ -27,11 +27,11 @@ describe("LocationSource", () => {
|
|||||||
expect(items).toEqual([])
|
expect(items).toEqual([])
|
||||||
})
|
})
|
||||||
|
|
||||||
test("fetchContext returns empty when no location", async () => {
|
test("fetchContext returns null when no location", async () => {
|
||||||
const source = new LocationSource()
|
const source = new LocationSource()
|
||||||
|
|
||||||
const context = await source.fetchContext()
|
const context = await source.fetchContext()
|
||||||
expect(context).toEqual({})
|
expect(context).toBeNull()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("fetchContext returns location when available", async () => {
|
test("fetchContext returns location when available", async () => {
|
||||||
@@ -147,4 +147,40 @@ describe("LocationSource", () => {
|
|||||||
expect(listener2).toHaveBeenCalledTimes(1)
|
expect(listener2).toHaveBeenCalledTimes(1)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("actions", () => {
|
||||||
|
test("listActions returns update-location action", async () => {
|
||||||
|
const source = new LocationSource()
|
||||||
|
const actions = await source.listActions()
|
||||||
|
|
||||||
|
expect(actions["update-location"]).toBeDefined()
|
||||||
|
expect(actions["update-location"]!.id).toBe("update-location")
|
||||||
|
expect(actions["update-location"]!.input).toBeDefined()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("executeAction update-location pushes location", async () => {
|
||||||
|
const source = new LocationSource()
|
||||||
|
|
||||||
|
expect(source.lastLocation).toBeNull()
|
||||||
|
|
||||||
|
const location = createLocation({ lat: 40.7128, lng: -74.006 })
|
||||||
|
await source.executeAction("update-location", location)
|
||||||
|
|
||||||
|
expect(source.lastLocation).toEqual(location)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("executeAction throws on invalid input", async () => {
|
||||||
|
const source = new LocationSource()
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
source.executeAction("update-location", { lat: "not a number" }),
|
||||||
|
).rejects.toThrow()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("executeAction throws for unknown action", async () => {
|
||||||
|
const source = new LocationSource()
|
||||||
|
|
||||||
|
await expect(source.executeAction("nonexistent", {})).rejects.toThrow("Unknown action")
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,22 +1,9 @@
|
|||||||
import type { Context, FeedSource } from "@aris/core"
|
import type { ActionDefinition, Context, FeedSource } from "@aris/core"
|
||||||
|
|
||||||
import { contextKey, type ContextKey } from "@aris/core"
|
import { UnknownActionError, contextKey, type ContextKey } from "@aris/core"
|
||||||
|
import { type } from "arktype"
|
||||||
|
|
||||||
/**
|
import { Location, type LocationSourceOptions } from "./types.ts"
|
||||||
* Geographic coordinates with accuracy and timestamp.
|
|
||||||
*/
|
|
||||||
export interface Location {
|
|
||||||
lat: number
|
|
||||||
lng: number
|
|
||||||
/** Accuracy in meters */
|
|
||||||
accuracy: number
|
|
||||||
timestamp: Date
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface LocationSourceOptions {
|
|
||||||
/** Number of locations to retain in history. Defaults to 1. */
|
|
||||||
historySize?: number
|
|
||||||
}
|
|
||||||
|
|
||||||
export const LocationKey: ContextKey<Location> = contextKey("location")
|
export const LocationKey: ContextKey<Location> = contextKey("location")
|
||||||
|
|
||||||
@@ -29,7 +16,7 @@ export const LocationKey: ContextKey<Location> = contextKey("location")
|
|||||||
* Does not produce feed items - always returns empty array from `fetchItems`.
|
* Does not produce feed items - always returns empty array from `fetchItems`.
|
||||||
*/
|
*/
|
||||||
export class LocationSource implements FeedSource {
|
export class LocationSource implements FeedSource {
|
||||||
readonly id = "location"
|
readonly id = "aris.location"
|
||||||
|
|
||||||
private readonly historySize: number
|
private readonly historySize: number
|
||||||
private locations: Location[] = []
|
private locations: Location[] = []
|
||||||
@@ -39,6 +26,31 @@ export class LocationSource implements FeedSource {
|
|||||||
this.historySize = options.historySize ?? 1
|
this.historySize = options.historySize ?? 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {
|
||||||
|
"update-location": {
|
||||||
|
id: "update-location",
|
||||||
|
description: "Push a new location update",
|
||||||
|
input: Location,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeAction(actionId: string, params: unknown): Promise<void> {
|
||||||
|
switch (actionId) {
|
||||||
|
case "update-location": {
|
||||||
|
const result = Location(params)
|
||||||
|
if (result instanceof type.errors) {
|
||||||
|
throw new Error(result.summary)
|
||||||
|
}
|
||||||
|
this.pushLocation(result)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
throw new UnknownActionError(actionId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Push a new location update. Notifies all context listeners.
|
* Push a new location update. Notifies all context listeners.
|
||||||
*/
|
*/
|
||||||
@@ -73,11 +85,11 @@ export class LocationSource implements FeedSource {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchContext(): Promise<Partial<Context>> {
|
async fetchContext(): Promise<Partial<Context> | null> {
|
||||||
if (this.lastLocation) {
|
if (this.lastLocation) {
|
||||||
return { [LocationKey]: this.lastLocation }
|
return { [LocationKey]: this.lastLocation }
|
||||||
}
|
}
|
||||||
return {}
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchItems(): Promise<[]> {
|
async fetchItems(): Promise<[]> {
|
||||||
|
|||||||
17
packages/aris-source-location/src/types.ts
Normal file
17
packages/aris-source-location/src/types.ts
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import { type } from "arktype"
|
||||||
|
|
||||||
|
/** Geographic coordinates with accuracy and timestamp. */
|
||||||
|
export const Location = type({
|
||||||
|
lat: "number",
|
||||||
|
lng: "number",
|
||||||
|
/** Accuracy in meters */
|
||||||
|
accuracy: "number",
|
||||||
|
timestamp: "Date",
|
||||||
|
})
|
||||||
|
|
||||||
|
export type Location = typeof Location.infer
|
||||||
|
|
||||||
|
export interface LocationSourceOptions {
|
||||||
|
/** Number of locations to retain in history. Defaults to 1. */
|
||||||
|
historySize?: number
|
||||||
|
}
|
||||||
@@ -142,7 +142,7 @@ export class TflApi {
|
|||||||
|
|
||||||
// Schemas
|
// Schemas
|
||||||
|
|
||||||
const lineId = type(
|
export const lineId = type(
|
||||||
"'bakerloo' | 'central' | 'circle' | 'district' | 'hammersmith-city' | 'jubilee' | 'metropolitan' | 'northern' | 'piccadilly' | 'victoria' | 'waterloo-city' | 'lioness' | 'mildmay' | 'windrush' | 'weaver' | 'suffragette' | 'liberty' | 'elizabeth'",
|
"'bakerloo' | 'central' | 'circle' | 'district' | 'hammersmith-city' | 'jubilee' | 'metropolitan' | 'northern' | 'piccadilly' | 'victoria' | 'waterloo-city' | 'lioness' | 'mildmay' | 'windrush' | 'weaver' | 'suffragette' | 'liberty' | 'elizabeth'",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -94,12 +94,12 @@ describe("TflSource", () => {
|
|||||||
describe("interface", () => {
|
describe("interface", () => {
|
||||||
test("has correct id", () => {
|
test("has correct id", () => {
|
||||||
const source = new TflSource({ client: api })
|
const source = new TflSource({ client: api })
|
||||||
expect(source.id).toBe("tfl")
|
expect(source.id).toBe("aris.tfl")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("depends on location", () => {
|
test("depends on location", () => {
|
||||||
const source = new TflSource({ client: api })
|
const source = new TflSource({ client: api })
|
||||||
expect(source.dependencies).toEqual(["location"])
|
expect(source.dependencies).toEqual(["aris.location"])
|
||||||
})
|
})
|
||||||
|
|
||||||
test("implements fetchItems", () => {
|
test("implements fetchItems", () => {
|
||||||
@@ -122,7 +122,12 @@ describe("TflSource", () => {
|
|||||||
severity: "minor-delays",
|
severity: "minor-delays",
|
||||||
description: "Delays",
|
description: "Delays",
|
||||||
},
|
},
|
||||||
{ lineId: "central", lineName: "Central", severity: "closure", description: "Closed" },
|
{
|
||||||
|
lineId: "central",
|
||||||
|
lineName: "Central",
|
||||||
|
severity: "closure",
|
||||||
|
description: "Closed",
|
||||||
|
},
|
||||||
]
|
]
|
||||||
return lines ? all.filter((s) => lines.includes(s.lineId)) : all
|
return lines ? all.filter((s) => lines.includes(s.lineId)) : all
|
||||||
},
|
},
|
||||||
@@ -144,7 +149,10 @@ describe("TflSource", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("DEFAULT_LINES_OF_INTEREST restores all lines", async () => {
|
test("DEFAULT_LINES_OF_INTEREST restores all lines", async () => {
|
||||||
const source = new TflSource({ client: lineFilteringApi, lines: ["northern"] })
|
const source = new TflSource({
|
||||||
|
client: lineFilteringApi,
|
||||||
|
lines: ["northern"],
|
||||||
|
})
|
||||||
const filtered = await source.fetchItems(createContext())
|
const filtered = await source.fetchItems(createContext())
|
||||||
expect(filtered.length).toBe(1)
|
expect(filtered.length).toBe(1)
|
||||||
|
|
||||||
@@ -164,7 +172,12 @@ describe("TflSource", () => {
|
|||||||
|
|
||||||
test("feed items have correct base structure", async () => {
|
test("feed items have correct base structure", async () => {
|
||||||
const source = new TflSource({ client: api })
|
const source = new TflSource({ client: api })
|
||||||
const location: Location = { lat: 51.5074, lng: -0.1278, accuracy: 10, timestamp: new Date() }
|
const location: Location = {
|
||||||
|
lat: 51.5074,
|
||||||
|
lng: -0.1278,
|
||||||
|
accuracy: 10,
|
||||||
|
timestamp: new Date(),
|
||||||
|
}
|
||||||
const items = await source.fetchItems(createContext(location))
|
const items = await source.fetchItems(createContext(location))
|
||||||
|
|
||||||
for (const item of items) {
|
for (const item of items) {
|
||||||
@@ -178,7 +191,12 @@ describe("TflSource", () => {
|
|||||||
|
|
||||||
test("feed items have correct data structure", async () => {
|
test("feed items have correct data structure", async () => {
|
||||||
const source = new TflSource({ client: api })
|
const source = new TflSource({ client: api })
|
||||||
const location: Location = { lat: 51.5074, lng: -0.1278, accuracy: 10, timestamp: new Date() }
|
const location: Location = {
|
||||||
|
lat: 51.5074,
|
||||||
|
lng: -0.1278,
|
||||||
|
accuracy: 10,
|
||||||
|
timestamp: new Date(),
|
||||||
|
}
|
||||||
const items = await source.fetchItems(createContext(location))
|
const items = await source.fetchItems(createContext(location))
|
||||||
|
|
||||||
for (const item of items) {
|
for (const item of items) {
|
||||||
@@ -230,7 +248,12 @@ describe("TflSource", () => {
|
|||||||
|
|
||||||
test("closestStationDistance is number when location provided", async () => {
|
test("closestStationDistance is number when location provided", async () => {
|
||||||
const source = new TflSource({ client: api })
|
const source = new TflSource({ client: api })
|
||||||
const location: Location = { lat: 51.5074, lng: -0.1278, accuracy: 10, timestamp: new Date() }
|
const location: Location = {
|
||||||
|
lat: 51.5074,
|
||||||
|
lng: -0.1278,
|
||||||
|
accuracy: 10,
|
||||||
|
timestamp: new Date(),
|
||||||
|
}
|
||||||
const items = await source.fetchItems(createContext(location))
|
const items = await source.fetchItems(createContext(location))
|
||||||
|
|
||||||
for (const item of items) {
|
for (const item of items) {
|
||||||
@@ -248,6 +271,62 @@ describe("TflSource", () => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("actions", () => {
|
||||||
|
test("listActions returns set-lines-of-interest", async () => {
|
||||||
|
const source = new TflSource({ client: api })
|
||||||
|
const actions = await source.listActions()
|
||||||
|
|
||||||
|
expect(actions["set-lines-of-interest"]).toBeDefined()
|
||||||
|
expect(actions["set-lines-of-interest"]!.id).toBe("set-lines-of-interest")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("executeAction set-lines-of-interest updates lines", async () => {
|
||||||
|
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 []
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const source = new TflSource({ client: lineFilteringApi })
|
||||||
|
await source.executeAction("set-lines-of-interest", ["northern"])
|
||||||
|
|
||||||
|
const items = await source.fetchItems(createContext())
|
||||||
|
expect(items.length).toBe(1)
|
||||||
|
expect(items[0]!.data.line).toBe("northern")
|
||||||
|
})
|
||||||
|
|
||||||
|
test("executeAction throws on invalid input", async () => {
|
||||||
|
const source = new TflSource({ client: api })
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
source.executeAction("set-lines-of-interest", "not-an-array"),
|
||||||
|
).rejects.toThrow()
|
||||||
|
})
|
||||||
|
|
||||||
|
test("executeAction throws for unknown action", async () => {
|
||||||
|
const source = new TflSource({ client: api })
|
||||||
|
|
||||||
|
await expect(source.executeAction("nonexistent", {})).rejects.toThrow("Unknown action")
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe("TfL Fixture Data Shape", () => {
|
describe("TfL Fixture Data Shape", () => {
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import type { Context, FeedSource } from "@aris/core"
|
import type { ActionDefinition, Context, FeedSource } from "@aris/core"
|
||||||
|
|
||||||
import { contextValue } from "@aris/core"
|
import { UnknownActionError, contextValue } from "@aris/core"
|
||||||
import { LocationKey } from "@aris/source-location"
|
import { LocationKey } from "@aris/source-location"
|
||||||
|
import { type } from "arktype"
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
ITflApi,
|
ITflApi,
|
||||||
@@ -13,7 +14,9 @@ import type {
|
|||||||
TflSourceOptions,
|
TflSourceOptions,
|
||||||
} from "./types.ts"
|
} from "./types.ts"
|
||||||
|
|
||||||
import { TflApi } from "./tfl-api.ts"
|
import { TflApi, lineId } from "./tfl-api.ts"
|
||||||
|
|
||||||
|
const setLinesInput = lineId.array()
|
||||||
|
|
||||||
const SEVERITY_PRIORITY: Record<TflAlertSeverity, number> = {
|
const SEVERITY_PRIORITY: Record<TflAlertSeverity, number> = {
|
||||||
closure: 1.0,
|
closure: 1.0,
|
||||||
@@ -63,8 +66,8 @@ export class TflSource implements FeedSource<TflAlertFeedItem> {
|
|||||||
"elizabeth",
|
"elizabeth",
|
||||||
]
|
]
|
||||||
|
|
||||||
readonly id = "tfl"
|
readonly id = "aris.tfl"
|
||||||
readonly dependencies = ["location"]
|
readonly dependencies = ["aris.location"]
|
||||||
|
|
||||||
private readonly client: ITflApi
|
private readonly client: ITflApi
|
||||||
private lines: TflLineId[]
|
private lines: TflLineId[]
|
||||||
@@ -77,6 +80,35 @@ export class TflSource implements FeedSource<TflAlertFeedItem> {
|
|||||||
this.lines = options.lines ?? [...TflSource.DEFAULT_LINES_OF_INTEREST]
|
this.lines = options.lines ?? [...TflSource.DEFAULT_LINES_OF_INTEREST]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {
|
||||||
|
"set-lines-of-interest": {
|
||||||
|
id: "set-lines-of-interest",
|
||||||
|
description: "Update the set of monitored TfL lines",
|
||||||
|
input: setLinesInput,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeAction(actionId: string, params: unknown): Promise<void> {
|
||||||
|
switch (actionId) {
|
||||||
|
case "set-lines-of-interest": {
|
||||||
|
const result = setLinesInput(params)
|
||||||
|
if (result instanceof type.errors) {
|
||||||
|
throw new Error(result.summary)
|
||||||
|
}
|
||||||
|
this.setLinesOfInterest(result)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
throw new UnknownActionError(actionId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchContext(): Promise<null> {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update the set of monitored lines. Takes effect on the next fetchItems call.
|
* Update the set of monitored lines. Takes effect on the next fetchItems call.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -34,12 +34,12 @@ describe("WeatherSource", () => {
|
|||||||
describe("properties", () => {
|
describe("properties", () => {
|
||||||
test("has correct id", () => {
|
test("has correct id", () => {
|
||||||
const source = new WeatherSource({ credentials: mockCredentials })
|
const source = new WeatherSource({ credentials: mockCredentials })
|
||||||
expect(source.id).toBe("weather")
|
expect(source.id).toBe("aris.weather")
|
||||||
})
|
})
|
||||||
|
|
||||||
test("depends on location", () => {
|
test("depends on location", () => {
|
||||||
const source = new WeatherSource({ credentials: mockCredentials })
|
const source = new WeatherSource({ credentials: mockCredentials })
|
||||||
expect(source.dependencies).toEqual(["location"])
|
expect(source.dependencies).toEqual(["aris.location"])
|
||||||
})
|
})
|
||||||
|
|
||||||
test("throws error if neither client nor credentials provided", () => {
|
test("throws error if neither client nor credentials provided", () => {
|
||||||
@@ -52,11 +52,11 @@ describe("WeatherSource", () => {
|
|||||||
describe("fetchContext", () => {
|
describe("fetchContext", () => {
|
||||||
const mockClient = createMockClient(fixture.response as WeatherKitResponse)
|
const mockClient = createMockClient(fixture.response as WeatherKitResponse)
|
||||||
|
|
||||||
test("returns empty when no location", async () => {
|
test("returns null when no location", async () => {
|
||||||
const source = new WeatherSource({ client: mockClient })
|
const source = new WeatherSource({ client: mockClient })
|
||||||
const result = await source.fetchContext(createMockContext())
|
const result = await source.fetchContext(createMockContext())
|
||||||
|
|
||||||
expect(result).toEqual({})
|
expect(result).toBeNull()
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns simplified weather context", async () => {
|
test("returns simplified weather context", async () => {
|
||||||
@@ -64,7 +64,8 @@ describe("WeatherSource", () => {
|
|||||||
const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
|
const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
|
||||||
|
|
||||||
const result = await source.fetchContext(context)
|
const result = await source.fetchContext(context)
|
||||||
const weather = contextValue(result, WeatherKey)
|
expect(result).not.toBeNull()
|
||||||
|
const weather = contextValue(result! as Context, WeatherKey)
|
||||||
|
|
||||||
expect(weather).toBeDefined()
|
expect(weather).toBeDefined()
|
||||||
expect(typeof weather!.temperature).toBe("number")
|
expect(typeof weather!.temperature).toBe("number")
|
||||||
@@ -77,11 +78,15 @@ describe("WeatherSource", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("converts temperature to imperial", async () => {
|
test("converts temperature to imperial", async () => {
|
||||||
const source = new WeatherSource({ client: mockClient, units: Units.imperial })
|
const source = new WeatherSource({
|
||||||
|
client: mockClient,
|
||||||
|
units: Units.imperial,
|
||||||
|
})
|
||||||
const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
|
const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
|
||||||
|
|
||||||
const result = await source.fetchContext(context)
|
const result = await source.fetchContext(context)
|
||||||
const weather = contextValue(result, WeatherKey)
|
expect(result).not.toBeNull()
|
||||||
|
const weather = contextValue(result! as Context, WeatherKey)
|
||||||
|
|
||||||
// Fixture has temperature around 10°C, imperial should be around 50°F
|
// Fixture has temperature around 10°C, imperial should be around 50°F
|
||||||
expect(weather!.temperature).toBeGreaterThan(40)
|
expect(weather!.temperature).toBeGreaterThan(40)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { Context, FeedSource } from "@aris/core"
|
import type { ActionDefinition, Context, FeedSource } from "@aris/core"
|
||||||
|
|
||||||
import { contextValue } from "@aris/core"
|
import { UnknownActionError, contextValue } from "@aris/core"
|
||||||
import { LocationKey } from "@aris/source-location"
|
import { LocationKey } from "@aris/source-location"
|
||||||
|
|
||||||
import { WeatherFeedItemType, type WeatherFeedItem } from "./feed-items"
|
import { WeatherFeedItemType, type WeatherFeedItem } from "./feed-items"
|
||||||
@@ -93,8 +93,8 @@ const MODERATE_CONDITIONS = new Set<ConditionCode>([
|
|||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
export class WeatherSource implements FeedSource<WeatherFeedItem> {
|
export class WeatherSource implements FeedSource<WeatherFeedItem> {
|
||||||
readonly id = "weather"
|
readonly id = "aris.weather"
|
||||||
readonly dependencies = ["location"]
|
readonly dependencies = ["aris.location"]
|
||||||
|
|
||||||
private readonly client: WeatherKitClient
|
private readonly client: WeatherKitClient
|
||||||
private readonly hourlyLimit: number
|
private readonly hourlyLimit: number
|
||||||
@@ -111,10 +111,18 @@ export class WeatherSource implements FeedSource<WeatherFeedItem> {
|
|||||||
this.units = options.units ?? Units.metric
|
this.units = options.units ?? Units.metric
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchContext(context: Context): Promise<Partial<Context>> {
|
async listActions(): Promise<Record<string, ActionDefinition>> {
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeAction(actionId: string): Promise<void> {
|
||||||
|
throw new UnknownActionError(actionId)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchContext(context: Context): Promise<Partial<Context> | null> {
|
||||||
const location = contextValue(context, LocationKey)
|
const location = contextValue(context, LocationKey)
|
||||||
if (!location) {
|
if (!location) {
|
||||||
return {}
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await this.client.fetch({
|
const response = await this.client.fetch({
|
||||||
@@ -123,7 +131,7 @@ export class WeatherSource implements FeedSource<WeatherFeedItem> {
|
|||||||
})
|
})
|
||||||
|
|
||||||
if (!response.currentWeather) {
|
if (!response.currentWeather) {
|
||||||
return {}
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
const weather: Weather = {
|
const weather: Weather = {
|
||||||
|
|||||||
Reference in New Issue
Block a user