Compare commits
No files matched your search
@@ -33,6 +33,9 @@ body:
|
|||||||
options:
|
options:
|
||||||
# The below comment is used to insert a new version with on-release.yml
|
# The below comment is used to insert a new version with on-release.yml
|
||||||
#NEXT_VERSION#
|
#NEXT_VERSION#
|
||||||
|
- 1.49.0
|
||||||
|
- 1.48.0
|
||||||
|
- 1.47.0
|
||||||
- 1.46.0
|
- 1.46.0
|
||||||
- 1.45.3
|
- 1.45.3
|
||||||
- 1.45.2
|
- 1.45.2
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ jobs:
|
|||||||
- uses: actions/setup-node@v6
|
- uses: actions/setup-node@v6
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
with:
|
with:
|
||||||
node-version: 24.12.0
|
node-version: 24.13.0
|
||||||
cache: "pnpm"
|
cache: "pnpm"
|
||||||
- run: npm i -g pnpm
|
- run: npm i -g pnpm
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ jobs:
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
prebuilt-debian-validate-arm64:
|
prebuilt-debian-validate-arm64:
|
||||||
runs-on: ubuntu-24.04-
|
runs-on: ubuntu-24.04-arm
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|||||||
+134
@@ -1,3 +1,137 @@
|
|||||||
|
## [1.51.0](https://github.com/homarr-labs/homarr/compare/v1.50.1...v1.51.0) (2026-01-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **integrations:** add Coolify integration and widget ([#4789](https://github.com/homarr-labs/homarr/issues/4789)) ([81dac58](https://github.com/homarr-labs/homarr/commit/81dac580050a86e34135beef09b876089777f1c7))
|
||||||
|
* **widgets:** add disks widget ([#4445](https://github.com/homarr-labs/homarr/issues/4445)) ([62caa71](https://github.com/homarr-labs/homarr/commit/62caa71a48c38f59f109666e83f26019586a5ca0))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **deps:** update dependency @tanstack/react-query to ^5.90.17 ([#4873](https://github.com/homarr-labs/homarr/issues/4873)) ([624bd55](https://github.com/homarr-labs/homarr/commit/624bd55b117b2b9f9109aecdeabf1515c567656e))
|
||||||
|
* **deps:** update dependency @tanstack/react-query to ^5.90.19 ([#4888](https://github.com/homarr-labs/homarr/issues/4888)) ([fa84bd5](https://github.com/homarr-labs/homarr/commit/fa84bd569fdf6c9aecfcb9b4d8fb20d14215160b))
|
||||||
|
* **deps:** update dependency better-sqlite3 to ^12.6.0 ([#4853](https://github.com/homarr-labs/homarr/issues/4853)) ([9d4fb9e](https://github.com/homarr-labs/homarr/commit/9d4fb9eb462a0297618c70f619618f94d8857e1f))
|
||||||
|
* **deps:** update dependency better-sqlite3 to ^12.6.2 ([#4891](https://github.com/homarr-labs/homarr/issues/4891)) ([63a0793](https://github.com/homarr-labs/homarr/commit/63a0793c6ea02456a49a07635b927adf3a314ee0))
|
||||||
|
* **deps:** update dependency fastify to ^5.7.0 ([#4882](https://github.com/homarr-labs/homarr/issues/4882)) ([b9bc9dd](https://github.com/homarr-labs/homarr/commit/b9bc9dd38d22f03a0faa59a68056192c3f1519d4))
|
||||||
|
* **deps:** update dependency fastify to ^5.7.1 ([#4887](https://github.com/homarr-labs/homarr/issues/4887)) ([02e722a](https://github.com/homarr-labs/homarr/commit/02e722aa4531e816bb563628ebbb7e8b0cf93ce3))
|
||||||
|
* **deps:** update dependency ioredis to v5.9.2 ([#4881](https://github.com/homarr-labs/homarr/issues/4881)) ([e3ba1ee](https://github.com/homarr-labs/homarr/commit/e3ba1ee931b0e53fb94bf0e50fae81eecfade237))
|
||||||
|
* **deps:** update dependency jotai to ^2.16.2 ([#4869](https://github.com/homarr-labs/homarr/issues/4869)) ([2e58acc](https://github.com/homarr-labs/homarr/commit/2e58acc3bd5da474bfe0636a58b43759947ef2d2))
|
||||||
|
* **deps:** update dependency mysql2 to v3.16.1 ([#4886](https://github.com/homarr-labs/homarr/issues/4886)) ([40ee667](https://github.com/homarr-labs/homarr/commit/40ee667832124075b0730a54a4b8019365ab8794))
|
||||||
|
* **deps:** update dependency pg to ^8.17.0 ([#4874](https://github.com/homarr-labs/homarr/issues/4874)) ([b923891](https://github.com/homarr-labs/homarr/commit/b923891fac4cd61c5a1a8505d5bcfb737255196f))
|
||||||
|
* **deps:** update dependency pg to ^8.17.1 ([#4877](https://github.com/homarr-labs/homarr/issues/4877)) ([fcd4171](https://github.com/homarr-labs/homarr/commit/fcd417198f4a1afc250455bf25594a32f61b1070))
|
||||||
|
* **deps:** update dependency prettier to ^3.8.0 ([#4876](https://github.com/homarr-labs/homarr/issues/4876)) ([3ade915](https://github.com/homarr-labs/homarr/commit/3ade915d35540578a7f193baf99cbdbf89103b97))
|
||||||
|
* **deps:** update dependency react-error-boundary to ^6.1.0 ([#4884](https://github.com/homarr-labs/homarr/issues/4884)) ([41b02b6](https://github.com/homarr-labs/homarr/commit/41b02b63d9a1f9b73cc54371bbc1b6161a4d76d0))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.53.0 ([#4863](https://github.com/homarr-labs/homarr/issues/4863)) ([e9020e6](https://github.com/homarr-labs/homarr/commit/e9020e68ecf9e33df983108e7ab239776874413c))
|
||||||
|
* **deps:** update nextjs monorepo to v16.1.2 ([#4875](https://github.com/homarr-labs/homarr/issues/4875)) ([c6be8c5](https://github.com/homarr-labs/homarr/commit/c6be8c5475722e5a6dbc886e5e7f24ef8a04c470))
|
||||||
|
* **deps:** update nextjs monorepo to v16.1.3 ([#4889](https://github.com/homarr-labs/homarr/issues/4889)) ([5a8e864](https://github.com/homarr-labs/homarr/commit/5a8e864630b61595b53a9e849973460ffdce5fd2))
|
||||||
|
* **deps:** update turbo monorepo to ^2.7.4 ([#4861](https://github.com/homarr-labs/homarr/issues/4861)) ([0c38e2f](https://github.com/homarr-labs/homarr/commit/0c38e2f290fc6dcb9608b338ee38409afb3beabe))
|
||||||
|
* **deps:** update turbo monorepo to ^2.7.5 ([#4892](https://github.com/homarr-labs/homarr/issues/4892)) ([c847f60](https://github.com/homarr-labs/homarr/commit/c847f6004dc4c166969ee1248ec64b7d27ba8362))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* **memory:** lazy routers ([#4868](https://github.com/homarr-labs/homarr/issues/4868)) ([1623fba](https://github.com/homarr-labs/homarr/commit/1623fbaaeb41b16e13dcd401a00f70711a283bf9))
|
||||||
|
|
||||||
|
## [1.50.1](https://github.com/homarr-labs/homarr/compare/v1.50.0...v1.50.1) (2026-01-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **deps:** update dependency ioredis to v5.9.0 ([#4827](https://github.com/homarr-labs/homarr/issues/4827)) ([155d4f2](https://github.com/homarr-labs/homarr/commit/155d4f2270b3b35c4ad696499b0aaa0b10100989))
|
||||||
|
* **deps:** update dependency ioredis to v5.9.1 ([#4844](https://github.com/homarr-labs/homarr/issues/4844)) ([5d00642](https://github.com/homarr-labs/homarr/commit/5d006422688cf3fe7440ae3ab66ad3b2cc9286a8))
|
||||||
|
* **deps:** update dependency ldapts to v8.1.3 ([#4841](https://github.com/homarr-labs/homarr/issues/4841)) ([7fa9907](https://github.com/homarr-labs/homarr/commit/7fa990712bddc88bbb3bbe01e758bfef7cb4dea3))
|
||||||
|
* **deps:** update dependency react-error-boundary to ^6.0.2 ([#4821](https://github.com/homarr-labs/homarr/issues/4821)) ([e9ba102](https://github.com/homarr-labs/homarr/commit/e9ba102cf668c0ef54628d3dbc6e6cbda2d059b5))
|
||||||
|
* **deps:** update dependency react-error-boundary to ^6.0.3 ([#4847](https://github.com/homarr-labs/homarr/issues/4847)) ([c24006d](https://github.com/homarr-labs/homarr/commit/c24006dca691f26a7187c0ba112d9ed2ec424bb0))
|
||||||
|
* **deps:** update dependency sass to ^1.97.2 ([#4835](https://github.com/homarr-labs/homarr/issues/4835)) ([07ba531](https://github.com/homarr-labs/homarr/commit/07ba53165c90d675aa54c5ad3fca930fef5cd35e))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.52.0 ([#4830](https://github.com/homarr-labs/homarr/issues/4830)) ([fa8af6a](https://github.com/homarr-labs/homarr/commit/fa8af6a453b846af2305db3c318c8c1c303a3a88))
|
||||||
|
* **deps:** update dependency undici to v7.17.0 ([#4826](https://github.com/homarr-labs/homarr/issues/4826)) ([21a91b1](https://github.com/homarr-labs/homarr/commit/21a91b1489ff1a1f0a1428a3f50f00db8932da72))
|
||||||
|
* **deps:** update dependency undici to v7.18.0 ([#4829](https://github.com/homarr-labs/homarr/issues/4829)) ([b76ab29](https://github.com/homarr-labs/homarr/commit/b76ab2961d84081c9ef04d76193f21a1068e72d9))
|
||||||
|
* **deps:** update dependency undici to v7.18.2 ([#4837](https://github.com/homarr-labs/homarr/issues/4837)) ([16733c2](https://github.com/homarr-labs/homarr/commit/16733c2a0efabcbc5b693a8b6f82833f6fc344b7))
|
||||||
|
* **deps:** update dependency ws to ^8.19.0 ([#4833](https://github.com/homarr-labs/homarr/issues/4833)) ([629359e](https://github.com/homarr-labs/homarr/commit/629359e3e44ddad880842cfd576edb514f80d61a))
|
||||||
|
* **deps:** update mantine monorepo to ^8.3.11 ([#4822](https://github.com/homarr-labs/homarr/issues/4822)) ([0364e10](https://github.com/homarr-labs/homarr/commit/0364e102cd6c0f560bc49e0b9ccd71df0b75eed6))
|
||||||
|
* **deps:** update mantine monorepo to ^8.3.12 ([#4848](https://github.com/homarr-labs/homarr/issues/4848)) ([275a346](https://github.com/homarr-labs/homarr/commit/275a346afaaebfa894ef2193f70966986a138dbb))
|
||||||
|
* **deps:** update tiptap monorepo to v3.15.0 ([#4832](https://github.com/homarr-labs/homarr/issues/4832)) ([ab3ee4f](https://github.com/homarr-labs/homarr/commit/ab3ee4f78a739bdb3b49a81652420df6ec143b62))
|
||||||
|
* **deps:** update tiptap monorepo to v3.15.1 ([#4838](https://github.com/homarr-labs/homarr/issues/4838)) ([d479b63](https://github.com/homarr-labs/homarr/commit/d479b63a803f2295ccdf20fcd31c418a4aab148c))
|
||||||
|
* **deps:** update tiptap monorepo to v3.15.2 ([#4842](https://github.com/homarr-labs/homarr/issues/4842)) ([55c2666](https://github.com/homarr-labs/homarr/commit/55c2666f9d27ca34b6d028070f0d7b84e4c40e97))
|
||||||
|
* **deps:** update tiptap monorepo to v3.15.3 ([#4843](https://github.com/homarr-labs/homarr/issues/4843)) ([b26cf0e](https://github.com/homarr-labs/homarr/commit/b26cf0e65fd8150e241465628df2cb8b5a72088e))
|
||||||
|
* **deps:** update turbo monorepo to ^2.7.3 ([#4831](https://github.com/homarr-labs/homarr/issues/4831)) ([50410fe](https://github.com/homarr-labs/homarr/commit/50410fedb3f33ed131f923257e61ae2dca4e0288))
|
||||||
|
|
||||||
|
## [1.50.0](https://github.com/homarr-labs/homarr/compare/v1.49.1...v1.50.0) (2026-01-09)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **auth:** extend API key authentication to tRPC endpoints ([#4732](https://github.com/homarr-labs/homarr/issues/4732)) ([0dc61a8](https://github.com/homarr-labs/homarr/commit/0dc61a88b8d12c61fd436adf0693c9fa5087a8c0))
|
||||||
|
* **users:** add libravatar / gravatar support ([#4277](https://github.com/homarr-labs/homarr/issues/4277)) ([a2a3412](https://github.com/homarr-labs/homarr/commit/a2a34124ae11b0b9242b9c2579f7376768d35d52))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **deps:** update dependency @tabler/icons-react to ^3.36.0 ([#4707](https://github.com/homarr-labs/homarr/issues/4707)) ([35e0198](https://github.com/homarr-labs/homarr/commit/35e0198b5df2a315ea2efb584752c5af062f960d))
|
||||||
|
* **deps:** update dependency @tabler/icons-react to ^3.36.1 ([#4812](https://github.com/homarr-labs/homarr/issues/4812)) ([dabb2bb](https://github.com/homarr-labs/homarr/commit/dabb2bb7821f6a68d41c4a931bb70c41fdd21a72))
|
||||||
|
* **deps:** update dependency @tanstack/react-query to ^5.90.15 ([#4794](https://github.com/homarr-labs/homarr/issues/4794)) ([ea848bd](https://github.com/homarr-labs/homarr/commit/ea848bdd0bc1268675d00213bb86dc1d1b298162))
|
||||||
|
* **deps:** update dependency @tanstack/react-query to ^5.90.16 ([#4799](https://github.com/homarr-labs/homarr/issues/4799)) ([413e846](https://github.com/homarr-labs/homarr/commit/413e846133f13a800f509273b8b87cf677f0024d))
|
||||||
|
* **deps:** update dependency ldapts to v8.1.0 ([#4804](https://github.com/homarr-labs/homarr/issues/4804)) ([c8ecf5f](https://github.com/homarr-labs/homarr/commit/c8ecf5f0a13b1c74f24cebced76a60728eb2d543))
|
||||||
|
* **deps:** update dependency ldapts to v8.1.2 ([#4805](https://github.com/homarr-labs/homarr/issues/4805)) ([9e63e34](https://github.com/homarr-labs/homarr/commit/9e63e3443af7946199999104024f00991cc1cba2))
|
||||||
|
* **deps:** update dependency next-intl to v4.7.0 ([#4806](https://github.com/homarr-labs/homarr/issues/4806)) ([35042a7](https://github.com/homarr-labs/homarr/commit/35042a783ce5c381425bb96766adbefcac75bfdd))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.51.0 ([#4795](https://github.com/homarr-labs/homarr/issues/4795)) ([f0a2551](https://github.com/homarr-labs/homarr/commit/f0a2551fdf5b5e02ece789d473411ad3edcfb093))
|
||||||
|
|
||||||
|
## [1.49.1](https://github.com/homarr-labs/homarr/compare/v1.49.0...v1.49.1) (2026-01-03)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **db:** connection issue do to missing host and name of db when connecting with host ([#4786](https://github.com/homarr-labs/homarr/issues/4786)) ([7d33225](https://github.com/homarr-labs/homarr/commit/7d3322576c3ed1b9917873bf707d77d2a4eef1a8))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.36 ([#4790](https://github.com/homarr-labs/homarr/issues/4790)) ([1842e5f](https://github.com/homarr-labs/homarr/commit/1842e5fff5c072c8da45a01be860e63d12d5062a))
|
||||||
|
* **deps:** update dependency react-error-boundary to ^6.0.1 ([#4791](https://github.com/homarr-labs/homarr/issues/4791)) ([1b70973](https://github.com/homarr-labs/homarr/commit/1b70973084c9e9ebed34e8d7d9690a9e5530f60f))
|
||||||
|
* **unraid:** temperature of disks can be null ([#4788](https://github.com/homarr-labs/homarr/issues/4788)) ([60f9d4e](https://github.com/homarr-labs/homarr/commit/60f9d4e6e69df2190171e5d8e263b2030447ab2e))
|
||||||
|
|
||||||
|
## [1.49.0](https://github.com/homarr-labs/homarr/compare/v1.48.0...v1.49.0) (2026-01-02)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* unraid integration ([#4439](https://github.com/homarr-labs/homarr/issues/4439)) ([9b0dd6d](https://github.com/homarr-labs/homarr/commit/9b0dd6d6cebda4a541c8859506d89e9e9f782fa4))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add orphaned status for containers with invalid stats ([#4441](https://github.com/homarr-labs/homarr/issues/4441)) ([f04f537](https://github.com/homarr-labs/homarr/commit/f04f53759b6890d5d2dd683a9bf124d8ff12780b))
|
||||||
|
* **deps:** update dependency @xterm/addon-fit to v0.11.0 ([#4756](https://github.com/homarr-labs/homarr/issues/4756)) ([1c727e5](https://github.com/homarr-labs/homarr/commit/1c727e59af4041e5e41da854633ccd3c030c1d18))
|
||||||
|
* **deps:** update dependency @xterm/xterm to v6 ([#4757](https://github.com/homarr-labs/homarr/issues/4757)) ([fad478c](https://github.com/homarr-labs/homarr/commit/fad478c549cdbc616f921d9b444bff48b59e77a5))
|
||||||
|
* **deps:** update dependency isomorphic-dompurify to ^2.35.0 ([#4779](https://github.com/homarr-labs/homarr/issues/4779)) ([236fa35](https://github.com/homarr-labs/homarr/commit/236fa35f7e0943be33bba153e7030ce4e3bb204e))
|
||||||
|
* **deps:** update dependency jotai to ^2.16.1 ([#4772](https://github.com/homarr-labs/homarr/issues/4772)) ([d002700](https://github.com/homarr-labs/homarr/commit/d00270046a041a10c1c540cfa79c1eee477f3303))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.31 ([#4755](https://github.com/homarr-labs/homarr/issues/4755)) ([8b09693](https://github.com/homarr-labs/homarr/commit/8b096939e4e1da8e98791a8e05f108a136fe2810))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.32 ([#4762](https://github.com/homarr-labs/homarr/issues/4762)) ([49afb82](https://github.com/homarr-labs/homarr/commit/49afb8244615f67af0586aaacf77a509231ac6dc))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.34 ([#4765](https://github.com/homarr-labs/homarr/issues/4765)) ([809bf55](https://github.com/homarr-labs/homarr/commit/809bf559fe1b96df9a903dc790d138cad7368adb))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.35 ([#4768](https://github.com/homarr-labs/homarr/issues/4768)) ([e574dd7](https://github.com/homarr-labs/homarr/commit/e574dd70f1421e9254a289a0f02fd0b4d43e26ad))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.50.1 ([#4758](https://github.com/homarr-labs/homarr/issues/4758)) ([adaa803](https://github.com/homarr-labs/homarr/commit/adaa8039dd545109246ccd9fa15570739f755f62))
|
||||||
|
* **deps:** update nextjs monorepo to v16.1.1 ([#4759](https://github.com/homarr-labs/homarr/issues/4759)) ([7712ab4](https://github.com/homarr-labs/homarr/commit/7712ab410b5094e5d84df75461e07efdfccc285b))
|
||||||
|
* **deps:** update tanstack-query monorepo ([#4782](https://github.com/homarr-labs/homarr/issues/4782)) ([1e5d38f](https://github.com/homarr-labs/homarr/commit/1e5d38fd3ca4c68fa4c61b02757a3cff39839fdb))
|
||||||
|
* **deps:** update testcontainers-node monorepo to ^11.11.0 ([#4781](https://github.com/homarr-labs/homarr/issues/4781)) ([e40a116](https://github.com/homarr-labs/homarr/commit/e40a11608cb21a75e6910028abf97e14b5275f56))
|
||||||
|
* **deps:** update turbo monorepo to ^2.7.2 ([#4764](https://github.com/homarr-labs/homarr/issues/4764)) ([9191430](https://github.com/homarr-labs/homarr/commit/919143022969350f6ee7be2f53be2fe09a89bba3))
|
||||||
|
|
||||||
|
## [1.48.0](https://github.com/homarr-labs/homarr/compare/v1.47.0...v1.48.0) (2025-12-26)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* enable dns caching by default ([#4706](https://github.com/homarr-labs/homarr/issues/4706)) ([fbb5298](https://github.com/homarr-labs/homarr/commit/fbb5298cb05b12eb2f19c121a1bc103caeb3e576))
|
||||||
|
* **http:** add proxy support ([#4721](https://github.com/homarr-labs/homarr/issues/4721)) ([5a57115](https://github.com/homarr-labs/homarr/commit/5a57115ca073aea1c75a000fda6a23648c5488e4))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **deps:** update dependency @t3-oss/env-nextjs to ^0.13.10 ([#4710](https://github.com/homarr-labs/homarr/issues/4710)) ([689523a](https://github.com/homarr-labs/homarr/commit/689523a194ab48bdc072b1cdf65f07ade6cbc584))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.24 ([#4711](https://github.com/homarr-labs/homarr/issues/4711)) ([648f7e2](https://github.com/homarr-labs/homarr/commit/648f7e2c7743af81f4bced36b7e1e80c21e851e5))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.25 ([#4724](https://github.com/homarr-labs/homarr/issues/4724)) ([ef12b2b](https://github.com/homarr-labs/homarr/commit/ef12b2b5c2e1131138937fb6da61ce4c167fe0eb))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.27 ([#4737](https://github.com/homarr-labs/homarr/issues/4737)) ([8891ac4](https://github.com/homarr-labs/homarr/commit/8891ac42399e47fda6efc657b8ff2fe58aebca9e))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.28 ([#4743](https://github.com/homarr-labs/homarr/issues/4743)) ([75c5453](https://github.com/homarr-labs/homarr/commit/75c545344aae39550917331458c01a894b6a942f))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.29 ([#4747](https://github.com/homarr-labs/homarr/issues/4747)) ([5dd7400](https://github.com/homarr-labs/homarr/commit/5dd74006843ae72f63e631b14f0fd50c911d610b))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.30 ([#4749](https://github.com/homarr-labs/homarr/issues/4749)) ([96c2c0d](https://github.com/homarr-labs/homarr/commit/96c2c0d604737c64722fa21bf79965c806bf4da3))
|
||||||
|
* **deps:** update dependency mysql2 to v3.16.0 ([#4731](https://github.com/homarr-labs/homarr/issues/4731)) ([f34bdce](https://github.com/homarr-labs/homarr/commit/f34bdce6446d4e62b54b96f63e91cfdddd51e901))
|
||||||
|
* **deps:** update dependency next-intl to v4.6.1 ([#4730](https://github.com/homarr-labs/homarr/issues/4730)) ([f4d782a](https://github.com/homarr-labs/homarr/commit/f4d782abefb78e085ca3fc66034c0ca54fb21120))
|
||||||
|
* **deps:** update dependency sass to ^1.97.0 ([#4726](https://github.com/homarr-labs/homarr/issues/4726)) ([88baad8](https://github.com/homarr-labs/homarr/commit/88baad8143f4ca830e50644d6bd1d1980ef1da82))
|
||||||
|
* **deps:** update dependency sass to ^1.97.1 ([#4746](https://github.com/homarr-labs/homarr/issues/4746)) ([6b774f4](https://github.com/homarr-labs/homarr/commit/6b774f47d0a8bf731e7e1837a9d47e0dc53a1ff0))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.50.0 ([#4720](https://github.com/homarr-labs/homarr/issues/4720)) ([2dc8fea](https://github.com/homarr-labs/homarr/commit/2dc8feae7ea6174a1d826d8f0151ddc2c04c6aa6))
|
||||||
|
* **deps:** update dependency zod to ^4.2.0 ([#4712](https://github.com/homarr-labs/homarr/issues/4712)) ([6e39524](https://github.com/homarr-labs/homarr/commit/6e39524f9d28d201c13738212d238726e1685832))
|
||||||
|
* **deps:** update dependency zod to ^4.2.1 ([#4722](https://github.com/homarr-labs/homarr/issues/4722)) ([68dc684](https://github.com/homarr-labs/homarr/commit/68dc6844fdee53aca55b44dd7d19bf9d3a35c057))
|
||||||
|
* **deps:** update nextjs monorepo to v16.1.0 ([#4739](https://github.com/homarr-labs/homarr/issues/4739)) ([99f2842](https://github.com/homarr-labs/homarr/commit/99f2842a5a102056c76ddc68cb5083791f324c3c))
|
||||||
|
* **deps:** update tiptap monorepo to v3.14.0 ([#4744](https://github.com/homarr-labs/homarr/issues/4744)) ([adbe707](https://github.com/homarr-labs/homarr/commit/adbe707c73f462771c3d21cbbcc21e8245eea6f3))
|
||||||
|
* **deps:** update trpc monorepo to ^11.8.1 ([#4750](https://github.com/homarr-labs/homarr/issues/4750)) ([93bf9ab](https://github.com/homarr-labs/homarr/commit/93bf9ab84b5387eefb8cc0b03057a4ccf0b13aa9))
|
||||||
|
* **deps:** update turbo monorepo to ^2.7.0 ([#4745](https://github.com/homarr-labs/homarr/issues/4745)) ([5d659a3](https://github.com/homarr-labs/homarr/commit/5d659a3ebbf79266158cb57236de90e7883e7a4e))
|
||||||
|
* **deps:** update turbo monorepo to ^2.7.1 ([#4751](https://github.com/homarr-labs/homarr/issues/4751)) ([d8db016](https://github.com/homarr-labs/homarr/commit/d8db0169a142c2ec302806fe946cb17431ccae6b))
|
||||||
|
|
||||||
## [1.47.0](https://github.com/homarr-labs/homarr/compare/v1.46.0...v1.47.0) (2025-12-19)
|
## [1.47.0](https://github.com/homarr-labs/homarr/compare/v1.46.0...v1.47.0) (2025-12-19)
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
+5
-5
@@ -2,8 +2,8 @@
|
|||||||
* @homarr-labs/maintainers
|
* @homarr-labs/maintainers
|
||||||
|
|
||||||
# Exempt Renovate‑managed files (no owners)
|
# Exempt Renovate‑managed files (no owners)
|
||||||
package.json @homarr-labs/none
|
package.json
|
||||||
package-lock.json @homarr-labs/none
|
package-lock.json
|
||||||
pnpm-lock.yaml @homarr-labs/none
|
pnpm-lock.yaml
|
||||||
Dockerfile @homarr-labs/none
|
Dockerfile
|
||||||
docker-compose.yml @homarr-labs/none
|
docker-compose.yml
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24.12.0-alpine AS base
|
FROM node:24.13.0-alpine AS base
|
||||||
|
|
||||||
FROM base AS builder
|
FROM base AS builder
|
||||||
RUN apk add --no-cache libc6-compat
|
RUN apk add --no-cache libc6-compat
|
||||||
|
|||||||
+24
-24
@@ -48,24 +48,24 @@
|
|||||||
"@homarr/ui": "workspace:^0.1.0",
|
"@homarr/ui": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@homarr/widgets": "workspace:^0.1.0",
|
"@homarr/widgets": "workspace:^0.1.0",
|
||||||
"@mantine/colors-generator": "^8.3.10",
|
"@mantine/colors-generator": "^8.3.12",
|
||||||
"@mantine/core": "^8.3.10",
|
"@mantine/core": "^8.3.12",
|
||||||
"@mantine/dropzone": "^8.3.10",
|
"@mantine/dropzone": "^8.3.12",
|
||||||
"@mantine/hooks": "^8.3.10",
|
"@mantine/hooks": "^8.3.12",
|
||||||
"@mantine/modals": "^8.3.10",
|
"@mantine/modals": "^8.3.12",
|
||||||
"@mantine/tiptap": "^8.3.10",
|
"@mantine/tiptap": "^8.3.12",
|
||||||
"@million/lint": "1.0.14",
|
"@million/lint": "1.0.14",
|
||||||
"@tabler/icons-react": "^3.35.0",
|
"@tabler/icons-react": "^3.36.1",
|
||||||
"@tanstack/react-query": "^5.90.12",
|
"@tanstack/react-query": "^5.90.19",
|
||||||
"@tanstack/react-query-devtools": "^5.91.1",
|
"@tanstack/react-query-devtools": "^5.91.2",
|
||||||
"@tanstack/react-query-next-experimental": "^5.91.0",
|
"@tanstack/react-query-next-experimental": "^5.91.0",
|
||||||
"@trpc/client": "^11.8.0",
|
"@trpc/client": "^11.8.1",
|
||||||
"@trpc/next": "^11.8.0",
|
"@trpc/next": "^11.8.1",
|
||||||
"@trpc/react-query": "^11.8.0",
|
"@trpc/react-query": "^11.8.1",
|
||||||
"@trpc/server": "^11.8.0",
|
"@trpc/server": "^11.8.1",
|
||||||
"@xterm/addon-canvas": "^0.7.0",
|
"@xterm/addon-canvas": "^0.7.0",
|
||||||
"@xterm/addon-fit": "0.10.0",
|
"@xterm/addon-fit": "0.11.0",
|
||||||
"@xterm/xterm": "^5.5.0",
|
"@xterm/xterm": "^6.0.0",
|
||||||
"babel-plugin-react-compiler": "^1.0.0",
|
"babel-plugin-react-compiler": "^1.0.0",
|
||||||
"chroma-js": "^3.2.0",
|
"chroma-js": "^3.2.0",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
@@ -73,36 +73,36 @@
|
|||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
"glob": "^13.0.0",
|
"glob": "^13.0.0",
|
||||||
"isomorphic-dompurify": "^2.34.0",
|
"isomorphic-dompurify": "^2.35.0",
|
||||||
"jotai": "^2.16.0",
|
"jotai": "^2.16.2",
|
||||||
"mantine-react-table": "2.0.0-beta.9",
|
"mantine-react-table": "2.0.0-beta.9",
|
||||||
"next": "16.0.10",
|
"next": "16.1.3",
|
||||||
"postcss-preset-mantine": "^1.18.0",
|
"postcss-preset-mantine": "^1.18.0",
|
||||||
"prismjs": "^1.30.0",
|
"prismjs": "^1.30.0",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3",
|
"react-dom": "19.2.3",
|
||||||
"react-error-boundary": "^6.0.0",
|
"react-error-boundary": "^6.1.0",
|
||||||
"react-simple-code-editor": "^0.14.1",
|
"react-simple-code-editor": "^0.14.1",
|
||||||
"sass": "^1.96.0",
|
"sass": "^1.97.2",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"swagger-ui-react": "^5.31.0",
|
"swagger-ui-react": "^5.31.0",
|
||||||
"use-deep-compare-effect": "^1.8.1",
|
"use-deep-compare-effect": "^1.8.1",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/chroma-js": "3.1.2",
|
"@types/chroma-js": "3.1.2",
|
||||||
"@types/node": "^24.10.4",
|
"@types/node": "^24.10.9",
|
||||||
"@types/prismjs": "^1.26.5",
|
"@types/prismjs": "^1.26.5",
|
||||||
"@types/react": "19.2.7",
|
"@types/react": "19.2.8",
|
||||||
"@types/react-dom": "19.2.3",
|
"@types/react-dom": "19.2.3",
|
||||||
"@types/swagger-ui-react": "^5.18.0",
|
"@types/swagger-ui-react": "^5.18.0",
|
||||||
"concurrently": "^9.2.1",
|
"concurrently": "^9.2.1",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"node-loader": "^2.1.0",
|
"node-loader": "^2.1.0",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.8.0",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -106,6 +106,7 @@ export default async function Layout(props: {
|
|||||||
forceDisableStatus: serverSettings.board.forceDisableStatus,
|
forceDisableStatus: serverSettings.board.forceDisableStatus,
|
||||||
},
|
},
|
||||||
search: { defaultSearchEngineId: serverSettings.search.defaultSearchEngineId },
|
search: { defaultSearchEngineId: serverSettings.search.defaultSearchEngineId },
|
||||||
|
user: { enableGravatar: serverSettings.user.enableGravatar },
|
||||||
}}
|
}}
|
||||||
{...innerProps}
|
{...innerProps}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Switch } from "@mantine/core";
|
||||||
|
|
||||||
|
import type { ServerSettings } from "@homarr/server-settings";
|
||||||
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
|
import { CommonSettingsForm } from "./common-form";
|
||||||
|
|
||||||
|
export const UserSettingsForm = ({ defaultValues }: { defaultValues: ServerSettings["user"] }) => {
|
||||||
|
const tUser = useScopedI18n("management.page.settings.section.user");
|
||||||
|
|
||||||
|
return (
|
||||||
|
<CommonSettingsForm settingKey="user" defaultValues={defaultValues}>
|
||||||
|
{(form) => (
|
||||||
|
<>
|
||||||
|
<Switch
|
||||||
|
{...form.getInputProps("enableGravatar", { type: "checkbox" })}
|
||||||
|
label={tUser("enableGravatar.label")}
|
||||||
|
description={tUser("enableGravatar.description")}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</CommonSettingsForm>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -12,6 +12,7 @@ import { AppearanceSettingsForm } from "./_components/appearance-settings-form";
|
|||||||
import { BoardSettingsForm } from "./_components/board-settings-form";
|
import { BoardSettingsForm } from "./_components/board-settings-form";
|
||||||
import { CultureSettingsForm } from "./_components/culture-settings-form";
|
import { CultureSettingsForm } from "./_components/culture-settings-form";
|
||||||
import { SearchSettingsForm } from "./_components/search-settings-form";
|
import { SearchSettingsForm } from "./_components/search-settings-form";
|
||||||
|
import { UserSettingsForm } from "./_components/user-settings-form";
|
||||||
|
|
||||||
export async function generateMetadata() {
|
export async function generateMetadata() {
|
||||||
const t = await getScopedI18n("management");
|
const t = await getScopedI18n("management");
|
||||||
@@ -42,6 +43,10 @@ export default async function SettingsPage() {
|
|||||||
<Title order={2}>{tSettings("section.board.title")}</Title>
|
<Title order={2}>{tSettings("section.board.title")}</Title>
|
||||||
<BoardSettingsForm defaultValues={serverSettings.board} />
|
<BoardSettingsForm defaultValues={serverSettings.board} />
|
||||||
</Stack>
|
</Stack>
|
||||||
|
<Stack>
|
||||||
|
<Title order={2}>{tSettings("section.user.title")}</Title>
|
||||||
|
<UserSettingsForm defaultValues={serverSettings.user} />
|
||||||
|
</Stack>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Title order={2}>{tSettings("section.search.title")}</Title>
|
<Title order={2}>{tSettings("section.search.title")}</Title>
|
||||||
<SearchSettingsForm defaultValues={serverSettings.search} />
|
<SearchSettingsForm defaultValues={serverSettings.search} />
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ const createColumns = (
|
|||||||
accessorKey: "ports",
|
accessorKey: "ports",
|
||||||
header: t("docker.field.ports.label"),
|
header: t("docker.field.ports.label"),
|
||||||
Cell({ cell }) {
|
Cell({ cell }) {
|
||||||
|
if (!cell.row.original.ports.length) return null;
|
||||||
return (
|
return (
|
||||||
<OverflowBadge overflowCount={1} data={cell.row.original.ports.map((port) => port.PrivatePort.toString())} />
|
<OverflowBadge overflowCount={1} data={cell.row.original.ports.map((port) => port.PrivatePort.toString())} />
|
||||||
);
|
);
|
||||||
|
|||||||
+4
-1
@@ -200,7 +200,10 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
<Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
|
<Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl" shadow="md" withBorder>
|
||||||
<Stack maw={300} align="center" mx="auto">
|
<Stack maw={300} align="center" mx="auto">
|
||||||
<UserAvatar size="xl" user={{ name: generalForm.values.username, image: null }} />
|
<UserAvatar
|
||||||
|
size="xl"
|
||||||
|
user={{ name: generalForm.values.username, email: generalForm.values.email ?? null, image: null }}
|
||||||
|
/>
|
||||||
<Text tt="uppercase" fw="bolder" size="xl">
|
<Text tt="uppercase" fw="bolder" size="xl">
|
||||||
{generalForm.values.username}
|
{generalForm.values.username}
|
||||||
</Text>
|
</Text>
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export default async function GroupsDetailPage(props: GroupsDetailPageProps) {
|
|||||||
<Card>
|
<Card>
|
||||||
{group.owner ? (
|
{group.owner ? (
|
||||||
<Group>
|
<Group>
|
||||||
<UserAvatar user={{ name: group.owner.name, image: group.owner.image }} size={"lg"} />
|
<UserAvatar user={group.owner} size={"lg"} />
|
||||||
<Stack align={"start"} gap={3}>
|
<Stack align={"start"} gap={3}>
|
||||||
<Text fw={"bold"}>{group.owner.name}</Text>
|
<Text fw={"bold"}>{group.owner.name}</Text>
|
||||||
<Text>{group.owner.email}</Text>
|
<Text>{group.owner.email}</Text>
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
|
|||||||
<ErrorBoundary
|
<ErrorBoundary
|
||||||
onReset={reset}
|
onReset={reset}
|
||||||
fallbackRender={({ resetErrorBoundary, error }) => (
|
fallbackRender={({ resetErrorBoundary, error }) => (
|
||||||
<WidgetError kind={kind} error={error as unknown} resetErrorBoundary={resetErrorBoundary} />
|
<WidgetError kind={kind} error={error} resetErrorBoundary={resetErrorBoundary} />
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<Comp
|
<Comp
|
||||||
|
|||||||
@@ -3,21 +3,24 @@ import { userAgent } from "next/server";
|
|||||||
import { createOpenApiFetchHandler } from "trpc-to-openapi";
|
import { createOpenApiFetchHandler } from "trpc-to-openapi";
|
||||||
|
|
||||||
import { appRouter, createTRPCContext } from "@homarr/api";
|
import { appRouter, createTRPCContext } from "@homarr/api";
|
||||||
import type { Session } from "@homarr/auth";
|
import { API_KEY_HEADER_NAME, getSessionFromApiKeyAsync } from "@homarr/auth/api-key";
|
||||||
import { hashPasswordAsync } from "@homarr/auth";
|
import { ipAddressFromHeaders } from "@homarr/common/server";
|
||||||
import { createSessionAsync } from "@homarr/auth/server";
|
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
import { db, eq } from "@homarr/db";
|
import { db } from "@homarr/db";
|
||||||
import { apiKeys } from "@homarr/db/schema";
|
|
||||||
|
|
||||||
const logger = createLogger({ module: "trpcOpenApiRoute" });
|
const logger = createLogger({ module: "trpcOpenApiRoute" });
|
||||||
|
|
||||||
const handlerAsync = async (req: NextRequest) => {
|
const handlerAsync = async (req: NextRequest) => {
|
||||||
const apiKeyHeaderValue = req.headers.get("ApiKey");
|
const apiKeyHeaderValue = req.headers.get(API_KEY_HEADER_NAME);
|
||||||
const ipAddress = req.headers.get("x-forwarded-for");
|
const ipAddress = ipAddressFromHeaders(req.headers);
|
||||||
const { ua } = userAgent(req);
|
const { ua } = userAgent(req);
|
||||||
const session: Session | null = await getSessionOrDefaultFromHeadersAsync(apiKeyHeaderValue, ipAddress, ua);
|
|
||||||
|
logger.info(
|
||||||
|
`Creating OpenAPI fetch handler for user ${apiKeyHeaderValue ? "with an api key" : "without an api key"}`,
|
||||||
|
);
|
||||||
|
|
||||||
|
const session = await getSessionFromApiKeyAsync(db, apiKeyHeaderValue, ipAddress, ua);
|
||||||
|
|
||||||
// Fallback to JSON if no content type is set
|
// Fallback to JSON if no content type is set
|
||||||
if (!req.headers.has("Content-Type")) {
|
if (!req.headers.has("Content-Type")) {
|
||||||
@@ -35,67 +38,6 @@ const handlerAsync = async (req: NextRequest) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const getSessionOrDefaultFromHeadersAsync = async (
|
|
||||||
apiKeyHeaderValue: string | null,
|
|
||||||
ipAdress: string | null,
|
|
||||||
userAgent: string,
|
|
||||||
): Promise<Session | null> => {
|
|
||||||
logger.info(
|
|
||||||
`Creating OpenAPI fetch handler for user ${apiKeyHeaderValue ? "with an api key" : "without an api key"}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (apiKeyHeaderValue === null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const [apiKeyId, apiKey] = apiKeyHeaderValue.split(".");
|
|
||||||
|
|
||||||
if (!apiKeyId || !apiKey) {
|
|
||||||
logger.warn("An attempt to authenticate over API has failed due to invalid API key format", {
|
|
||||||
ipAdress,
|
|
||||||
userAgent,
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const apiKeyFromDb = await db.query.apiKeys.findFirst({
|
|
||||||
where: eq(apiKeys.id, apiKeyId),
|
|
||||||
columns: {
|
|
||||||
id: true,
|
|
||||||
apiKey: true,
|
|
||||||
salt: true,
|
|
||||||
},
|
|
||||||
with: {
|
|
||||||
user: {
|
|
||||||
columns: {
|
|
||||||
id: true,
|
|
||||||
name: true,
|
|
||||||
email: true,
|
|
||||||
emailVerified: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!apiKeyFromDb) {
|
|
||||||
logger.warn("An attempt to authenticate over API has failed", { ipAdress, userAgent });
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const hashedApiKey = await hashPasswordAsync(apiKey, apiKeyFromDb.salt);
|
|
||||||
|
|
||||||
if (apiKeyFromDb.apiKey !== hashedApiKey) {
|
|
||||||
logger.warn("An attempt to authenticate over API has failed", { ipAdress, userAgent });
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info("Read session from API request and found user", {
|
|
||||||
name: apiKeyFromDb.user.name,
|
|
||||||
id: apiKeyFromDb.user.id,
|
|
||||||
});
|
|
||||||
return await createSessionAsync(db, apiKeyFromDb.user);
|
|
||||||
};
|
|
||||||
|
|
||||||
export {
|
export {
|
||||||
handlerAsync as DELETE,
|
handlerAsync as DELETE,
|
||||||
handlerAsync as GET,
|
handlerAsync as GET,
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
|
import { userAgent } from "next/server";
|
||||||
import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
|
import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
|
||||||
|
|
||||||
import { appRouter, createTRPCContext } from "@homarr/api";
|
import { appRouter, createTRPCContext } from "@homarr/api";
|
||||||
import { trpcPath } from "@homarr/api/shared";
|
import { trpcPath } from "@homarr/api/shared";
|
||||||
|
import { API_KEY_HEADER_NAME, getSessionFromApiKeyAsync } from "@homarr/auth/api-key";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
|
import { ipAddressFromHeaders } from "@homarr/common/server";
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
|
import { db } from "@homarr/db";
|
||||||
|
|
||||||
const logger = createLogger({ module: "trpcRoute" });
|
const logger = createLogger({ module: "trpcRoute" });
|
||||||
|
|
||||||
@@ -28,11 +32,20 @@ export function OPTIONS() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const handler = auth(async (req) => {
|
const handler = auth(async (req) => {
|
||||||
|
// Try API key auth first, fall back to session cookie
|
||||||
|
const apiKeyHeader = req.headers.get(API_KEY_HEADER_NAME);
|
||||||
|
const ipAddress = ipAddressFromHeaders(req.headers);
|
||||||
|
|
||||||
|
const { ua } = userAgent(req);
|
||||||
|
|
||||||
|
const apiKeySession = await getSessionFromApiKeyAsync(db, apiKeyHeader, ipAddress, ua);
|
||||||
|
const session = apiKeySession ?? req.auth;
|
||||||
|
|
||||||
const response = await fetchRequestHandler({
|
const response = await fetchRequestHandler({
|
||||||
endpoint: trpcPath,
|
endpoint: trpcPath,
|
||||||
router: appRouter,
|
router: appRouter,
|
||||||
req,
|
req,
|
||||||
createContext: () => createTRPCContext({ session: req.auth, headers: req.headers }),
|
createContext: () => createTRPCContext({ session, headers: req.headers }),
|
||||||
onError({ error, path, type }) {
|
onError({ error, path, type }) {
|
||||||
logger.error(new ErrorWithMetadata("tRPC Error occured", { path, type }, { cause: error }));
|
logger.error(new ErrorWithMetadata("tRPC Error occured", { path, type }, { cause: error }));
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ interface UserAccessPermission<TPermission extends string> {
|
|||||||
user: {
|
user: {
|
||||||
name: string | null;
|
name: string | null;
|
||||||
image: string | null;
|
image: string | null;
|
||||||
|
email: string | null;
|
||||||
id: string;
|
id: string;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -66,6 +67,7 @@ interface Props<TPermission extends string> {
|
|||||||
id: string;
|
id: string;
|
||||||
name: string | null;
|
name: string | null;
|
||||||
image: string | null;
|
image: string | null;
|
||||||
|
email: string | null;
|
||||||
} | null;
|
} | null;
|
||||||
};
|
};
|
||||||
translate: (key: TPermission) => string;
|
translate: (key: TPermission) => string;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { createContext, useContext } from "react";
|
import { createContext, useContext } from "react";
|
||||||
import type { TablerIcon } from "@tabler/icons-react";
|
|
||||||
|
import type { TablerIcon } from "@homarr/ui";
|
||||||
|
|
||||||
const AccessContext = createContext<{
|
const AccessContext = createContext<{
|
||||||
permissions: readonly string[];
|
permissions: readonly string[];
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ export interface FormProps<TPermission extends string> {
|
|||||||
id: string;
|
id: string;
|
||||||
name: string | null;
|
name: string | null;
|
||||||
image: string | null;
|
image: string | null;
|
||||||
|
email: string | null;
|
||||||
} | null;
|
} | null;
|
||||||
};
|
};
|
||||||
accessQueryData: AccessQueryData<TPermission>;
|
accessQueryData: AccessQueryData<TPermission>;
|
||||||
@@ -118,6 +119,7 @@ interface UserItemContentProps {
|
|||||||
id: string;
|
id: string;
|
||||||
name: string | null;
|
name: string | null;
|
||||||
image: string | null;
|
image: string | null;
|
||||||
|
email: string | null;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import { UserAvatar } from "@homarr/ui";
|
|||||||
interface InnerProps {
|
interface InnerProps {
|
||||||
presentUserIds: string[];
|
presentUserIds: string[];
|
||||||
excludeExternalProviders?: boolean;
|
excludeExternalProviders?: boolean;
|
||||||
onSelect: (props: { id: string; name: string; image: string }) => void | Promise<void>;
|
onSelect: (props: { id: string; name: string; image: string; email: string | null }) => void | Promise<void>;
|
||||||
confirmLabel?: string;
|
confirmLabel?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,6 +36,7 @@ export const UserSelectModal = createModal<InnerProps>(({ actions, innerProps })
|
|||||||
id: currentUser.id,
|
id: currentUser.id,
|
||||||
name: currentUser.name ?? "",
|
name: currentUser.name ?? "",
|
||||||
image: currentUser.image ?? "",
|
image: currentUser.image ?? "",
|
||||||
|
email: currentUser.email ?? null,
|
||||||
});
|
});
|
||||||
|
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ export class BoardMockBuilder {
|
|||||||
id: createId(),
|
id: createId(),
|
||||||
image: null,
|
image: null,
|
||||||
name: "User",
|
name: "User",
|
||||||
|
email: null,
|
||||||
},
|
},
|
||||||
groupPermissions: [],
|
groupPermissions: [],
|
||||||
userPermissions: [],
|
userPermissions: [],
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ const InnerContent = ({ item, ...dimensions }: InnerContentProps) => {
|
|||||||
fallbackRender={({ resetErrorBoundary, error }) => (
|
fallbackRender={({ resetErrorBoundary, error }) => (
|
||||||
<>
|
<>
|
||||||
<BoardItemMenu offset={4} item={newItem} resetErrorBoundary={resetErrorBoundary} />
|
<BoardItemMenu offset={4} item={newItem} resetErrorBoundary={resetErrorBoundary} />
|
||||||
<WidgetError kind={item.kind} error={error as unknown} resetErrorBoundary={resetErrorBoundary} />
|
<WidgetError kind={item.kind} error={error} resetErrorBoundary={resetErrorBoundary} />
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { Anchor, Card, Stack, Text } from "@mantine/core";
|
import { Anchor, Card, Stack, Text } from "@mantine/core";
|
||||||
import type { TablerIcon } from "@tabler/icons-react";
|
|
||||||
|
import type { TablerIcon } from "@homarr/ui";
|
||||||
|
|
||||||
interface NoResultsProps {
|
interface NoResultsProps {
|
||||||
icon: TablerIcon;
|
icon: TablerIcon;
|
||||||
|
|||||||
@@ -3,17 +3,21 @@ import type { MantineSize } from "@mantine/core";
|
|||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { UserAvatar } from "@homarr/ui";
|
import { UserAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
interface UserAvatarProps {
|
interface CurrentUserAvatarProps {
|
||||||
size: MantineSize;
|
size: MantineSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const CurrentUserAvatar = async ({ size }: UserAvatarProps) => {
|
export const CurrentUserAvatar = async ({ size }: CurrentUserAvatarProps) => {
|
||||||
const currentSession = await auth();
|
const currentSession = await auth();
|
||||||
|
|
||||||
const user = {
|
return (
|
||||||
name: currentSession?.user.name ?? null,
|
<UserAvatar
|
||||||
image: currentSession?.user.image ?? null,
|
user={{
|
||||||
};
|
name: currentSession?.user.name ?? null,
|
||||||
|
image: currentSession?.user.image ?? null,
|
||||||
return <UserAvatar user={user} size={size} />;
|
email: currentSession?.user.email ?? null,
|
||||||
|
}}
|
||||||
|
size={size}
|
||||||
|
/>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
@@ -39,19 +39,19 @@
|
|||||||
"@homarr/widgets": "workspace:^0.1.0",
|
"@homarr/widgets": "workspace:^0.1.0",
|
||||||
"dayjs": "^1.11.19",
|
"dayjs": "^1.11.19",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"fastify": "^5.6.2",
|
"fastify": "^5.7.1",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"undici": "7.16.0"
|
"undici": "7.18.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/node": "^24.10.4",
|
"@types/node": "^24.10.9",
|
||||||
"dotenv-cli": "^11.0.0",
|
"dotenv-cli": "^11.0.0",
|
||||||
"esbuild": "^0.27.1",
|
"esbuild": "^0.27.2",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.8.0",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,16 +27,16 @@
|
|||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"ws": "^8.18.3"
|
"ws": "^8.19.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/ws": "^8.18.1",
|
"@types/ws": "^8.18.1",
|
||||||
"esbuild": "^0.27.1",
|
"esbuild": "^0.27.2",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.8.0",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24.12.0-trixie AS base
|
FROM node:24.13.0-trixie AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
COPY pnpm-lock.yaml .
|
COPY pnpm-lock.yaml .
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
"name": "homarr-prebuilt-debian",
|
"name": "homarr-prebuilt-debian",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"better-sqlite3": "^12.5.0"
|
"better-sqlite3": "^12.6.2"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@10.25.0",
|
"packageManager": "pnpm@10.28.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24.12.0",
|
"node": ">=24.13.0",
|
||||||
"pnpm": ">=10.25.0"
|
"pnpm": ">=10.28.0"
|
||||||
},
|
},
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"onlyBuiltDependencies": [
|
"onlyBuiltDependencies": [
|
||||||
|
|||||||
+5
-5
@@ -9,16 +9,16 @@ importers:
|
|||||||
.:
|
.:
|
||||||
dependencies:
|
dependencies:
|
||||||
better-sqlite3:
|
better-sqlite3:
|
||||||
specifier: ^12.5.0
|
specifier: ^12.6.2
|
||||||
version: 12.5.0
|
version: 12.6.2
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
|
|
||||||
base64-js@1.5.1:
|
base64-js@1.5.1:
|
||||||
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
|
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
|
||||||
|
|
||||||
better-sqlite3@12.5.0:
|
better-sqlite3@12.6.2:
|
||||||
resolution: {integrity: sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg==}
|
resolution: {integrity: sha512-8VYKM3MjCa9WcaSAI3hzwhmyHVlH8tiGFwf0RlTsZPWJ1I5MkzjiudCo4KC4DxOaL/53A5B1sI/IbldNFDbsKA==}
|
||||||
engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
|
engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
|
||||||
|
|
||||||
bindings@1.5.0:
|
bindings@1.5.0:
|
||||||
@@ -147,7 +147,7 @@ snapshots:
|
|||||||
|
|
||||||
base64-js@1.5.1: {}
|
base64-js@1.5.1: {}
|
||||||
|
|
||||||
better-sqlite3@12.5.0:
|
better-sqlite3@12.6.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
bindings: 1.5.0
|
bindings: 1.5.0
|
||||||
prebuild-install: 7.1.3
|
prebuild-install: 7.1.3
|
||||||
|
|||||||
+34
-20
@@ -78,6 +78,13 @@
|
|||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
|
<a href="https://homarr.dev/docs/integrations/coolify" target="_blank" rel="noreferrer noopener">
|
||||||
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/coolify.svg" alt="Coolify" width="90" height="90" />
|
||||||
|
<br/>
|
||||||
|
<p align="center">Coolify</p>
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
<td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/dash-dot" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/dash-dot" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/dashdot.png" alt="Dash." width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/dashdot.png" alt="Dash." width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
@@ -97,15 +104,15 @@
|
|||||||
<br/>
|
<br/>
|
||||||
<p align="center">Docker<br/>Hub</p>
|
<p align="center">Docker<br/>Hub</p>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td></tr>
|
||||||
<td align="center">
|
<tr><td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/emby" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/emby" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/emby.svg" alt="Emby" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/emby.svg" alt="Emby" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
<p align="center">Emby</p>
|
<p align="center">Emby</p>
|
||||||
</a>
|
</a>
|
||||||
</td></tr>
|
</td>
|
||||||
<tr><td align="center">
|
<td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/github" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/github" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/github.svg" alt="Github" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/github.svg" alt="Github" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
@@ -146,15 +153,15 @@
|
|||||||
<br/>
|
<br/>
|
||||||
<p align="center">Jellyfin</p>
|
<p align="center">Jellyfin</p>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td></tr>
|
||||||
<td align="center">
|
<tr><td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/jellyseerr" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/jellyseerr" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg" alt="Jellyseerr" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg" alt="Jellyseerr" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
<p align="center">Jellyseerr</p>
|
<p align="center">Jellyseerr</p>
|
||||||
</a>
|
</a>
|
||||||
</td></tr>
|
</td>
|
||||||
<tr><td align="center">
|
<td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/lidarr" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/lidarr" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/lidarr.svg" alt="Lidarr" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/lidarr.svg" alt="Lidarr" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
@@ -195,15 +202,15 @@
|
|||||||
<br/>
|
<br/>
|
||||||
<p align="center">NZBGet</p>
|
<p align="center">NZBGet</p>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td></tr>
|
||||||
<td align="center">
|
<tr><td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/open-media-vault" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/open-media-vault" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/openmediavault.svg" alt="OpenMediaVault" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/openmediavault.svg" alt="OpenMediaVault" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
<p align="center">OpenMediaVault</p>
|
<p align="center">OpenMediaVault</p>
|
||||||
</a>
|
</a>
|
||||||
</td></tr>
|
</td>
|
||||||
<tr><td align="center">
|
<td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/opnsense" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/opnsense" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/opnsense.svg" alt="OPNsense" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/opnsense.svg" alt="OPNsense" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
@@ -244,15 +251,15 @@
|
|||||||
<br/>
|
<br/>
|
||||||
<p align="center">Proxmox</p>
|
<p align="center">Proxmox</p>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td></tr>
|
||||||
<td align="center">
|
<tr><td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/q-bittorent" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/q-bittorent" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/qbittorrent.svg" alt="qBittorrent" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/qbittorrent.svg" alt="qBittorrent" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
<p align="center">qBittorrent</p>
|
<p align="center">qBittorrent</p>
|
||||||
</a>
|
</a>
|
||||||
</td></tr>
|
</td>
|
||||||
<tr><td align="center">
|
<td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/quay" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/quay" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/quay.png" alt="Quay" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/quay.png" alt="Quay" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
@@ -293,15 +300,15 @@
|
|||||||
<br/>
|
<br/>
|
||||||
<p align="center">Tdarr</p>
|
<p align="center">Tdarr</p>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td></tr>
|
||||||
<td align="center">
|
<tr><td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/transmission" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/transmission" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/transmission.svg" alt="Transmission" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/transmission.svg" alt="Transmission" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
<p align="center">Transmission</p>
|
<p align="center">Transmission</p>
|
||||||
</a>
|
</a>
|
||||||
</td></tr>
|
</td>
|
||||||
<tr><td align="center">
|
<td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/truenas" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/truenas" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/truenas.svg" alt="TrueNAS" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/truenas.svg" alt="TrueNAS" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
@@ -314,6 +321,13 @@
|
|||||||
<br/>
|
<br/>
|
||||||
<p align="center">Unifi<br/>Controller</p>
|
<p align="center">Unifi<br/>Controller</p>
|
||||||
</a>
|
</a>
|
||||||
|
</td>
|
||||||
|
<td align="center">
|
||||||
|
<a href="https://homarr.dev/docs/integrations/unraid" target="_blank" rel="noreferrer noopener">
|
||||||
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/unraid.svg" alt="Unraid" width="90" height="90" />
|
||||||
|
<br/>
|
||||||
|
<p align="center">Unraid</p>
|
||||||
|
</a>
|
||||||
</td></tr>
|
</td></tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
+21
-21
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "homarr",
|
"name": "homarr",
|
||||||
"version": "1.47.0",
|
"version": "1.51.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "cross-env CI=true turbo build",
|
"build": "cross-env CI=true turbo build",
|
||||||
@@ -42,27 +42,27 @@
|
|||||||
"@semantic-release/github": "^12.0.2",
|
"@semantic-release/github": "^12.0.2",
|
||||||
"@semantic-release/npm": "^13.1.3",
|
"@semantic-release/npm": "^13.1.3",
|
||||||
"@semantic-release/release-notes-generator": "^14.1.0",
|
"@semantic-release/release-notes-generator": "^14.1.0",
|
||||||
"@testcontainers/redis": "^11.10.0",
|
"@testcontainers/redis": "^11.11.0",
|
||||||
"@turbo/gen": "^2.6.3",
|
"@turbo/gen": "^2.7.5",
|
||||||
"@vitejs/plugin-react": "^5.1.2",
|
"@vitejs/plugin-react": "^5.1.2",
|
||||||
"@vitest/coverage-v8": "^4.0.15",
|
"@vitest/coverage-v8": "^4.0.17",
|
||||||
"@vitest/ui": "^4.0.15",
|
"@vitest/ui": "^4.0.17",
|
||||||
"conventional-changelog-conventionalcommits": "^9.1.0",
|
"conventional-changelog-conventionalcommits": "^9.1.0",
|
||||||
"cross-env": "^10.1.0",
|
"cross-env": "^10.1.0",
|
||||||
"jsdom": "^27.3.0",
|
"jsdom": "^27.4.0",
|
||||||
"json5": "^2.2.3",
|
"json5": "^2.2.3",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.8.0",
|
||||||
"semantic-release": "^25.0.2",
|
"semantic-release": "^25.0.2",
|
||||||
"testcontainers": "^11.10.0",
|
"testcontainers": "^11.11.0",
|
||||||
"turbo": "^2.6.3",
|
"turbo": "^2.7.5",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^5.9.3",
|
||||||
"vite-tsconfig-paths": "^5.1.4",
|
"vite-tsconfig-paths": "^6.0.4",
|
||||||
"vitest": "^4.0.15"
|
"vitest": "^4.0.17"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@10.25.0",
|
"packageManager": "pnpm@10.28.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24.12.0",
|
"node": ">=24.13.0",
|
||||||
"pnpm": ">=10.25.0"
|
"pnpm": ">=10.28.0"
|
||||||
},
|
},
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"onlyBuiltDependencies": [
|
"onlyBuiltDependencies": [
|
||||||
@@ -77,25 +77,25 @@
|
|||||||
"tree-sitter-json"
|
"tree-sitter-json"
|
||||||
],
|
],
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"@babel/helpers@<7.26.10": ">=7.28.4",
|
"@babel/helpers@<7.26.10": ">=7.28.6",
|
||||||
"@babel/runtime@<7.26.10": ">=7.28.4",
|
"@babel/runtime@<7.26.10": ">=7.28.6",
|
||||||
"axios@>=1.0.0 <1.8.2": ">=1.13.2",
|
"axios@>=1.0.0 <1.8.2": ">=1.13.2",
|
||||||
"brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1",
|
"brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1",
|
||||||
"brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1",
|
"brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1",
|
||||||
"esbuild@<=0.24.2": ">=0.27.1",
|
"esbuild@<=0.24.2": ">=0.27.2",
|
||||||
"form-data@>=4.0.0 <4.0.4": ">=4.0.5",
|
"form-data@>=4.0.0 <4.0.4": ">=4.0.5",
|
||||||
"hono@<4.6.5": ">=4.11.0",
|
"hono@<4.6.5": ">=4.11.4",
|
||||||
"linkifyjs@<4.3.2": ">=4.3.2",
|
"linkifyjs@<4.3.2": ">=4.3.2",
|
||||||
"nanoid@>=4.0.0 <5.0.9": ">=5.1.6",
|
"nanoid@>=4.0.0 <5.0.9": ">=5.1.6",
|
||||||
"prismjs@<1.30.0": ">=1.30.0",
|
"prismjs@<1.30.0": ">=1.30.0",
|
||||||
"proxmox-api>undici": "7.16.0",
|
"proxmox-api>undici": "7.18.2",
|
||||||
"react-is": "^19.2.3",
|
"react-is": "^19.2.3",
|
||||||
"rollup@>=4.0.0 <4.22.4": ">=4.53.3",
|
"rollup@>=4.0.0 <4.22.4": ">=4.55.1",
|
||||||
"sha.js@<=2.4.11": ">=2.4.12",
|
"sha.js@<=2.4.11": ">=2.4.12",
|
||||||
"tar-fs@>=3.0.0 <3.0.9": ">=3.1.1",
|
"tar-fs@>=3.0.0 <3.0.9": ">=3.1.1",
|
||||||
"tar-fs@>=2.0.0 <2.1.3": ">=3.1.1",
|
"tar-fs@>=2.0.0 <2.1.3": ">=3.1.1",
|
||||||
"tmp@<=0.2.3": ">=0.2.5",
|
"tmp@<=0.2.3": ">=0.2.5",
|
||||||
"vite@>=5.0.0 <=5.4.18": ">=7.2.7"
|
"vite@>=5.0.0 <=5.4.18": ">=7.3.1"
|
||||||
},
|
},
|
||||||
"patchedDependencies": {
|
"patchedDependencies": {
|
||||||
"@types/node-unifi": "patches/@types__node-unifi.patch",
|
"@types/node-unifi": "patches/@types__node-unifi.patch",
|
||||||
|
|||||||
@@ -41,25 +41,25 @@
|
|||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@kubernetes/client-node": "^1.4.0",
|
"@kubernetes/client-node": "^1.4.0",
|
||||||
"@tanstack/react-query": "^5.90.12",
|
"@tanstack/react-query": "^5.90.19",
|
||||||
"@trpc/client": "^11.8.0",
|
"@trpc/client": "^11.8.1",
|
||||||
"@trpc/react-query": "^11.8.0",
|
"@trpc/react-query": "^11.8.1",
|
||||||
"@trpc/server": "^11.8.0",
|
"@trpc/server": "^11.8.1",
|
||||||
"@trpc/tanstack-react-query": "^11.8.0",
|
"@trpc/tanstack-react-query": "^11.8.1",
|
||||||
"lodash.clonedeep": "^4.5.0",
|
"lodash.clonedeep": "^4.5.0",
|
||||||
"next": "16.0.10",
|
"next": "16.1.3",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3",
|
"react-dom": "19.2.3",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"trpc-to-openapi": "^3.1.0",
|
"trpc-to-openapi": "^3.1.0",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.8.0",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
import { generateOpenApiDocument } from "trpc-to-openapi";
|
import { generateOpenApiDocument } from "trpc-to-openapi";
|
||||||
|
|
||||||
|
import { API_KEY_HEADER_NAME } from "@homarr/auth/api-key";
|
||||||
|
|
||||||
import { appRouter } from "./root";
|
import { appRouter } from "./root";
|
||||||
|
|
||||||
export const openApiDocument = (base: string) =>
|
export const openApiDocument = (base: string) =>
|
||||||
@@ -11,7 +13,7 @@ export const openApiDocument = (base: string) =>
|
|||||||
securitySchemes: {
|
securitySchemes: {
|
||||||
apikey: {
|
apikey: {
|
||||||
type: "apiKey",
|
type: "apiKey",
|
||||||
name: "ApiKey",
|
name: API_KEY_HEADER_NAME,
|
||||||
description: "API key which can be obtained in the Homarr administration dashboard",
|
description: "API key which can be obtained in the Homarr administration dashboard",
|
||||||
in: "header",
|
in: "header",
|
||||||
},
|
},
|
||||||
|
|||||||
+26
-48
@@ -1,54 +1,32 @@
|
|||||||
import { apiKeysRouter } from "./router/apiKeys";
|
import { lazy } from "@trpc/server";
|
||||||
import { appRouter as innerAppRouter } from "./router/app";
|
|
||||||
import { boardRouter } from "./router/board";
|
|
||||||
import { certificateRouter } from "./router/certificates/certificate-router";
|
|
||||||
import { cronJobsRouter } from "./router/cron-jobs";
|
|
||||||
import { dockerRouter } from "./router/docker/docker-router";
|
|
||||||
import { groupRouter } from "./router/group";
|
|
||||||
import { homeRouter } from "./router/home";
|
|
||||||
import { iconsRouter } from "./router/icons";
|
|
||||||
import { importRouter } from "./router/import/import-router";
|
|
||||||
import { infoRouter } from "./router/info";
|
|
||||||
import { integrationRouter } from "./router/integration/integration-router";
|
|
||||||
import { inviteRouter } from "./router/invite";
|
|
||||||
import { kubernetesRouter } from "./router/kubernetes/router/kubernetes-router";
|
|
||||||
import { locationRouter } from "./router/location";
|
|
||||||
import { logRouter } from "./router/log";
|
|
||||||
import { mediaRouter } from "./router/medias/media-router";
|
|
||||||
import { onboardRouter } from "./router/onboard/onboard-router";
|
|
||||||
import { searchEngineRouter } from "./router/search-engine/search-engine-router";
|
|
||||||
import { sectionRouter } from "./router/section/section-router";
|
|
||||||
import { serverSettingsRouter } from "./router/serverSettings";
|
|
||||||
import { updateCheckerRouter } from "./router/update-checker";
|
|
||||||
import { userRouter } from "./router/user";
|
|
||||||
import { widgetRouter } from "./router/widgets";
|
|
||||||
import { createTRPCRouter } from "./trpc";
|
import { createTRPCRouter } from "./trpc";
|
||||||
|
|
||||||
export const appRouter = createTRPCRouter({
|
export const appRouter = createTRPCRouter({
|
||||||
user: userRouter,
|
user: lazy(() => import("./router/user").then((mod) => mod.userRouter)),
|
||||||
group: groupRouter,
|
group: lazy(() => import("./router/group").then((mod) => mod.groupRouter)),
|
||||||
invite: inviteRouter,
|
invite: lazy(() => import("./router/invite").then((mod) => mod.inviteRouter)),
|
||||||
integration: integrationRouter,
|
integration: lazy(() => import("./router/integration/integration-router").then((mod) => mod.integrationRouter)),
|
||||||
board: boardRouter,
|
board: lazy(() => import("./router/board").then((mod) => mod.boardRouter)),
|
||||||
section: sectionRouter,
|
section: lazy(() => import("./router/section/section-router").then((mod) => mod.sectionRouter)),
|
||||||
app: innerAppRouter,
|
app: lazy(() => import("./router/app").then((mod) => mod.appRouter)),
|
||||||
searchEngine: searchEngineRouter,
|
searchEngine: lazy(() => import("./router/search-engine/search-engine-router").then((mod) => mod.searchEngineRouter)),
|
||||||
widget: widgetRouter,
|
widget: lazy(() => import("./router/widgets").then((mod) => mod.widgetRouter)),
|
||||||
location: locationRouter,
|
location: lazy(() => import("./router/location").then((mod) => mod.locationRouter)),
|
||||||
log: logRouter,
|
log: lazy(() => import("./router/log").then((mod) => mod.logRouter)),
|
||||||
icon: iconsRouter,
|
icon: lazy(() => import("./router/icons").then((mod) => mod.iconsRouter)),
|
||||||
import: importRouter,
|
import: lazy(() => import("./router/import/import-router").then((mod) => mod.importRouter)),
|
||||||
onboard: onboardRouter,
|
onboard: lazy(() => import("./router/onboard/onboard-router").then((mod) => mod.onboardRouter)),
|
||||||
home: homeRouter,
|
home: lazy(() => import("./router/home").then((mod) => mod.homeRouter)),
|
||||||
docker: dockerRouter,
|
docker: lazy(() => import("./router/docker/docker-router").then((mod) => mod.dockerRouter)),
|
||||||
kubernetes: kubernetesRouter,
|
kubernetes: lazy(() => import("./router/kubernetes/router/kubernetes-router").then((mod) => mod.kubernetesRouter)),
|
||||||
serverSettings: serverSettingsRouter,
|
serverSettings: lazy(() => import("./router/serverSettings").then((mod) => mod.serverSettingsRouter)),
|
||||||
cronJobs: cronJobsRouter,
|
cronJobs: lazy(() => import("./router/cron-jobs").then((mod) => mod.cronJobsRouter)),
|
||||||
apiKeys: apiKeysRouter,
|
apiKeys: lazy(() => import("./router/apiKeys").then((mod) => mod.apiKeysRouter)),
|
||||||
media: mediaRouter,
|
media: lazy(() => import("./router/medias/media-router").then((mod) => mod.mediaRouter)),
|
||||||
updateChecker: updateCheckerRouter,
|
updateChecker: lazy(() => import("./router/update-checker").then((mod) => mod.updateCheckerRouter)),
|
||||||
certificates: certificateRouter,
|
certificates: lazy(() => import("./router/certificates/certificate-router").then((mod) => mod.certificateRouter)),
|
||||||
info: infoRouter,
|
info: lazy(() => import("./router/info").then((mod) => mod.infoRouter)),
|
||||||
});
|
});
|
||||||
|
|
||||||
// export type definition of API
|
// export type definition of API
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export const apiKeysRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -155,6 +155,7 @@ export const boardRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
userPermissions: {
|
userPermissions: {
|
||||||
@@ -1195,6 +1196,7 @@ export const boardRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -1537,6 +1539,7 @@ const getFullBoardWithWhereAsync = async (db: Database, where: SQL<unknown>, use
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
|
|||||||
@@ -476,6 +476,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,22 +1,15 @@
|
|||||||
|
import { lazy } from "@trpc/server";
|
||||||
|
|
||||||
import { createTRPCRouter } from "../../../trpc";
|
import { createTRPCRouter } from "../../../trpc";
|
||||||
import { clusterRouter } from "./cluster";
|
|
||||||
import { configMapsRouter } from "./configMaps";
|
|
||||||
import { ingressesRouter } from "./ingresses";
|
|
||||||
import { namespacesRouter } from "./namespaces";
|
|
||||||
import { nodesRouter } from "./nodes";
|
|
||||||
import { podsRouter } from "./pods";
|
|
||||||
import { secretsRouter } from "./secrets";
|
|
||||||
import { servicesRouter } from "./services";
|
|
||||||
import { volumesRouter } from "./volumes";
|
|
||||||
|
|
||||||
export const kubernetesRouter = createTRPCRouter({
|
export const kubernetesRouter = createTRPCRouter({
|
||||||
nodes: nodesRouter,
|
nodes: lazy(() => import("./nodes").then((mod) => mod.nodesRouter)),
|
||||||
cluster: clusterRouter,
|
cluster: lazy(() => import("./cluster").then((mod) => mod.clusterRouter)),
|
||||||
namespaces: namespacesRouter,
|
namespaces: lazy(() => import("./namespaces").then((mod) => mod.namespacesRouter)),
|
||||||
ingresses: ingressesRouter,
|
ingresses: lazy(() => import("./ingresses").then((mod) => mod.ingressesRouter)),
|
||||||
services: servicesRouter,
|
services: lazy(() => import("./services").then((mod) => mod.servicesRouter)),
|
||||||
pods: podsRouter,
|
pods: lazy(() => import("./pods").then((mod) => mod.podsRouter)),
|
||||||
secrets: secretsRouter,
|
secrets: lazy(() => import("./secrets").then((mod) => mod.secretsRouter)),
|
||||||
configMaps: configMapsRouter,
|
configMaps: lazy(() => import("./configMaps").then((mod) => mod.configMapsRouter)),
|
||||||
volumes: volumesRouter,
|
volumes: lazy(() => import("./volumes").then((mod) => mod.volumesRouter)),
|
||||||
});
|
});
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { fetchWithTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
||||||
|
|
||||||
import { createTRPCRouter, publicProcedure } from "../trpc";
|
import { createTRPCRouter, publicProcedure } from "../trpc";
|
||||||
|
|
||||||
@@ -36,7 +37,12 @@ export const locationRouter = createTRPCRouter({
|
|||||||
.input(locationSearchCityInput)
|
.input(locationSearchCityInput)
|
||||||
.output(locationSearchCityOutput)
|
.output(locationSearchCityOutput)
|
||||||
.query(async ({ input }) => {
|
.query(async ({ input }) => {
|
||||||
const res = await fetchWithTimeoutAsync(`https://geocoding-api.open-meteo.com/v1/search?name=${input.query}`);
|
const res = await withTimeoutAsync(async (signal) => {
|
||||||
|
return await fetchWithTrustedCertificatesAsync(
|
||||||
|
`https://geocoding-api.open-meteo.com/v1/search?name=${input.query}`,
|
||||||
|
{ signal },
|
||||||
|
);
|
||||||
|
});
|
||||||
return (await res.json()) as z.infer<typeof locationSearchCityOutput>;
|
return (await res.json()) as z.infer<typeof locationSearchCityOutput>;
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
@@ -39,6 +39,7 @@ export const mediaRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1220,11 +1220,11 @@ describe("getBoardPermissions should return board permissions", () => {
|
|||||||
expect(result.users).toEqual(
|
expect(result.users).toEqual(
|
||||||
expect.arrayContaining([
|
expect.arrayContaining([
|
||||||
{
|
{
|
||||||
user: { id: user1, name: null, image: null },
|
user: { id: user1, name: null, image: null, email: null },
|
||||||
permission: "view",
|
permission: "view",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
user: { id: user2, name: null, image: null },
|
user: { id: user2, name: null, image: null, email: null },
|
||||||
permission: "modify",
|
permission: "modify",
|
||||||
},
|
},
|
||||||
]),
|
]),
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
// Is protected because also used in board access / integration access forms
|
// Is protected because also used in board access / integration access forms
|
||||||
selectable: protectedProcedure
|
selectable: protectedProcedure
|
||||||
.input(z.object({ excludeExternalProviders: z.boolean().default(false) }).optional())
|
.input(z.object({ excludeExternalProviders: z.boolean().default(false) }).optional())
|
||||||
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true })))
|
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true, email: true })))
|
||||||
.meta({ openapi: { method: "GET", path: "/api/users/selectable", tags: ["users"], protect: true } })
|
.meta({ openapi: { method: "GET", path: "/api/users/selectable", tags: ["users"], protect: true } })
|
||||||
.query(({ ctx, input }) => {
|
.query(({ ctx, input }) => {
|
||||||
return ctx.db.query.users.findMany({
|
return ctx.db.query.users.findMany({
|
||||||
@@ -182,6 +182,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
where: input?.excludeExternalProviders ? eq(users.provider, "credentials") : undefined,
|
where: input?.excludeExternalProviders ? eq(users.provider, "credentials") : undefined,
|
||||||
});
|
});
|
||||||
@@ -194,7 +195,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
limit: z.number().min(1).max(100).default(10),
|
limit: z.number().min(1).max(100).default(10),
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true })))
|
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true, email: true })))
|
||||||
.meta({ openapi: { method: "POST", path: "/api/users/search", tags: ["users"], protect: true } })
|
.meta({ openapi: { method: "POST", path: "/api/users/search", tags: ["users"], protect: true } })
|
||||||
.query(async ({ input, ctx }) => {
|
.query(async ({ input, ctx }) => {
|
||||||
const dbUsers = await ctx.db.query.users.findMany({
|
const dbUsers = await ctx.db.query.users.findMany({
|
||||||
@@ -202,6 +203,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
where: like(users.name, `%${input.query}%`),
|
where: like(users.name, `%${input.query}%`),
|
||||||
limit: input.limit,
|
limit: input.limit,
|
||||||
@@ -210,6 +212,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
id: user.id,
|
id: user.id,
|
||||||
name: user.name ?? "",
|
name: user.name ?? "",
|
||||||
image: user.image,
|
image: user.image,
|
||||||
|
email: user.email,
|
||||||
}));
|
}));
|
||||||
}),
|
}),
|
||||||
getById: protectedProcedure
|
getById: protectedProcedure
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import { observable } from "@trpc/server/observable";
|
||||||
|
|
||||||
|
import type { CoolifyInstanceInfo } from "@homarr/integrations/types";
|
||||||
|
import { coolifyRequestHandler } from "@homarr/request-handler/coolify";
|
||||||
|
|
||||||
|
import { createManyIntegrationMiddleware } from "../../middlewares/integration";
|
||||||
|
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
||||||
|
|
||||||
|
export const coolifyRouter = createTRPCRouter({
|
||||||
|
getInstancesInfo: publicProcedure
|
||||||
|
.concat(createManyIntegrationMiddleware("query", "coolify"))
|
||||||
|
.query(async ({ ctx }) => {
|
||||||
|
const results = await Promise.all(
|
||||||
|
ctx.integrations.map(async (integration) => {
|
||||||
|
const innerHandler = coolifyRequestHandler.handler(integration, {});
|
||||||
|
const { data, timestamp } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
|
||||||
|
|
||||||
|
return {
|
||||||
|
integrationId: integration.id,
|
||||||
|
integrationName: integration.name,
|
||||||
|
integrationUrl: integration.url,
|
||||||
|
instanceInfo: data,
|
||||||
|
updatedAt: timestamp,
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}),
|
||||||
|
subscribeInstancesInfo: publicProcedure
|
||||||
|
.concat(createManyIntegrationMiddleware("query", "coolify"))
|
||||||
|
.subscription(({ ctx }) => {
|
||||||
|
return observable<{ integrationId: string; instanceInfo: CoolifyInstanceInfo; timestamp: Date }>((emit) => {
|
||||||
|
const unsubscribes = ctx.integrations.map((integration) => {
|
||||||
|
const innerHandler = coolifyRequestHandler.handler(integration, {});
|
||||||
|
return innerHandler.subscribe((instanceInfo) => {
|
||||||
|
emit.next({
|
||||||
|
integrationId: integration.id,
|
||||||
|
instanceInfo,
|
||||||
|
timestamp: new Date(),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
unsubscribes.forEach((unsubscribe) => unsubscribe());
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
});
|
||||||
@@ -9,7 +9,7 @@ import { createTRPCRouter, publicProcedure } from "../../trpc";
|
|||||||
|
|
||||||
export const healthMonitoringRouter = createTRPCRouter({
|
export const healthMonitoringRouter = createTRPCRouter({
|
||||||
getSystemHealthStatus: publicProcedure
|
getSystemHealthStatus: publicProcedure
|
||||||
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "mock"))
|
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "unraid", "mock"))
|
||||||
.query(async ({ ctx }) => {
|
.query(async ({ ctx }) => {
|
||||||
return await Promise.all(
|
return await Promise.all(
|
||||||
ctx.integrations.map(async (integration) => {
|
ctx.integrations.map(async (integration) => {
|
||||||
@@ -26,7 +26,7 @@ export const healthMonitoringRouter = createTRPCRouter({
|
|||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
subscribeSystemHealthStatus: publicProcedure
|
subscribeSystemHealthStatus: publicProcedure
|
||||||
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "mock"))
|
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "unraid", "mock"))
|
||||||
.subscription(({ ctx }) => {
|
.subscription(({ ctx }) => {
|
||||||
return observable<{ integrationId: string; healthInfo: SystemHealthMonitoring; timestamp: Date }>((emit) => {
|
return observable<{ integrationId: string; healthInfo: SystemHealthMonitoring; timestamp: Date }>((emit) => {
|
||||||
const unsubscribes: (() => void)[] = [];
|
const unsubscribes: (() => void)[] = [];
|
||||||
|
|||||||
@@ -1,46 +1,28 @@
|
|||||||
|
import { lazy } from "@trpc/server";
|
||||||
|
|
||||||
import { createTRPCRouter } from "../../trpc";
|
import { createTRPCRouter } from "../../trpc";
|
||||||
import { appRouter } from "./app";
|
|
||||||
import { calendarRouter } from "./calendar";
|
|
||||||
import { dnsHoleRouter } from "./dns-hole";
|
|
||||||
import { downloadsRouter } from "./downloads";
|
|
||||||
import { firewallRouter } from "./firewall";
|
|
||||||
import { healthMonitoringRouter } from "./health-monitoring";
|
|
||||||
import { indexerManagerRouter } from "./indexer-manager";
|
|
||||||
import { mediaReleaseRouter } from "./media-release";
|
|
||||||
import { mediaRequestsRouter } from "./media-requests";
|
|
||||||
import { mediaServerRouter } from "./media-server";
|
|
||||||
import { mediaTranscodingRouter } from "./media-transcoding";
|
|
||||||
import { minecraftRouter } from "./minecraft";
|
|
||||||
import { networkControllerRouter } from "./network-controller";
|
|
||||||
import { notebookRouter } from "./notebook";
|
|
||||||
import { notificationsRouter } from "./notifications";
|
|
||||||
import { optionsRouter } from "./options";
|
|
||||||
import { releasesRouter } from "./releases";
|
|
||||||
import { rssFeedRouter } from "./rssFeed";
|
|
||||||
import { smartHomeRouter } from "./smart-home";
|
|
||||||
import { stockPriceRouter } from "./stocks";
|
|
||||||
import { weatherRouter } from "./weather";
|
|
||||||
|
|
||||||
export const widgetRouter = createTRPCRouter({
|
export const widgetRouter = createTRPCRouter({
|
||||||
notebook: notebookRouter,
|
coolify: lazy(() => import("./coolify").then((mod) => mod.coolifyRouter)),
|
||||||
weather: weatherRouter,
|
notebook: lazy(() => import("./notebook").then((mod) => mod.notebookRouter)),
|
||||||
app: appRouter,
|
weather: lazy(() => import("./weather").then((mod) => mod.weatherRouter)),
|
||||||
dnsHole: dnsHoleRouter,
|
app: lazy(() => import("./app").then((mod) => mod.appRouter)),
|
||||||
smartHome: smartHomeRouter,
|
dnsHole: lazy(() => import("./dns-hole").then((mod) => mod.dnsHoleRouter)),
|
||||||
stockPrice: stockPriceRouter,
|
smartHome: lazy(() => import("./smart-home").then((mod) => mod.smartHomeRouter)),
|
||||||
mediaServer: mediaServerRouter,
|
stockPrice: lazy(() => import("./stocks").then((mod) => mod.stockPriceRouter)),
|
||||||
mediaRelease: mediaReleaseRouter,
|
mediaServer: lazy(() => import("./media-server").then((mod) => mod.mediaServerRouter)),
|
||||||
calendar: calendarRouter,
|
mediaRelease: lazy(() => import("./media-release").then((mod) => mod.mediaReleaseRouter)),
|
||||||
downloads: downloadsRouter,
|
calendar: lazy(() => import("./calendar").then((mod) => mod.calendarRouter)),
|
||||||
mediaRequests: mediaRequestsRouter,
|
downloads: lazy(() => import("./downloads").then((mod) => mod.downloadsRouter)),
|
||||||
rssFeed: rssFeedRouter,
|
mediaRequests: lazy(() => import("./media-requests").then((mod) => mod.mediaRequestsRouter)),
|
||||||
indexerManager: indexerManagerRouter,
|
rssFeed: lazy(() => import("./rssFeed").then((mod) => mod.rssFeedRouter)),
|
||||||
healthMonitoring: healthMonitoringRouter,
|
indexerManager: lazy(() => import("./indexer-manager").then((mod) => mod.indexerManagerRouter)),
|
||||||
mediaTranscoding: mediaTranscodingRouter,
|
healthMonitoring: lazy(() => import("./health-monitoring").then((mod) => mod.healthMonitoringRouter)),
|
||||||
minecraft: minecraftRouter,
|
mediaTranscoding: lazy(() => import("./media-transcoding").then((mod) => mod.mediaTranscodingRouter)),
|
||||||
options: optionsRouter,
|
minecraft: lazy(() => import("./minecraft").then((mod) => mod.minecraftRouter)),
|
||||||
releases: releasesRouter,
|
options: lazy(() => import("./options").then((mod) => mod.optionsRouter)),
|
||||||
networkController: networkControllerRouter,
|
releases: lazy(() => import("./releases").then((mod) => mod.releasesRouter)),
|
||||||
firewall: firewallRouter,
|
networkController: lazy(() => import("./network-controller").then((mod) => mod.networkControllerRouter)),
|
||||||
notifications: notificationsRouter,
|
firewall: lazy(() => import("./firewall").then((mod) => mod.firewallRouter)),
|
||||||
|
notifications: lazy(() => import("./notifications").then((mod) => mod.notificationsRouter)),
|
||||||
});
|
});
|
||||||
@@ -24,7 +24,7 @@ export const notebookRouter = createTRPCRouter({
|
|||||||
where: eq(items.id, input.itemId),
|
where: eq(items.id, input.itemId),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!item || item.boardId !== input.boardId) {
|
if (item?.boardId !== input.boardId) {
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "NOT_FOUND",
|
code: "NOT_FOUND",
|
||||||
message: "Specified item was not found",
|
message: "Specified item was not found",
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
export const API_KEY_HEADER_NAME = "ApiKey";
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import type { Session } from "next-auth";
|
||||||
|
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
import type { Database } from "@homarr/db";
|
||||||
|
import { eq } from "@homarr/db";
|
||||||
|
import { apiKeys } from "@homarr/db/schema";
|
||||||
|
|
||||||
|
import { hashPasswordAsync } from "../security";
|
||||||
|
import { createSessionAsync } from "../server";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "apiKeyAuth" });
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validate an API key from the request header and return a session if valid.
|
||||||
|
*
|
||||||
|
* @param db - The database instance
|
||||||
|
* @param apiKeyHeaderValue - The value of the ApiKey header (format: "id.token")
|
||||||
|
* @param ipAddress - The IP address of the request (for logging)
|
||||||
|
* @param userAgent - The user agent of the request (for logging)
|
||||||
|
* @returns A session if the API key is valid, null otherwise
|
||||||
|
*/
|
||||||
|
export const getSessionFromApiKeyAsync = async (
|
||||||
|
db: Database,
|
||||||
|
apiKeyHeaderValue: string | null,
|
||||||
|
ipAddress: string | null,
|
||||||
|
userAgent: string,
|
||||||
|
): Promise<Session | null> => {
|
||||||
|
if (apiKeyHeaderValue === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const [apiKeyId, apiKey] = apiKeyHeaderValue.split(".");
|
||||||
|
|
||||||
|
if (!apiKeyId || !apiKey) {
|
||||||
|
logger.warn("Failed to authenticate with api-key", { ipAddress, userAgent, reason: "API_KEY_INVALID_FORMAT" });
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const apiKeyFromDb = await db.query.apiKeys.findFirst({
|
||||||
|
where: eq(apiKeys.id, apiKeyId),
|
||||||
|
columns: {
|
||||||
|
id: true,
|
||||||
|
apiKey: true,
|
||||||
|
salt: true,
|
||||||
|
},
|
||||||
|
with: {
|
||||||
|
user: {
|
||||||
|
columns: {
|
||||||
|
id: true,
|
||||||
|
name: true,
|
||||||
|
email: true,
|
||||||
|
emailVerified: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!apiKeyFromDb) {
|
||||||
|
logger.warn("Failed to authenticate with api-key", { ipAddress, userAgent, reason: "API_KEY_NOT_FOUND" });
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const hashedApiKey = await hashPasswordAsync(apiKey, apiKeyFromDb.salt);
|
||||||
|
|
||||||
|
if (apiKeyFromDb.apiKey !== hashedApiKey) {
|
||||||
|
logger.warn("Failed to authenticate with api-key", { ipAddress, userAgent, reason: "API_KEY_MISMATCH" });
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info("Successfully authenticated with api-key", {
|
||||||
|
name: apiKeyFromDb.user.name,
|
||||||
|
id: apiKeyFromDb.user.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
return await createSessionAsync(db, apiKeyFromDb.user);
|
||||||
|
};
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
export { getSessionFromApiKeyAsync } from "./get-api-key-session";
|
||||||
|
export { API_KEY_HEADER_NAME } from "./constants";
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||||
|
import { describe, expect, test, vi } from "vitest";
|
||||||
|
|
||||||
|
import { createId } from "@homarr/common";
|
||||||
|
import { apiKeys, users } from "@homarr/db/schema";
|
||||||
|
import { createDb } from "@homarr/db/test";
|
||||||
|
|
||||||
|
import { createSaltAsync, hashPasswordAsync } from "../../security";
|
||||||
|
import { getSessionFromApiKeyAsync } from "../get-api-key-session";
|
||||||
|
|
||||||
|
// Mock the logger to avoid console output during tests
|
||||||
|
vi.mock("@homarr/core/infrastructure/logs", () => ({
|
||||||
|
createLogger: () => ({
|
||||||
|
warn: vi.fn(),
|
||||||
|
info: vi.fn(),
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const defaultUserId = createId();
|
||||||
|
const defaultUsername = "testuser";
|
||||||
|
const defaultApiKeyId = createId();
|
||||||
|
const defaultIpAddress = "127.0.0.1";
|
||||||
|
const defaultUserAgent = "test-agent";
|
||||||
|
const defaultLogParams = [defaultIpAddress, defaultUserAgent] as const;
|
||||||
|
|
||||||
|
describe("getSessionFromApiKeyAsync", () => {
|
||||||
|
test("should return null when api key header is null", async () => {
|
||||||
|
// Arrange
|
||||||
|
const { db } = await setupAsync();
|
||||||
|
const apiKey = null;
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const result = await getSessionFromApiKeyAsync(db, apiKey, ...defaultLogParams);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expect(result).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test.each([
|
||||||
|
["invalidformat", "no dot"],
|
||||||
|
["keyid.", "missing token"],
|
||||||
|
[".token", "missing id"],
|
||||||
|
])("should return null when api key format is invalid key=%s reason=%s", async (apiKey) => {
|
||||||
|
// Arrange
|
||||||
|
const { db } = await setupAsync();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const result = await getSessionFromApiKeyAsync(db, apiKey, ...defaultLogParams);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expect(result).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("should return null when api key is not found in database", async () => {
|
||||||
|
// Arrange
|
||||||
|
const { db } = await setupAsync();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const result = await getSessionFromApiKeyAsync(db, "nonexistent.token", ...defaultLogParams);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expect(result).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("should return null when api key token does not match", async () => {
|
||||||
|
// Arrange
|
||||||
|
const { db } = await setupAsync({ token: "correcttoken" });
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const result = await getSessionFromApiKeyAsync(db, `${defaultApiKeyId}.wrongtoken`, ...defaultLogParams);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expect(result).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("should return session when api key is valid", async () => {
|
||||||
|
// Arrange
|
||||||
|
const token = "validtesttoken123";
|
||||||
|
const { db } = await setupAsync({ token });
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const result = await getSessionFromApiKeyAsync(db, `${defaultApiKeyId}.${token}`, ...defaultLogParams);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expect(result).not.toBeNull();
|
||||||
|
expect(result!.user.id).toEqual(defaultUserId);
|
||||||
|
expect(result!.user.name).toEqual(defaultUsername);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("should work with null ip address", async () => {
|
||||||
|
// Arrange
|
||||||
|
const token = "validtesttoken456";
|
||||||
|
const { db } = await setupAsync({ token });
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const result = await getSessionFromApiKeyAsync(db, `${defaultApiKeyId}.${token}`, null, defaultUserAgent);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expect(result).not.toBeNull();
|
||||||
|
expect(result!.user.id).toEqual(defaultUserId);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
interface SetupOptions {
|
||||||
|
/**
|
||||||
|
* If provided, inserts an API key into the database for testing.
|
||||||
|
*/
|
||||||
|
token?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const setupAsync = async (options?: SetupOptions) => {
|
||||||
|
const db = createDb();
|
||||||
|
|
||||||
|
await db.insert(users).values({
|
||||||
|
id: defaultUserId,
|
||||||
|
name: defaultUsername,
|
||||||
|
email: "test@example.com",
|
||||||
|
});
|
||||||
|
|
||||||
|
if (options?.token) {
|
||||||
|
const salt = await createSaltAsync();
|
||||||
|
await db.insert(apiKeys).values({
|
||||||
|
id: defaultApiKeyId,
|
||||||
|
apiKey: await hashPasswordAsync(options.token, salt),
|
||||||
|
salt,
|
||||||
|
userId: defaultUserId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
db,
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
".": "./index.ts",
|
".": "./index.ts",
|
||||||
"./next": "./next.ts",
|
"./next": "./next.ts",
|
||||||
"./security": "./security.ts",
|
"./security": "./security.ts",
|
||||||
|
"./api-key": "./api-key/index.ts",
|
||||||
"./client": "./client.ts",
|
"./client": "./client.ts",
|
||||||
"./server": "./server.ts",
|
"./server": "./server.ts",
|
||||||
"./shared": "./shared.ts",
|
"./shared": "./shared.ts",
|
||||||
@@ -32,12 +33,12 @@
|
|||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"bcrypt": "^6.0.0",
|
"bcrypt": "^6.0.0",
|
||||||
"cookies": "^0.9.1",
|
"cookies": "^0.9.1",
|
||||||
"ldapts": "8.0.23",
|
"ldapts": "8.1.3",
|
||||||
"next": "16.0.10",
|
"next": "16.1.3",
|
||||||
"next-auth": "5.0.0-beta.30",
|
"next-auth": "5.0.0-beta.30",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3",
|
"react-dom": "19.2.3",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
@@ -46,7 +47,7 @@
|
|||||||
"@types/bcrypt": "6.0.0",
|
"@types/bcrypt": "6.0.0",
|
||||||
"@types/cookies": "0.9.2",
|
"@types/cookies": "0.9.2",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.8.0",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"esbuild": "^0.27.1",
|
"esbuild": "^0.27.2",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,12 +29,12 @@
|
|||||||
"@homarr/core": "workspace:^0.1.0",
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"@paralleldrive/cuid2": "^3.1.0",
|
"@paralleldrive/cuid2": "^3.1.0",
|
||||||
"dayjs": "^1.11.19",
|
"dayjs": "^1.11.19",
|
||||||
"next": "16.0.10",
|
"next": "16.1.3",
|
||||||
"octokit": "^5.0.5",
|
"octokit": "^5.0.5",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3",
|
"react-dom": "19.2.3",
|
||||||
"undici": "7.16.0",
|
"undici": "7.18.2",
|
||||||
"zod": "^4.1.13",
|
"zod": "^4.2.1",
|
||||||
"zod-validation-error": "^5.0.0"
|
"zod-validation-error": "^5.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -9,3 +9,7 @@ export const userAgent = (headers: Headers) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export type DeviceType = "console" | "mobile" | "tablet" | "smarttv" | "wearable" | "embedded" | undefined;
|
export type DeviceType = "console" | "mobile" | "tablet" | "smarttv" | "wearable" | "embedded" | undefined;
|
||||||
|
|
||||||
|
export const ipAddressFromHeaders = (headers: Headers): string | null => {
|
||||||
|
return headers.get("x-forwarded-for");
|
||||||
|
};
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
export * from "./security";
|
export * from "./security";
|
||||||
export * from "./encryption";
|
export * from "./encryption";
|
||||||
export * from "./user-agent";
|
export * from "./request";
|
||||||
export * from "./errors";
|
export * from "./errors";
|
||||||
@@ -37,16 +37,16 @@
|
|||||||
},
|
},
|
||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@t3-oss/env-nextjs": "^0.13.8",
|
"@t3-oss/env-nextjs": "^0.13.10",
|
||||||
"better-sqlite3": "^12.5.0",
|
"better-sqlite3": "^12.6.2",
|
||||||
"dns-caching": "^0.2.9",
|
"dns-caching": "^0.2.9",
|
||||||
"drizzle-orm": "^0.45.1",
|
"drizzle-orm": "^0.45.1",
|
||||||
"ioredis": "5.8.2",
|
"ioredis": "5.9.2",
|
||||||
"mysql2": "3.15.3",
|
"mysql2": "3.16.1",
|
||||||
"pg": "^8.16.3",
|
"pg": "^8.17.1",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"winston": "3.19.0",
|
"winston": "3.19.0",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -26,7 +26,9 @@ const createMysqlDbConnection = () => {
|
|||||||
|
|
||||||
return mysql.createPool({
|
return mysql.createPool({
|
||||||
...defaultOptions,
|
...defaultOptions,
|
||||||
|
host: dbEnv.HOST,
|
||||||
port: dbEnv.PORT,
|
port: dbEnv.PORT,
|
||||||
|
database: dbEnv.NAME,
|
||||||
user: dbEnv.USER,
|
user: dbEnv.USER,
|
||||||
password: dbEnv.PASSWORD,
|
password: dbEnv.PASSWORD,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { createBooleanSchema, createEnv } from "../env";
|
|||||||
|
|
||||||
export const dnsEnv = createEnv({
|
export const dnsEnv = createEnv({
|
||||||
server: {
|
server: {
|
||||||
ENABLE_DNS_CACHING: createBooleanSchema(false),
|
ENABLE_DNS_CACHING: createBooleanSchema(true),
|
||||||
},
|
},
|
||||||
experimental__runtimeEnv: process.env,
|
experimental__runtimeEnv: process.env,
|
||||||
});
|
});
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { Dispatcher } from "undici";
|
import type { Dispatcher } from "undici";
|
||||||
import { Agent } from "undici";
|
import { EnvHttpProxyAgent } from "undici";
|
||||||
|
|
||||||
import type { ILogger } from "@homarr/core/infrastructure/logs";
|
import type { ILogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
@@ -7,16 +7,15 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
|
|||||||
// The below import statement initializes dns-caching
|
// The below import statement initializes dns-caching
|
||||||
import "@homarr/core/infrastructure/dns/init";
|
import "@homarr/core/infrastructure/dns/init";
|
||||||
|
|
||||||
interface HttpAgentOptions extends Agent.Options {
|
interface HttpAgentOptions extends EnvHttpProxyAgent.Options {
|
||||||
logger?: ILogger;
|
logger?: ILogger;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UndiciHttpAgent extends Agent {
|
export class UndiciHttpAgent extends EnvHttpProxyAgent {
|
||||||
private logger: ILogger;
|
private logger: ILogger;
|
||||||
|
|
||||||
constructor(props?: HttpAgentOptions) {
|
constructor(props?: HttpAgentOptions) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
this.logger = props?.logger ?? createLogger({ module: "httpAgent" });
|
this.logger = props?.logger ?? createLogger({ module: "httpAgent" });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,12 +42,13 @@ export const createCertificateAgentAsync = async (override?: {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const createHttpsAgentAsync = async (override?: Pick<AgentOptions, "ca" | "checkServerIdentity">) => {
|
export const createHttpsAgentAsync = async (override?: Pick<AgentOptions, "ca" | "checkServerIdentity">) => {
|
||||||
return new HttpsAgent(
|
return new HttpsAgent({
|
||||||
override ?? {
|
ca: await getAllTrustedCertificatesAsync(),
|
||||||
ca: await getAllTrustedCertificatesAsync(),
|
checkServerIdentity: createCustomCheckServerIdentity(await getTrustedCertificateHostnamesAsync()),
|
||||||
checkServerIdentity: createCustomCheckServerIdentity(await getTrustedCertificateHostnamesAsync()),
|
// Override the ca and checkServerIdentity if provided
|
||||||
},
|
...override,
|
||||||
);
|
proxyEnv: process.env,
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const createAxiosCertificateInstanceAsync = async (
|
export const createAxiosCertificateInstanceAsync = async (
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { TestLogger } from "../logs";
|
|||||||
|
|
||||||
vi.mock("undici", () => {
|
vi.mock("undici", () => {
|
||||||
return {
|
return {
|
||||||
Agent: class Agent {
|
EnvHttpProxyAgent: class EnvHttpProxyAgent {
|
||||||
dispatch(_options: Dispatcher.DispatchOptions, _handler: Dispatcher.DispatchHandler): boolean {
|
dispatch(_options: Dispatcher.DispatchOptions, _handler: Dispatcher.DispatchHandler): boolean {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,20 +28,20 @@
|
|||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/core": "workspace:^0.1.0",
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"@homarr/cron-jobs": "workspace:^0.1.0",
|
"@homarr/cron-jobs": "workspace:^0.1.0",
|
||||||
"@tanstack/react-query": "^5.90.12",
|
"@tanstack/react-query": "^5.90.19",
|
||||||
"@trpc/client": "^11.8.0",
|
"@trpc/client": "^11.8.1",
|
||||||
"@trpc/server": "^11.8.0",
|
"@trpc/server": "^11.8.1",
|
||||||
"@trpc/tanstack-react-query": "^11.8.0",
|
"@trpc/tanstack-react-query": "^11.8.1",
|
||||||
"node-cron": "^4.2.1",
|
"node-cron": "^4.2.1",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/node-cron": "^3.0.11",
|
"@types/node-cron": "^3.0.11",
|
||||||
"@types/react": "19.2.7",
|
"@types/react": "19.2.8",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { EVERY_5_SECONDS } from "@homarr/cron-jobs-core/expressions";
|
import { EVERY_5_SECONDS } from "@homarr/cron-jobs-core/expressions";
|
||||||
|
import { coolifyRequestHandler } from "@homarr/request-handler/coolify";
|
||||||
import { clusterInfoRequestHandler, systemInfoRequestHandler } from "@homarr/request-handler/health-monitoring";
|
import { clusterInfoRequestHandler, systemInfoRequestHandler } from "@homarr/request-handler/health-monitoring";
|
||||||
import { createRequestIntegrationJobHandler } from "@homarr/request-handler/lib/cached-request-integration-job-handler";
|
import { createRequestIntegrationJobHandler } from "@homarr/request-handler/lib/cached-request-integration-job-handler";
|
||||||
|
|
||||||
@@ -9,16 +10,20 @@ export const healthMonitoringJob = createCronJob("healthMonitoring", EVERY_5_SEC
|
|||||||
(integration, itemOptions: Record<string, never>) => {
|
(integration, itemOptions: Record<string, never>) => {
|
||||||
const { kind } = integration;
|
const { kind } = integration;
|
||||||
|
|
||||||
if (kind !== "proxmox" && kind !== "mock") {
|
if (kind !== "proxmox" && kind !== "mock" && kind !== "coolify") {
|
||||||
return systemInfoRequestHandler.handler({ ...integration, kind }, itemOptions);
|
return systemInfoRequestHandler.handler({ ...integration, kind }, itemOptions);
|
||||||
}
|
}
|
||||||
|
if (kind === "coolify") {
|
||||||
|
return coolifyRequestHandler.handler({ ...integration, kind }, itemOptions);
|
||||||
|
}
|
||||||
return clusterInfoRequestHandler.handler({ ...integration, kind }, itemOptions);
|
return clusterInfoRequestHandler.handler({ ...integration, kind }, itemOptions);
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
widgetKinds: ["healthMonitoring", "systemResources"],
|
widgetKinds: ["healthMonitoring", "systemResources", "coolify"],
|
||||||
getInput: {
|
getInput: {
|
||||||
healthMonitoring: () => ({}),
|
healthMonitoring: () => ({}),
|
||||||
systemResources: () => ({}),
|
systemResources: () => ({}),
|
||||||
|
coolify: () => ({}),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -47,17 +47,17 @@
|
|||||||
"@homarr/core": "workspace:^0.1.0",
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"@homarr/definitions": "workspace:^0.1.0",
|
"@homarr/definitions": "workspace:^0.1.0",
|
||||||
"@homarr/server-settings": "workspace:^0.1.0",
|
"@homarr/server-settings": "workspace:^0.1.0",
|
||||||
"@mantine/core": "^8.3.10",
|
"@mantine/core": "^8.3.12",
|
||||||
"@paralleldrive/cuid2": "^3.1.0",
|
"@paralleldrive/cuid2": "^3.1.0",
|
||||||
"@testcontainers/mysql": "^11.10.0",
|
"@testcontainers/mysql": "^11.11.0",
|
||||||
"@testcontainers/postgresql": "^11.10.0",
|
"@testcontainers/postgresql": "^11.11.0",
|
||||||
"better-sqlite3": "^12.5.0",
|
"better-sqlite3": "^12.6.2",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"drizzle-kit": "^0.31.8",
|
"drizzle-kit": "^0.31.8",
|
||||||
"drizzle-orm": "^0.45.1",
|
"drizzle-orm": "^0.45.1",
|
||||||
"drizzle-zod": "^0.8.3",
|
"drizzle-zod": "^0.8.3",
|
||||||
"mysql2": "3.15.3",
|
"mysql2": "3.16.1",
|
||||||
"pg": "^8.16.3",
|
"pg": "^8.17.1",
|
||||||
"superjson": "2.2.6"
|
"superjson": "2.2.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -67,9 +67,9 @@
|
|||||||
"@types/better-sqlite3": "7.6.13",
|
"@types/better-sqlite3": "7.6.13",
|
||||||
"@types/pg": "^8.16.0",
|
"@types/pg": "^8.16.0",
|
||||||
"dotenv-cli": "^11.0.0",
|
"dotenv-cli": "^11.0.0",
|
||||||
"esbuild": "^0.27.1",
|
"esbuild": "^0.27.2",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.8.0",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"fast-xml-parser": "^5.3.3",
|
"fast-xml-parser": "^5.3.3",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -188,6 +188,7 @@ export type HomarrDocumentationPath =
|
|||||||
| "/docs/integrations/transmission"
|
| "/docs/integrations/transmission"
|
||||||
| "/docs/integrations/truenas"
|
| "/docs/integrations/truenas"
|
||||||
| "/docs/integrations/unifi-controller"
|
| "/docs/integrations/unifi-controller"
|
||||||
|
| "/docs/integrations/unraid"
|
||||||
| "/docs/management/api"
|
| "/docs/management/api"
|
||||||
| "/docs/management/apps"
|
| "/docs/management/apps"
|
||||||
| "/docs/management/boards"
|
| "/docs/management/boards"
|
||||||
|
|||||||
@@ -298,6 +298,21 @@ export const integrationDefs = {
|
|||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/truenas"),
|
documentationUrl: createDocumentationLink("/docs/integrations/truenas"),
|
||||||
},
|
},
|
||||||
|
unraid: {
|
||||||
|
name: "Unraid",
|
||||||
|
secretKinds: [["apiKey"]],
|
||||||
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/unraid.svg",
|
||||||
|
category: ["healthMonitoring"],
|
||||||
|
documentationUrl: createDocumentationLink("/docs/integrations/unraid"),
|
||||||
|
},
|
||||||
|
coolify: {
|
||||||
|
name: "Coolify",
|
||||||
|
secretKinds: [["apiKey"]],
|
||||||
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/coolify.svg",
|
||||||
|
category: ["healthMonitoring"],
|
||||||
|
// @ts-expect-error - docs page will be created when integration is merged
|
||||||
|
documentationUrl: createDocumentationLink("/docs/integrations/coolify"),
|
||||||
|
},
|
||||||
// This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
|
// This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
|
||||||
mock: {
|
mock: {
|
||||||
name: "Mock",
|
name: "Mock",
|
||||||
|
|||||||
@@ -29,5 +29,7 @@ export const widgetKinds = [
|
|||||||
"firewall",
|
"firewall",
|
||||||
"notifications",
|
"notifications",
|
||||||
"systemResources",
|
"systemResources",
|
||||||
|
"coolify",
|
||||||
|
"systemDisks",
|
||||||
] as const;
|
] as const;
|
||||||
export type WidgetKind = (typeof widgetKinds)[number];
|
export type WidgetKind = (typeof widgetKinds)[number];
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/dockerode": "^3.3.47",
|
"@types/dockerode": "^4.0.0",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.2",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,9 +26,9 @@
|
|||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@mantine/form": "^8.3.10",
|
"@mantine/form": "^8.3.12",
|
||||||
"mantine-form-zod-resolver": "^1.3.0",
|
"mantine-form-zod-resolver": "^1.3.0",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -30,9 +30,9 @@
|
|||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/ui": "workspace:^0.1.0",
|
"@homarr/ui": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@mantine/core": "^8.3.10",
|
"@mantine/core": "^8.3.12",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { parse } from "path";
|
import { parse } from "path";
|
||||||
|
|
||||||
import { fetchWithTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
||||||
|
|
||||||
import type { IconRepositoryLicense } from "../types/icon-repository-license";
|
import type { IconRepositoryLicense } from "../types/icon-repository-license";
|
||||||
import type { RepositoryIconGroup } from "../types/repository-icon-group";
|
import type { RepositoryIconGroup } from "../types/repository-icon-group";
|
||||||
@@ -19,11 +20,12 @@ export class GitHubIconRepository extends IconRepository {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected async getAllIconsInternalAsync(): Promise<RepositoryIconGroup> {
|
protected async getAllIconsInternalAsync(): Promise<RepositoryIconGroup> {
|
||||||
if (!this.repositoryIndexingUrl || !this.repositoryBlobUrlTemplate) {
|
const url = this.repositoryIndexingUrl;
|
||||||
|
if (!url || !this.repositoryBlobUrlTemplate) {
|
||||||
throw new Error("Repository URLs are required for this repository");
|
throw new Error("Repository URLs are required for this repository");
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await fetchWithTimeoutAsync(this.repositoryIndexingUrl);
|
const response = await withTimeoutAsync(async (signal) => fetchWithTrustedCertificatesAsync(url, { signal }));
|
||||||
const listOfFiles = (await response.json()) as GitHubApiResponse;
|
const listOfFiles = (await response.json()) as GitHubApiResponse;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { parse } from "path";
|
import { parse } from "path";
|
||||||
|
|
||||||
import { fetchWithTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
||||||
|
|
||||||
import type { IconRepositoryLicense } from "../types/icon-repository-license";
|
import type { IconRepositoryLicense } from "../types/icon-repository-license";
|
||||||
import type { RepositoryIconGroup } from "../types/repository-icon-group";
|
import type { RepositoryIconGroup } from "../types/repository-icon-group";
|
||||||
@@ -19,7 +20,9 @@ export class JsdelivrIconRepository extends IconRepository {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected async getAllIconsInternalAsync(): Promise<RepositoryIconGroup> {
|
protected async getAllIconsInternalAsync(): Promise<RepositoryIconGroup> {
|
||||||
const response = await fetchWithTimeoutAsync(this.repositoryIndexingUrl);
|
const response = await withTimeoutAsync(async (signal) =>
|
||||||
|
fetchWithTrustedCertificatesAsync(this.repositoryIndexingUrl, { signal }),
|
||||||
|
);
|
||||||
const listOfFiles = (await response.json()) as JsdelivrApiResponse;
|
const listOfFiles = (await response.json()) as JsdelivrApiResponse;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -46,9 +46,9 @@
|
|||||||
"octokit": "^5.0.5",
|
"octokit": "^5.0.5",
|
||||||
"proxmox-api": "1.1.1",
|
"proxmox-api": "1.1.1",
|
||||||
"tsdav": "^2.1.6",
|
"tsdav": "^2.1.6",
|
||||||
"undici": "7.16.0",
|
"undici": "7.18.2",
|
||||||
"xml2js": "^0.6.2",
|
"xml2js": "^0.6.2",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import type { IntegrationKind } from "@homarr/definitions";
|
|||||||
|
|
||||||
import { AdGuardHomeIntegration } from "../adguard-home/adguard-home-integration";
|
import { AdGuardHomeIntegration } from "../adguard-home/adguard-home-integration";
|
||||||
import { CodebergIntegration } from "../codeberg/codeberg-integration";
|
import { CodebergIntegration } from "../codeberg/codeberg-integration";
|
||||||
|
import { CoolifyIntegration } from "../coolify/coolify-integration";
|
||||||
import { DashDotIntegration } from "../dashdot/dashdot-integration";
|
import { DashDotIntegration } from "../dashdot/dashdot-integration";
|
||||||
import { DockerHubIntegration } from "../docker-hub/docker-hub-integration";
|
import { DockerHubIntegration } from "../docker-hub/docker-hub-integration";
|
||||||
import { Aria2Integration } from "../download-client/aria2/aria2-integration";
|
import { Aria2Integration } from "../download-client/aria2/aria2-integration";
|
||||||
@@ -38,6 +39,7 @@ import { ProxmoxIntegration } from "../proxmox/proxmox-integration";
|
|||||||
import { QuayIntegration } from "../quay/quay-integration";
|
import { QuayIntegration } from "../quay/quay-integration";
|
||||||
import { TrueNasIntegration } from "../truenas/truenas-integration";
|
import { TrueNasIntegration } from "../truenas/truenas-integration";
|
||||||
import { UnifiControllerIntegration } from "../unifi-controller/unifi-controller-integration";
|
import { UnifiControllerIntegration } from "../unifi-controller/unifi-controller-integration";
|
||||||
|
import { UnraidIntegration } from "../unraid/unraid-integration";
|
||||||
import type { Integration, IntegrationInput } from "./integration";
|
import type { Integration, IntegrationInput } from "./integration";
|
||||||
|
|
||||||
export const createIntegrationAsync = async <TKind extends keyof typeof integrationCreators>(
|
export const createIntegrationAsync = async <TKind extends keyof typeof integrationCreators>(
|
||||||
@@ -101,6 +103,8 @@ export const integrationCreators = {
|
|||||||
ntfy: NTFYIntegration,
|
ntfy: NTFYIntegration,
|
||||||
mock: MockIntegration,
|
mock: MockIntegration,
|
||||||
truenas: TrueNasIntegration,
|
truenas: TrueNasIntegration,
|
||||||
|
unraid: UnraidIntegration,
|
||||||
|
coolify: CoolifyIntegration,
|
||||||
} satisfies Record<IntegrationKind, IntegrationInstance | [(input: IntegrationInput) => Promise<Integration>]>;
|
} satisfies Record<IntegrationKind, IntegrationInstance | [(input: IntegrationInput) => Promise<Integration>]>;
|
||||||
|
|
||||||
type IntegrationInstanceOfKind<TKind extends keyof typeof integrationCreators> = {
|
type IntegrationInstanceOfKind<TKind extends keyof typeof integrationCreators> = {
|
||||||
|
|||||||
@@ -0,0 +1,351 @@
|
|||||||
|
import { ResponseError } from "@homarr/common/server";
|
||||||
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
|
||||||
|
import type { IntegrationTestingInput } from "../base/integration";
|
||||||
|
import { Integration } from "../base/integration";
|
||||||
|
import type { TestingResult } from "../base/test-connection/test-connection-service";
|
||||||
|
import type {
|
||||||
|
CoolifyApplication,
|
||||||
|
CoolifyApplicationWithContext,
|
||||||
|
CoolifyEnvironment,
|
||||||
|
CoolifyEnvironmentVariable,
|
||||||
|
CoolifyHealthcheck,
|
||||||
|
CoolifyInstanceInfo,
|
||||||
|
CoolifyProject,
|
||||||
|
CoolifyProjectWithEnvironments,
|
||||||
|
CoolifyResource,
|
||||||
|
CoolifyServer,
|
||||||
|
CoolifyService,
|
||||||
|
CoolifyServiceWithContext,
|
||||||
|
} from "./coolify-types";
|
||||||
|
import {
|
||||||
|
coolifyApplicationLogSchema,
|
||||||
|
coolifyApplicationSchema,
|
||||||
|
coolifyEnvironmentSchema,
|
||||||
|
coolifyEnvironmentVariableSchema,
|
||||||
|
coolifyHealthcheckSchema,
|
||||||
|
coolifyProjectSchema,
|
||||||
|
coolifyProjectWithEnvironmentsSchema,
|
||||||
|
coolifyResourceSchema,
|
||||||
|
coolifyServerSchema,
|
||||||
|
coolifyServiceSchema,
|
||||||
|
} from "./coolify-types";
|
||||||
|
|
||||||
|
export class CoolifyIntegration extends Integration {
|
||||||
|
protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
|
||||||
|
const healthUrl = this.url("/api/health");
|
||||||
|
const healthResponse = await input.fetchAsync(healthUrl, {});
|
||||||
|
|
||||||
|
if (!healthResponse.ok) {
|
||||||
|
throw new ResponseError(healthResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test API key authentication
|
||||||
|
const versionUrl = this.url("/api/v1/version");
|
||||||
|
const versionResponse = await input.fetchAsync(versionUrl, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!versionResponse.ok) {
|
||||||
|
throw new ResponseError(versionResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get Coolify version information
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/version
|
||||||
|
*/
|
||||||
|
public async getVersionAsync(): Promise<string> {
|
||||||
|
const url = this.url("/api/v1/version");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
const version = await response.text();
|
||||||
|
return version.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get Coolify healthcheck status
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/healthcheck
|
||||||
|
*/
|
||||||
|
public async getHealthcheckAsync(): Promise<CoolifyHealthcheck> {
|
||||||
|
const url = this.url("/api/v1/healthcheck");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyHealthcheckSchema.parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List all applications
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/list-applications
|
||||||
|
*/
|
||||||
|
public async listApplicationsAsync(): Promise<CoolifyApplication[]> {
|
||||||
|
const url = this.url("/api/v1/applications");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyApplicationSchema.array().parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get application by UUID
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/get-application-by-uuid
|
||||||
|
*/
|
||||||
|
public async getApplicationByUuidAsync(uuid: string): Promise<CoolifyApplication> {
|
||||||
|
const url = this.url(`/api/v1/applications/${uuid}`);
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyApplicationSchema.parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get application logs by UUID
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/get-application-logs-by-uuid
|
||||||
|
*/
|
||||||
|
public async getApplicationLogsAsync(uuid: string): Promise<string> {
|
||||||
|
const url = this.url(`/api/v1/applications/${uuid}/logs`);
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = coolifyApplicationLogSchema.parse(await response.json());
|
||||||
|
return result.logs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List environment variables by application UUID
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/list-envs-by-application-uuid
|
||||||
|
*/
|
||||||
|
public async listEnvsByApplicationUuidAsync(uuid: string): Promise<CoolifyEnvironmentVariable[]> {
|
||||||
|
const url = this.url(`/api/v1/applications/${uuid}/envs`);
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyEnvironmentVariableSchema.array().parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List projects
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/list-projects
|
||||||
|
*/
|
||||||
|
public async listProjectsAsync(): Promise<CoolifyProject[]> {
|
||||||
|
const url = this.url("/api/v1/projects");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyProjectSchema.array().parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get project by UUID (includes environments)
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/get-project-by-uuid
|
||||||
|
*/
|
||||||
|
public async getProjectByUuidAsync(uuid: string): Promise<CoolifyProjectWithEnvironments> {
|
||||||
|
const url = this.url(`/api/v1/projects/${uuid}`);
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyProjectWithEnvironmentsSchema.parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get environments
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/get-environments
|
||||||
|
*/
|
||||||
|
public async getEnvironmentsAsync(): Promise<CoolifyEnvironment[]> {
|
||||||
|
const url = this.url("/api/v1/environments");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyEnvironmentSchema.array().parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get environment by name or UUID
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/get-environment-by-name-or-uuid
|
||||||
|
*/
|
||||||
|
public async getEnvironmentByNameOrUuidAsync(nameOrUuid: string): Promise<CoolifyEnvironment> {
|
||||||
|
const url = this.url(`/api/v1/environments/${nameOrUuid}`);
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyEnvironmentSchema.parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List resources
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/list-resources
|
||||||
|
*/
|
||||||
|
public async listResourcesAsync(): Promise<CoolifyResource[]> {
|
||||||
|
const url = this.url("/api/v1/resources");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyResourceSchema.array().parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List servers
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/list-servers
|
||||||
|
*/
|
||||||
|
public async listServersAsync(): Promise<CoolifyServer[]> {
|
||||||
|
const url = this.url("/api/v1/servers");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyServerSchema.array().parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List services
|
||||||
|
* https://coolify.io/docs/api-reference/api/operations/list-services
|
||||||
|
*/
|
||||||
|
public async listServicesAsync(): Promise<CoolifyService[]> {
|
||||||
|
const url = this.url("/api/v1/services");
|
||||||
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return coolifyServiceSchema.array().parse(await response.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
public async getInstanceInfoAsync(): Promise<CoolifyInstanceInfo> {
|
||||||
|
const [version, applications, services, projectsWithEnvs, servers] = await Promise.all([
|
||||||
|
this.getVersionAsync(),
|
||||||
|
this.listApplicationsAsync(),
|
||||||
|
this.listServicesAsync(),
|
||||||
|
this.listProjectsWithEnvironmentsAsync(),
|
||||||
|
this.listServersAsync(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const envToProjectMap = new Map<
|
||||||
|
number,
|
||||||
|
{ projectName: string; projectUuid: string; environmentName: string; environmentUuid?: string }
|
||||||
|
>();
|
||||||
|
for (const project of projectsWithEnvs) {
|
||||||
|
for (const env of project.environments ?? []) {
|
||||||
|
if (env.id != null) {
|
||||||
|
envToProjectMap.set(env.id, {
|
||||||
|
projectName: project.name,
|
||||||
|
projectUuid: project.uuid,
|
||||||
|
environmentName: env.name,
|
||||||
|
environmentUuid: env.uuid ?? undefined,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const applicationsWithContext: CoolifyApplicationWithContext[] = applications.map((app) => {
|
||||||
|
const context = app.environment_id ? envToProjectMap.get(app.environment_id) : undefined;
|
||||||
|
return {
|
||||||
|
...app,
|
||||||
|
projectName: context?.projectName,
|
||||||
|
projectUuid: context?.projectUuid,
|
||||||
|
environmentName: context?.environmentName,
|
||||||
|
environmentUuid: context?.environmentUuid,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const servicesWithContext: CoolifyServiceWithContext[] = services.map((service) => {
|
||||||
|
const context = service.environment_id ? envToProjectMap.get(service.environment_id) : undefined;
|
||||||
|
const fqdn = service.fqdn ?? service.applications?.find((app) => app.fqdn)?.fqdn ?? undefined;
|
||||||
|
return {
|
||||||
|
...service,
|
||||||
|
fqdn,
|
||||||
|
projectName: context?.projectName,
|
||||||
|
projectUuid: context?.projectUuid,
|
||||||
|
environmentName: context?.environmentName,
|
||||||
|
environmentUuid: context?.environmentUuid,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
version,
|
||||||
|
applications: applicationsWithContext,
|
||||||
|
services: servicesWithContext,
|
||||||
|
servers,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List all projects with their environments
|
||||||
|
*/
|
||||||
|
private async listProjectsWithEnvironmentsAsync(): Promise<CoolifyProjectWithEnvironments[]> {
|
||||||
|
const projects = await this.listProjectsAsync();
|
||||||
|
const projectsWithEnvs = await Promise.all(projects.map((project) => this.getProjectByUuidAsync(project.uuid)));
|
||||||
|
return projectsWithEnvs;
|
||||||
|
}
|
||||||
|
|
||||||
|
private getAuthHeaders(): Record<string, string> {
|
||||||
|
return {
|
||||||
|
Authorization: `Bearer ${this.getSecretValue("apiKey")}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
// Coolify API Types and Schemas based on https://coolify.io/docs/api-reference/api
|
||||||
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
|
// Health check schema
|
||||||
|
export const coolifyHealthcheckSchema = z.object({
|
||||||
|
status: z.string(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyHealthcheck = z.infer<typeof coolifyHealthcheckSchema>;
|
||||||
|
|
||||||
|
// Application log schema
|
||||||
|
export const coolifyApplicationLogSchema = z.object({
|
||||||
|
logs: z.string(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyApplicationLog = z.infer<typeof coolifyApplicationLogSchema>;
|
||||||
|
|
||||||
|
// Environment variable schema
|
||||||
|
export const coolifyEnvironmentVariableSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
key: z.string(),
|
||||||
|
value: z.string(),
|
||||||
|
is_build_time: z.boolean().nullish(),
|
||||||
|
is_preview: z.boolean().nullish(),
|
||||||
|
application_id: z.number().nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyEnvironmentVariable = z.infer<typeof coolifyEnvironmentVariableSchema>;
|
||||||
|
|
||||||
|
// Application schema (only fields used in the widget)
|
||||||
|
export const coolifyApplicationSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
uuid: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
status: z.string().nullish(),
|
||||||
|
fqdn: z.string().nullish(),
|
||||||
|
environment_id: z.number().nullish(),
|
||||||
|
server_id: z.number().nullish(),
|
||||||
|
destination_id: z.number().nullish(),
|
||||||
|
updated_at: z.string().nullish(),
|
||||||
|
last_online_at: z.string().nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyApplication = z.infer<typeof coolifyApplicationSchema>;
|
||||||
|
|
||||||
|
// Project schema
|
||||||
|
export const coolifyProjectSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
uuid: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyProject = z.infer<typeof coolifyProjectSchema>;
|
||||||
|
|
||||||
|
// Environment schema
|
||||||
|
export const coolifyEnvironmentSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
uuid: z.string().nullish(),
|
||||||
|
name: z.string(),
|
||||||
|
project_id: z.number().nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyEnvironment = z.infer<typeof coolifyEnvironmentSchema>;
|
||||||
|
|
||||||
|
// Project with environments schema
|
||||||
|
export const coolifyProjectWithEnvironmentsSchema = coolifyProjectSchema.extend({
|
||||||
|
environments: z.array(coolifyEnvironmentSchema).nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyProjectWithEnvironments = z.infer<typeof coolifyProjectWithEnvironmentsSchema>;
|
||||||
|
|
||||||
|
// Resource schema
|
||||||
|
export const coolifyResourceSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
uuid: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
type: z.string(),
|
||||||
|
status: z.string().nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyResource = z.infer<typeof coolifyResourceSchema>;
|
||||||
|
|
||||||
|
// Server settings schema
|
||||||
|
export const coolifyServerSettingsSchema = z.object({
|
||||||
|
server_id: z.number().nullish(),
|
||||||
|
is_build_server: z.boolean().nullish(),
|
||||||
|
is_reachable: z.boolean().nullish(),
|
||||||
|
is_usable: z.boolean().nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyServerSettings = z.infer<typeof coolifyServerSettingsSchema>;
|
||||||
|
|
||||||
|
// Server schema
|
||||||
|
export const coolifyServerSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
uuid: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
ip: z.string().nullish(),
|
||||||
|
is_reachable: z.boolean().nullish(),
|
||||||
|
is_usable: z.boolean().nullish(),
|
||||||
|
settings: coolifyServerSettingsSchema.nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyServer = z.infer<typeof coolifyServerSchema>;
|
||||||
|
|
||||||
|
// Service application schema (nested in services)
|
||||||
|
export const coolifyServiceApplicationSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
uuid: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
fqdn: z.string().nullish(),
|
||||||
|
status: z.string().nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyServiceApplication = z.infer<typeof coolifyServiceApplicationSchema>;
|
||||||
|
|
||||||
|
// Service schema
|
||||||
|
export const coolifyServiceSchema = z.object({
|
||||||
|
id: z.number().nullish(),
|
||||||
|
uuid: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
status: z.string().nullish(),
|
||||||
|
fqdn: z.string().nullish(),
|
||||||
|
environment_id: z.number().nullish(),
|
||||||
|
server_id: z.number().nullish(),
|
||||||
|
destination_id: z.number().nullish(),
|
||||||
|
updated_at: z.string().nullish(),
|
||||||
|
applications: z.array(coolifyServiceApplicationSchema).nullish(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type CoolifyService = z.infer<typeof coolifyServiceSchema>;
|
||||||
|
|
||||||
|
// Extended types with context (not from API, added by integration)
|
||||||
|
export interface CoolifyApplicationWithContext extends CoolifyApplication {
|
||||||
|
projectName?: string;
|
||||||
|
projectUuid?: string;
|
||||||
|
environmentName?: string;
|
||||||
|
environmentUuid?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CoolifyServiceWithContext extends CoolifyService {
|
||||||
|
projectName?: string;
|
||||||
|
projectUuid?: string;
|
||||||
|
environmentName?: string;
|
||||||
|
environmentUuid?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Aggregated information for the Coolify instance
|
||||||
|
export interface CoolifyInstanceInfo {
|
||||||
|
version: string;
|
||||||
|
applications: CoolifyApplicationWithContext[];
|
||||||
|
services: CoolifyServiceWithContext[];
|
||||||
|
servers: CoolifyServer[];
|
||||||
|
}
|
||||||
@@ -0,0 +1,313 @@
|
|||||||
|
import { Request, Response } from "undici";
|
||||||
|
import { beforeEach, describe, expect, test, vi } from "vitest";
|
||||||
|
|
||||||
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
|
||||||
|
import { CoolifyIntegration } from "../coolify-integration";
|
||||||
|
import type {
|
||||||
|
CoolifyApplication,
|
||||||
|
CoolifyProject,
|
||||||
|
CoolifyProjectWithEnvironments,
|
||||||
|
CoolifyServer,
|
||||||
|
CoolifyService,
|
||||||
|
} from "../coolify-types";
|
||||||
|
|
||||||
|
vi.mock("@homarr/core/infrastructure/http", () => ({
|
||||||
|
fetchWithTrustedCertificatesAsync: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const TEST_API_KEY = "test-api-key-12345";
|
||||||
|
const TEST_URL = "https://coolify.example.com";
|
||||||
|
|
||||||
|
type MockResponseData = string | Record<string, unknown> | unknown[];
|
||||||
|
|
||||||
|
const mockFetchWithTrustedCertificates = vi.mocked(fetchWithTrustedCertificatesAsync);
|
||||||
|
|
||||||
|
const setupMockFetch = (responses: Record<string, MockResponseData>) => {
|
||||||
|
mockFetchWithTrustedCertificates.mockImplementation((url) => {
|
||||||
|
const urlString = typeof url === "string" ? url : url instanceof Request ? url.url : url.toString();
|
||||||
|
const urlObj = new URL(urlString);
|
||||||
|
const path = urlObj.pathname;
|
||||||
|
|
||||||
|
if (path in responses) {
|
||||||
|
const data = responses[path];
|
||||||
|
const body = typeof data === "string" ? data : JSON.stringify(data);
|
||||||
|
return Promise.resolve(
|
||||||
|
new Response(body, {
|
||||||
|
status: 200,
|
||||||
|
headers: { "content-type": "application/json" },
|
||||||
|
}) as unknown as Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Promise.resolve(
|
||||||
|
new Response(JSON.stringify({ error: "Not Found" }), {
|
||||||
|
status: 404,
|
||||||
|
headers: { "content-type": "application/json" },
|
||||||
|
}) as unknown as Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const createCoolifyIntegration = () => {
|
||||||
|
return new CoolifyIntegration({
|
||||||
|
id: "test-coolify",
|
||||||
|
name: "Test Coolify",
|
||||||
|
url: TEST_URL,
|
||||||
|
externalUrl: null,
|
||||||
|
decryptedSecrets: [{ kind: "apiKey", value: TEST_API_KEY }],
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
describe("CoolifyIntegration", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getVersionAsync", () => {
|
||||||
|
test("should return version string from Coolify API", async () => {
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/version": "4.0.0-beta.460",
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.getVersionAsync();
|
||||||
|
|
||||||
|
expect(result).toBe("4.0.0-beta.460");
|
||||||
|
expect(mockFetchWithTrustedCertificates).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("should throw error when API returns error", async () => {
|
||||||
|
mockFetchWithTrustedCertificates.mockResolvedValue(
|
||||||
|
new Response("Unauthorized", {
|
||||||
|
status: 401,
|
||||||
|
headers: { "content-type": "text/plain" },
|
||||||
|
}) as unknown as Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
await expect(integration.getVersionAsync()).rejects.toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("listServersAsync", () => {
|
||||||
|
test("should return list of servers", async () => {
|
||||||
|
const servers: CoolifyServer[] = [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "server-uuid-1",
|
||||||
|
name: "Production Server",
|
||||||
|
ip: "192.168.1.100",
|
||||||
|
is_reachable: true,
|
||||||
|
is_usable: true,
|
||||||
|
settings: { is_build_server: false },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
uuid: "server-uuid-2",
|
||||||
|
name: "Build Server",
|
||||||
|
ip: "192.168.1.101",
|
||||||
|
is_reachable: true,
|
||||||
|
is_usable: true,
|
||||||
|
settings: { is_build_server: true },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/servers": servers,
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.listServersAsync();
|
||||||
|
|
||||||
|
expect(result).toHaveLength(2);
|
||||||
|
expect(result[0]?.name).toBe("Production Server");
|
||||||
|
expect(result[1]?.settings?.is_build_server).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("listApplicationsAsync", () => {
|
||||||
|
test("should return list of applications", async () => {
|
||||||
|
const applications: CoolifyApplication[] = [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "app-uuid-1",
|
||||||
|
name: "my-app",
|
||||||
|
fqdn: "https://myapp.example.com",
|
||||||
|
status: "running",
|
||||||
|
updated_at: "2024-01-01T00:00:00Z",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
uuid: "app-uuid-2",
|
||||||
|
name: "another-app",
|
||||||
|
fqdn: "https://another.example.com",
|
||||||
|
status: "stopped",
|
||||||
|
updated_at: "2024-01-01T00:00:00Z",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/applications": applications,
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.listApplicationsAsync();
|
||||||
|
|
||||||
|
expect(result).toHaveLength(2);
|
||||||
|
expect(result[0]?.status).toBe("running");
|
||||||
|
expect(result[1]?.status).toBe("stopped");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("listServicesAsync", () => {
|
||||||
|
test("should return list of services", async () => {
|
||||||
|
const services: CoolifyService[] = [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "service-uuid-1",
|
||||||
|
name: "postgresql",
|
||||||
|
updated_at: "2024-01-01T00:00:00Z",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/services": services,
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.listServicesAsync();
|
||||||
|
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
expect(result[0]?.name).toBe("postgresql");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("listProjectsAsync", () => {
|
||||||
|
test("should return list of projects", async () => {
|
||||||
|
const projects: CoolifyProject[] = [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "proj-uuid-1",
|
||||||
|
name: "Production",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/projects": projects,
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.listProjectsAsync();
|
||||||
|
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
expect(result[0]?.name).toBe("Production");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getInstanceInfoAsync", () => {
|
||||||
|
test("should aggregate all instance data with project context", async () => {
|
||||||
|
const projectWithEnvs: CoolifyProjectWithEnvironments = {
|
||||||
|
id: 1,
|
||||||
|
uuid: "proj-uuid-1",
|
||||||
|
name: "Production",
|
||||||
|
environments: [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "env-uuid-1",
|
||||||
|
name: "production",
|
||||||
|
project_id: 1,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/version": "4.0.0-beta.460",
|
||||||
|
"/api/v1/applications": [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "app-uuid-1",
|
||||||
|
name: "my-app",
|
||||||
|
status: "running",
|
||||||
|
environment_id: 1,
|
||||||
|
updated_at: "2024-01-01T00:00:00Z",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"/api/v1/services": [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "service-uuid-1",
|
||||||
|
name: "postgres",
|
||||||
|
environment_id: 1,
|
||||||
|
updated_at: "2024-01-01T00:00:00Z",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"/api/v1/projects": [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "proj-uuid-1",
|
||||||
|
name: "Production",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"/api/v1/servers": [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
uuid: "server-uuid-1",
|
||||||
|
name: "Server 1",
|
||||||
|
ip: "192.168.1.1",
|
||||||
|
is_reachable: true,
|
||||||
|
is_usable: true,
|
||||||
|
settings: { is_build_server: false },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"/api/v1/projects/proj-uuid-1": projectWithEnvs,
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.getInstanceInfoAsync();
|
||||||
|
|
||||||
|
expect(result.version).toBe("4.0.0-beta.460");
|
||||||
|
expect(result.applications).toHaveLength(1);
|
||||||
|
expect(result.services).toHaveLength(1);
|
||||||
|
expect(result.servers).toHaveLength(1);
|
||||||
|
expect(result.applications[0]?.projectName).toBe("Production");
|
||||||
|
expect(result.applications[0]?.environmentName).toBe("production");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getHealthcheckAsync", () => {
|
||||||
|
test("should return healthcheck status", async () => {
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/healthcheck": { status: "healthy" },
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.getHealthcheckAsync();
|
||||||
|
|
||||||
|
expect(result.status).toBe("healthy");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getApplicationByUuidAsync", () => {
|
||||||
|
test("should return application details by UUID", async () => {
|
||||||
|
const application: CoolifyApplication = {
|
||||||
|
id: 1,
|
||||||
|
uuid: "app-uuid-1",
|
||||||
|
name: "my-app",
|
||||||
|
fqdn: "https://app.example.com",
|
||||||
|
status: "running",
|
||||||
|
updated_at: "2024-01-01T00:00:00Z",
|
||||||
|
};
|
||||||
|
|
||||||
|
setupMockFetch({
|
||||||
|
"/api/v1/applications/app-uuid-1": application,
|
||||||
|
});
|
||||||
|
|
||||||
|
const integration = createCoolifyIntegration();
|
||||||
|
const result = await integration.getApplicationByUuidAsync("app-uuid-1");
|
||||||
|
|
||||||
|
expect(result.uuid).toBe("app-uuid-1");
|
||||||
|
expect(result.name).toBe("my-app");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -55,7 +55,7 @@ export class DashDotIntegration extends Integration implements ISystemHealthMoni
|
|||||||
cpuTemp: cpuLoad.averageTemperature,
|
cpuTemp: cpuLoad.averageTemperature,
|
||||||
availablePkgUpdates: 0,
|
availablePkgUpdates: 0,
|
||||||
rebootRequired: false,
|
rebootRequired: false,
|
||||||
smart: [],
|
smart: [], // API endpoint does not provide S.M.A.R.T data.
|
||||||
uptime: info.uptime,
|
uptime: info.uptime,
|
||||||
version: `${info.operatingSystemVersion}`,
|
version: `${info.operatingSystemVersion}`,
|
||||||
loadAverage: {
|
loadAverage: {
|
||||||
|
|||||||
@@ -22,8 +22,10 @@ export { PiHoleIntegrationV6 } from "./pi-hole/v6/pi-hole-integration-v6";
|
|||||||
export { PlexIntegration } from "./plex/plex-integration";
|
export { PlexIntegration } from "./plex/plex-integration";
|
||||||
export { ProwlarrIntegration } from "./prowlarr/prowlarr-integration";
|
export { ProwlarrIntegration } from "./prowlarr/prowlarr-integration";
|
||||||
export { TrueNasIntegration } from "./truenas/truenas-integration";
|
export { TrueNasIntegration } from "./truenas/truenas-integration";
|
||||||
|
export { UnraidIntegration } from "./unraid/unraid-integration";
|
||||||
export { OPNsenseIntegration } from "./opnsense/opnsense-integration";
|
export { OPNsenseIntegration } from "./opnsense/opnsense-integration";
|
||||||
export { ICalIntegration } from "./ical/ical-integration";
|
export { ICalIntegration } from "./ical/ical-integration";
|
||||||
|
export { CoolifyIntegration } from "./coolify/coolify-integration";
|
||||||
|
|
||||||
// Types
|
// Types
|
||||||
export type { IntegrationInput } from "./base/integration";
|
export type { IntegrationInput } from "./base/integration";
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ export interface SystemHealthMonitoring {
|
|||||||
deviceName: string;
|
deviceName: string;
|
||||||
temperature: number | null;
|
temperature: number | null;
|
||||||
overallStatus: string;
|
overallStatus: string;
|
||||||
|
healthy: boolean;
|
||||||
}[];
|
}[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ export class SystemHealthMonitoringMockService implements ISystemHealthMonitorin
|
|||||||
deviceName: "Mock Device",
|
deviceName: "Mock Device",
|
||||||
temperature: Math.floor(Math.random() * 100), // Random temperature between 0 and 99
|
temperature: Math.floor(Math.random() * 100), // Random temperature between 0 and 99
|
||||||
overallStatus: "OK",
|
overallStatus: "OK",
|
||||||
|
healthy: true,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -62,6 +62,8 @@ export class OpenMediaVaultIntegration extends Integration implements ISystemHea
|
|||||||
const smart = smartResult.data.response.map((smart) => ({
|
const smart = smartResult.data.response.map((smart) => ({
|
||||||
deviceName: smart.devicename,
|
deviceName: smart.devicename,
|
||||||
temperature: smart.temperature,
|
temperature: smart.temperature,
|
||||||
|
// https://github.com/openmediavault/openmediavault/blob/2eb871d05cec6ff49603134d3acead561da01e4d/deb/openmediavault/usr/share/php/openmediavault/system/storage/smartinformation.inc#L592-L605
|
||||||
|
healthy: smart.overallstatus === "GOOD",
|
||||||
overallStatus: smart.overallstatus,
|
overallStatus: smart.overallstatus,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|||||||
@@ -112,6 +112,27 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async getPoolsAsync() {
|
||||||
|
logger.debug("Retrieving pools", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await this.requestAsync("pool.query", [
|
||||||
|
[],
|
||||||
|
{
|
||||||
|
extra: {
|
||||||
|
is_upgraded: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
const result = await poolSchema.parseAsync(response);
|
||||||
|
logger.debug("Retrieved pools", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
count: result.length,
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves data using the reporting method
|
* Retrieves data using the reporting method
|
||||||
* @see https://www.truenas.com/docs/api/scale_websocket_api.html#reporting
|
* @see https://www.truenas.com/docs/api/scale_websocket_api.html#reporting
|
||||||
@@ -225,6 +246,7 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
|
|||||||
const cpuData = this.extractLatestReportingData(reporting, "cpu");
|
const cpuData = this.extractLatestReportingData(reporting, "cpu");
|
||||||
const cpuTempData = this.extractLatestReportingData(reporting, "cputemp");
|
const cpuTempData = this.extractLatestReportingData(reporting, "cputemp");
|
||||||
const memoryData = this.extractLatestReportingData(reporting, "memory");
|
const memoryData = this.extractLatestReportingData(reporting, "memory");
|
||||||
|
const datasets = await this.getPoolsAsync();
|
||||||
|
|
||||||
const netdata = await this.getReportingNetdataAsync();
|
const netdata = await this.getReportingNetdataAsync();
|
||||||
|
|
||||||
@@ -236,14 +258,24 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
|
|||||||
cpuTemp: Math.max(...cpuTempData.filter((_item, i) => i > 0)),
|
cpuTemp: Math.max(...cpuTempData.filter((_item, i) => i > 0)),
|
||||||
memAvailableInBytes: systemInformation.physmem,
|
memAvailableInBytes: systemInformation.physmem,
|
||||||
memUsedInBytes: memoryData[1] ?? 0, // Index 0 is UNIX timestamp, Index 1 is free space in bytes
|
memUsedInBytes: memoryData[1] ?? 0, // Index 0 is UNIX timestamp, Index 1 is free space in bytes
|
||||||
fileSystem: [],
|
fileSystem: datasets.map((dataset) => ({
|
||||||
|
deviceName: dataset.name,
|
||||||
|
available: `${dataset.size}`, // TODO: can we use number instead of string here?
|
||||||
|
used: `${dataset.allocated}`,
|
||||||
|
percentage: (dataset.allocated / dataset.size) * 100,
|
||||||
|
})),
|
||||||
availablePkgUpdates: 0,
|
availablePkgUpdates: 0,
|
||||||
network: {
|
network: {
|
||||||
up: upload * NETWORK_MULTIPLIER,
|
up: upload * NETWORK_MULTIPLIER,
|
||||||
down: download * NETWORK_MULTIPLIER,
|
down: download * NETWORK_MULTIPLIER,
|
||||||
},
|
},
|
||||||
loadAverage: null,
|
loadAverage: null,
|
||||||
smart: [],
|
smart: datasets.map((dataset) => ({
|
||||||
|
deviceName: dataset.name,
|
||||||
|
healthy: dataset.healthy,
|
||||||
|
overallStatus: dataset.status,
|
||||||
|
temperature: null,
|
||||||
|
})),
|
||||||
uptime: systemInformation.uptime_seconds,
|
uptime: systemInformation.uptime_seconds,
|
||||||
version: systemInformation.version,
|
version: systemInformation.version,
|
||||||
cpuModelName: systemInformation.model,
|
cpuModelName: systemInformation.model,
|
||||||
@@ -261,7 +293,7 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
|
|||||||
*/
|
*/
|
||||||
private async requestAsync(method: string, params: unknown[] = [], webSocketOverride?: WebSocket) {
|
private async requestAsync(method: string, params: unknown[] = [], webSocketOverride?: WebSocket) {
|
||||||
let webSocket = webSocketOverride ?? this.webSocket;
|
let webSocket = webSocketOverride ?? this.webSocket;
|
||||||
if (!webSocket || webSocket.readyState !== WebSocket.OPEN) {
|
if (webSocket?.readyState !== WebSocket.OPEN) {
|
||||||
logger.debug("Connecting to websocket", {
|
logger.debug("Connecting to websocket", {
|
||||||
url: this.wsUrl(),
|
url: this.wsUrl(),
|
||||||
});
|
});
|
||||||
@@ -351,6 +383,17 @@ const reportingItemSchema = z.object({
|
|||||||
|
|
||||||
type ReportingItem = z.infer<typeof reportingItemSchema>;
|
type ReportingItem = z.infer<typeof reportingItemSchema>;
|
||||||
|
|
||||||
|
const poolSchema = z.array(
|
||||||
|
z.object({
|
||||||
|
name: z.string(),
|
||||||
|
status: z.string(),
|
||||||
|
healthy: z.boolean(),
|
||||||
|
free: z.number().min(0),
|
||||||
|
size: z.number(),
|
||||||
|
allocated: z.number(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
const reportingNetDataSchema = z.array(
|
const reportingNetDataSchema = z.array(
|
||||||
z.object({
|
z.object({
|
||||||
name: z.string(),
|
name: z.string(),
|
||||||
|
|||||||
@@ -11,3 +11,4 @@ export * from "./proxmox/proxmox-types";
|
|||||||
export * from "./unifi-controller/unifi-controller-types";
|
export * from "./unifi-controller/unifi-controller-types";
|
||||||
export * from "./opnsense/opnsense-types";
|
export * from "./opnsense/opnsense-types";
|
||||||
export * from "./interfaces/media-releases";
|
export * from "./interfaces/media-releases";
|
||||||
|
export * from "./coolify/coolify-types";
|
||||||
@@ -0,0 +1,191 @@
|
|||||||
|
import dayjs from "dayjs";
|
||||||
|
import type { fetch as undiciFetch } from "undici/types/fetch";
|
||||||
|
|
||||||
|
import { humanFileSize } from "@homarr/common";
|
||||||
|
import { ResponseError } from "@homarr/common/server";
|
||||||
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
|
||||||
|
import { HandleIntegrationErrors } from "../base/errors/decorator";
|
||||||
|
import type { IntegrationTestingInput } from "../base/integration";
|
||||||
|
import { Integration } from "../base/integration";
|
||||||
|
import type { TestingResult } from "../base/test-connection/test-connection-service";
|
||||||
|
import type { ISystemHealthMonitoringIntegration } from "../interfaces/health-monitoring/health-monitoring-integration";
|
||||||
|
import type { SystemHealthMonitoring } from "../interfaces/health-monitoring/health-monitoring-types";
|
||||||
|
import type { UnraidSystemInfo } from "./unraid-types";
|
||||||
|
import { unraidSystemInfoSchema } from "./unraid-types";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "UnraidIntegration" });
|
||||||
|
|
||||||
|
@HandleIntegrationErrors([])
|
||||||
|
export class UnraidIntegration extends Integration implements ISystemHealthMonitoringIntegration {
|
||||||
|
protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
|
||||||
|
await this.queryGraphQLAsync<{ info: UnraidSystemInfo }>(
|
||||||
|
`
|
||||||
|
query {
|
||||||
|
info {
|
||||||
|
os { platform }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
input.fetchAsync,
|
||||||
|
);
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
public async getSystemInfoAsync(): Promise<SystemHealthMonitoring> {
|
||||||
|
const systemInfo = await this.getSystemInformationAsync();
|
||||||
|
|
||||||
|
const cpuUtilization = systemInfo.metrics.cpu.cpus.reduce((acc, val) => acc + val.percentTotal, 0);
|
||||||
|
const cpuCount = systemInfo.info.cpu.cores;
|
||||||
|
|
||||||
|
// We use "info" object instead of the stats since this is the exact amount the kernel sees, which is what Unraid displays.
|
||||||
|
const totalMemory = systemInfo.info.memory.layout.reduce((acc, layout) => layout.size + acc, 0);
|
||||||
|
const usedMemory = totalMemory * (systemInfo.metrics.memory.percentTotal / 100);
|
||||||
|
const uptime = dayjs(systemInfo.info.os.uptime);
|
||||||
|
|
||||||
|
return {
|
||||||
|
version: systemInfo.info.os.release,
|
||||||
|
cpuModelName: systemInfo.info.cpu.brand,
|
||||||
|
cpuUtilization: cpuUtilization / cpuCount,
|
||||||
|
memUsedInBytes: usedMemory,
|
||||||
|
memAvailableInBytes: totalMemory - usedMemory,
|
||||||
|
uptime: dayjs().diff(uptime, "seconds"),
|
||||||
|
network: null, // Not implemented, see https://github.com/unraid/api/issues/1602
|
||||||
|
loadAverage: null,
|
||||||
|
rebootRequired: false,
|
||||||
|
availablePkgUpdates: 0,
|
||||||
|
cpuTemp: undefined, // Not implemented, see https://github.com/unraid/api/issues/1597
|
||||||
|
fileSystem: systemInfo.array.disks.map((disk) => ({
|
||||||
|
deviceName: disk.name,
|
||||||
|
used: humanFileSize(disk.fsUsed * 1024), // API is in KiB (kibibytes), covert to bytes
|
||||||
|
available: `${disk.size * 1024}`, // API is in KiB (kibibytes), covert to bytes
|
||||||
|
percentage: (disk.fsUsed / disk.size) * 100, // The units are the same, therefore the actual unit is irrelevant
|
||||||
|
})),
|
||||||
|
smart: systemInfo.array.disks.map((disk) => ({
|
||||||
|
deviceName: disk.name,
|
||||||
|
temperature: disk.temp ?? null,
|
||||||
|
overallStatus: disk.status,
|
||||||
|
// See ArrayDiskStatus from https://studio.apollographql.com/public/Unraid-API/variant/current/explorer
|
||||||
|
healthy: disk.status === "DISK_OK",
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private async getSystemInformationAsync(): Promise<UnraidSystemInfo> {
|
||||||
|
logger.debug("Retrieving system information", {
|
||||||
|
url: this.url("/graphql"),
|
||||||
|
});
|
||||||
|
|
||||||
|
const query = `
|
||||||
|
query {
|
||||||
|
metrics {
|
||||||
|
cpu {
|
||||||
|
percentTotal
|
||||||
|
cpus {
|
||||||
|
percentTotal
|
||||||
|
}
|
||||||
|
},
|
||||||
|
memory {
|
||||||
|
available
|
||||||
|
used
|
||||||
|
free
|
||||||
|
total
|
||||||
|
swapFree
|
||||||
|
swapTotal
|
||||||
|
swapUsed
|
||||||
|
percentTotal
|
||||||
|
}
|
||||||
|
}
|
||||||
|
array {
|
||||||
|
state
|
||||||
|
capacity {
|
||||||
|
disks {
|
||||||
|
free
|
||||||
|
total
|
||||||
|
used
|
||||||
|
}
|
||||||
|
}
|
||||||
|
disks {
|
||||||
|
name
|
||||||
|
size
|
||||||
|
fsFree
|
||||||
|
fsUsed
|
||||||
|
status
|
||||||
|
temp
|
||||||
|
}
|
||||||
|
}
|
||||||
|
info {
|
||||||
|
devices {
|
||||||
|
network {
|
||||||
|
speed
|
||||||
|
dhcp
|
||||||
|
model
|
||||||
|
model
|
||||||
|
}
|
||||||
|
}
|
||||||
|
os {
|
||||||
|
platform,
|
||||||
|
distro,
|
||||||
|
release,
|
||||||
|
uptime
|
||||||
|
},
|
||||||
|
cpu {
|
||||||
|
manufacturer,
|
||||||
|
brand,
|
||||||
|
cores,
|
||||||
|
threads
|
||||||
|
},
|
||||||
|
memory {
|
||||||
|
layout {
|
||||||
|
size
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const response = await this.queryGraphQLAsync<UnraidSystemInfo>(query);
|
||||||
|
const result = await unraidSystemInfoSchema.parseAsync(response);
|
||||||
|
|
||||||
|
logger.debug("Retrieved system information", {
|
||||||
|
url: this.url("/graphql"),
|
||||||
|
});
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async queryGraphQLAsync<T>(
|
||||||
|
query: string,
|
||||||
|
fetchAsync: typeof undiciFetch = fetchWithTrustedCertificatesAsync,
|
||||||
|
): Promise<T> {
|
||||||
|
const url = this.url("/graphql");
|
||||||
|
const apiKey = this.getSecretValue("apiKey");
|
||||||
|
|
||||||
|
logger.debug("Sending GraphQL query", {
|
||||||
|
url: url.toString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await fetchAsync(url, {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"x-api-key": apiKey,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ query }),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new ResponseError(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
const json = (await response.json()) as { data: T; errors?: { message: string }[] };
|
||||||
|
|
||||||
|
if (json.errors) {
|
||||||
|
throw new Error(`GraphQL errors: ${json.errors.map((error) => error.message).join(", ")}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return json.data;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import z from "zod";
|
||||||
|
|
||||||
|
export const unraidSystemInfoSchema = z.object({
|
||||||
|
metrics: z.object({
|
||||||
|
cpu: z.object({
|
||||||
|
percentTotal: z.number(),
|
||||||
|
cpus: z.array(
|
||||||
|
z.object({
|
||||||
|
percentTotal: z.number(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
memory: z.object({
|
||||||
|
available: z.number(),
|
||||||
|
used: z.number(),
|
||||||
|
free: z.number(),
|
||||||
|
total: z.number().min(0),
|
||||||
|
percentTotal: z.number().min(0).max(100),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
array: z.object({
|
||||||
|
state: z.string(),
|
||||||
|
capacity: z.object({
|
||||||
|
disks: z.object({
|
||||||
|
free: z.coerce.number(),
|
||||||
|
total: z.coerce.number(),
|
||||||
|
used: z.coerce.number(),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
disks: z.array(
|
||||||
|
z.object({
|
||||||
|
name: z.string(),
|
||||||
|
size: z.number(),
|
||||||
|
fsFree: z.number(),
|
||||||
|
fsUsed: z.number(),
|
||||||
|
status: z.string(),
|
||||||
|
temp: z.number().nullish(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
info: z.object({
|
||||||
|
devices: z.object({
|
||||||
|
network: z.array(
|
||||||
|
z.object({
|
||||||
|
speed: z.number(),
|
||||||
|
dhcp: z.boolean(),
|
||||||
|
model: z.string(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
os: z.object({
|
||||||
|
platform: z.string(),
|
||||||
|
distro: z.string(),
|
||||||
|
release: z.string(),
|
||||||
|
uptime: z.coerce.date(),
|
||||||
|
}),
|
||||||
|
cpu: z.object({
|
||||||
|
manufacturer: z.string(),
|
||||||
|
brand: z.string(),
|
||||||
|
cores: z.number(),
|
||||||
|
threads: z.number(),
|
||||||
|
}),
|
||||||
|
memory: z.object({
|
||||||
|
layout: z.array(
|
||||||
|
z.object({
|
||||||
|
size: z.number(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type UnraidSystemInfo = z.infer<typeof unraidSystemInfoSchema>;
|
||||||
@@ -33,13 +33,13 @@
|
|||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/ui": "workspace:^0.1.0",
|
"@homarr/ui": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@mantine/core": "^8.3.10",
|
"@mantine/core": "^8.3.12",
|
||||||
"@tabler/icons-react": "^3.35.0",
|
"@tabler/icons-react": "^3.36.1",
|
||||||
"dayjs": "^1.11.19",
|
"dayjs": "^1.11.19",
|
||||||
"next": "16.0.10",
|
"next": "16.1.3",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3",
|
"react-dom": "19.2.3",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/ui": "workspace:^0.1.0",
|
"@homarr/ui": "workspace:^0.1.0",
|
||||||
"@mantine/core": "^8.3.10",
|
"@mantine/core": "^8.3.12",
|
||||||
"@mantine/hooks": "^8.3.10",
|
"@mantine/hooks": "^8.3.12",
|
||||||
"react": "19.2.3"
|
"react": "19.2.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/ui": "workspace:^0.1.0",
|
"@homarr/ui": "workspace:^0.1.0",
|
||||||
"@mantine/notifications": "^8.3.10",
|
"@mantine/notifications": "^8.3.12",
|
||||||
"@tabler/icons-react": "^3.35.0"
|
"@tabler/icons-react": "^3.36.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -37,14 +37,14 @@
|
|||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/ui": "workspace:^0.1.0",
|
"@homarr/ui": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@mantine/core": "^8.3.10",
|
"@mantine/core": "^8.3.12",
|
||||||
"@mantine/hooks": "^8.3.10",
|
"@mantine/hooks": "^8.3.12",
|
||||||
"adm-zip": "0.5.16",
|
"adm-zip": "0.5.16",
|
||||||
"next": "16.0.10",
|
"next": "16.1.3",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3",
|
"react-dom": "19.2.3",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"zod": "^4.1.13",
|
"zod": "^4.2.1",
|
||||||
"zod-form-data": "^3.0.1"
|
"zod-form-data": "^3.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
"@homarr/core": "workspace:^",
|
"@homarr/core": "workspace:^",
|
||||||
"@homarr/db": "workspace:^",
|
"@homarr/db": "workspace:^",
|
||||||
"@homarr/definitions": "workspace:^",
|
"@homarr/definitions": "workspace:^",
|
||||||
"ioredis": "5.8.2",
|
"ioredis": "5.9.2",
|
||||||
"superjson": "2.2.6"
|
"superjson": "2.2.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -33,8 +33,8 @@
|
|||||||
"dayjs": "^1.11.19",
|
"dayjs": "^1.11.19",
|
||||||
"octokit": "^5.0.5",
|
"octokit": "^5.0.5",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"undici": "7.16.0",
|
"undici": "7.18.2",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
|
import { createIntegrationAsync } from "@homarr/integrations";
|
||||||
|
import type { CoolifyInstanceInfo } from "@homarr/integrations/types";
|
||||||
|
|
||||||
|
import { createCachedIntegrationRequestHandler } from "./lib/cached-integration-request-handler";
|
||||||
|
|
||||||
|
export const coolifyRequestHandler = createCachedIntegrationRequestHandler<
|
||||||
|
CoolifyInstanceInfo,
|
||||||
|
"coolify",
|
||||||
|
Record<string, never>
|
||||||
|
>({
|
||||||
|
async requestAsync(integration, _input) {
|
||||||
|
const integrationInstance = await createIntegrationAsync(integration);
|
||||||
|
return await integrationInstance.getInstanceInfoAsync();
|
||||||
|
},
|
||||||
|
cacheDuration: dayjs.duration(30, "seconds"),
|
||||||
|
queryKey: "coolifyInfo",
|
||||||
|
});
|
||||||
@@ -12,9 +12,7 @@ export const dockerContainersRequestHandler = createCachedWidgetRequestHandler({
|
|||||||
queryKey: "dockerContainersResult",
|
queryKey: "dockerContainersResult",
|
||||||
widgetKind: "dockerContainers",
|
widgetKind: "dockerContainers",
|
||||||
async requestAsync() {
|
async requestAsync() {
|
||||||
const containers = await getContainersWithStatsAsync();
|
return await getContainersWithStatsAsync();
|
||||||
|
|
||||||
return containers;
|
|
||||||
},
|
},
|
||||||
cacheDuration: dayjs.duration(20, "seconds"),
|
cacheDuration: dayjs.duration(20, "seconds"),
|
||||||
});
|
});
|
||||||
@@ -28,7 +26,7 @@ async function getContainersWithStatsAsync() {
|
|||||||
dockerInstances.map(async ({ instance, host }) => {
|
dockerInstances.map(async ({ instance, host }) => {
|
||||||
const instanceContainers = await instance.listContainers({ all: true });
|
const instanceContainers = await instance.listContainers({ all: true });
|
||||||
return instanceContainers
|
return instanceContainers
|
||||||
.filter((container) => dockerLabels.hide in container.Labels === false)
|
.filter((container) => !(dockerLabels.hide in container.Labels))
|
||||||
.map((container) => ({ ...container, instance: host }));
|
.map((container) => ({ ...container, instance: host }));
|
||||||
}),
|
}),
|
||||||
).then((res) => res.flat());
|
).then((res) => res.flat());
|
||||||
@@ -45,7 +43,21 @@ async function getContainersWithStatsAsync() {
|
|||||||
const instance = dockerInstances.find(({ host }) => host === container.instance)?.instance;
|
const instance = dockerInstances.find(({ host }) => host === container.instance)?.instance;
|
||||||
if (!instance) return null;
|
if (!instance) return null;
|
||||||
|
|
||||||
const stats = await instance.getContainer(container.Id).stats({ stream: false, "one-shot": true });
|
// Get stats, falling back to an empty stats object if fetch fails
|
||||||
|
// calculateCpuUsage and calculateMemoryUsage will return 0 for invalid/missing stats
|
||||||
|
const stats = await instance
|
||||||
|
.getContainer(container.Id)
|
||||||
|
.stats({ stream: false, "one-shot": true })
|
||||||
|
.catch(
|
||||||
|
() =>
|
||||||
|
({
|
||||||
|
cpu_stats: { online_cpus: 0, cpu_usage: { total_usage: 0 }, system_cpu_usage: 0 },
|
||||||
|
memory_stats: { usage: 0 },
|
||||||
|
}) as ContainerStats,
|
||||||
|
);
|
||||||
|
|
||||||
|
const cpuUsage = calculateCpuUsage(stats);
|
||||||
|
const memoryUsage = calculateMemoryUsage(stats);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: container.Id,
|
id: container.Id,
|
||||||
@@ -57,19 +69,8 @@ async function getContainersWithStatsAsync() {
|
|||||||
if (!extractedImage) return false;
|
if (!extractedImage) return false;
|
||||||
return icon.name.toLowerCase().includes(extractedImage.toLowerCase());
|
return icon.name.toLowerCase().includes(extractedImage.toLowerCase());
|
||||||
})?.url ?? null,
|
})?.url ?? null,
|
||||||
cpuUsage: calculateCpuUsage(stats),
|
cpuUsage,
|
||||||
// memory usage by default includes cache, which should not be shown as it is also not shown with docker stats command
|
memoryUsage,
|
||||||
// The below type is probably wrong, sometimes stats can be undefined
|
|
||||||
// See https://docs.docker.com/reference/cli/docker/container/stats/ how it is / was calculated
|
|
||||||
memoryUsage:
|
|
||||||
stats.memory_stats.usage -
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
||||||
(stats.memory_stats.stats?.cache ??
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
||||||
stats.memory_stats.stats?.total_inactive_file ??
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
||||||
stats.memory_stats.stats?.inactive_file ??
|
|
||||||
0),
|
|
||||||
image: container.Image,
|
image: container.Image,
|
||||||
ports: container.Ports,
|
ports: container.Ports,
|
||||||
};
|
};
|
||||||
@@ -79,10 +80,36 @@ async function getContainersWithStatsAsync() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function calculateCpuUsage(stats: ContainerStats): number {
|
function calculateCpuUsage(stats: ContainerStats): number {
|
||||||
const numberOfCpus = stats.cpu_stats.online_cpus || 1;
|
// Handle containers with missing or invalid stats (e.g., exited, dead containers)
|
||||||
|
if (!stats.cpu_stats.online_cpus || stats.cpu_stats.online_cpus === 0 || !stats.cpu_stats.cpu_usage.total_usage) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const numberOfCpus = stats.cpu_stats.online_cpus;
|
||||||
const usage = stats.cpu_stats.system_cpu_usage;
|
const usage = stats.cpu_stats.system_cpu_usage;
|
||||||
if (usage === 0) return 0;
|
if (!usage || usage === 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
return (stats.cpu_stats.cpu_usage.total_usage / usage) * numberOfCpus * 100;
|
return (stats.cpu_stats.cpu_usage.total_usage / usage) * numberOfCpus * 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function calculateMemoryUsage(stats: ContainerStats): number {
|
||||||
|
// Handle containers with missing or invalid stats (e.g., exited, dead containers)
|
||||||
|
if (!stats.memory_stats.usage) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// memory usage by default includes cache, which should not be shown as it is also not shown with docker stats command
|
||||||
|
// See https://docs.docker.com/reference/cli/docker/container/stats/ how it is / was calculated
|
||||||
|
return (
|
||||||
|
stats.memory_stats.usage -
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
||||||
|
(stats.memory_stats.stats?.cache ??
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
||||||
|
stats.memory_stats.stats?.total_inactive_file ??
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
||||||
|
stats.memory_stats.stats?.inactive_file ??
|
||||||
|
0)
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ import { createCachedIntegrationRequestHandler } from "./lib/cached-integration-
|
|||||||
|
|
||||||
export const systemInfoRequestHandler = createCachedIntegrationRequestHandler<
|
export const systemInfoRequestHandler = createCachedIntegrationRequestHandler<
|
||||||
SystemHealthMonitoring,
|
SystemHealthMonitoring,
|
||||||
Exclude<IntegrationKindByCategory<"healthMonitoring">, "proxmox">,
|
Exclude<IntegrationKindByCategory<"healthMonitoring">, "proxmox" | "coolify">,
|
||||||
Record<string, never>
|
Record<string, never>
|
||||||
>({
|
>({
|
||||||
async requestAsync(integration, _input) {
|
async requestAsync(integration, _input) {
|
||||||
|
|||||||
@@ -57,12 +57,6 @@ export const createRequestIntegrationJobHandler = <
|
|||||||
reduceWidgetOptionsWithDefaultValues(
|
reduceWidgetOptionsWithDefaultValues(
|
||||||
itemForIntegration.kind,
|
itemForIntegration.kind,
|
||||||
{
|
{
|
||||||
defaultSearchEngineId: serverSettings.search.defaultSearchEngineId,
|
|
||||||
openSearchInNewTab: true,
|
|
||||||
firstDayOfWeek: 1,
|
|
||||||
homeBoardId: serverSettings.board.homeBoardId,
|
|
||||||
mobileHomeBoardId: serverSettings.board.mobileHomeBoardId,
|
|
||||||
pingIconsEnabled: true,
|
|
||||||
enableStatusByDefault: serverSettings.board.enableStatusByDefault,
|
enableStatusByDefault: serverSettings.board.enableStatusByDefault,
|
||||||
forceDisableStatus: serverSettings.board.forceDisableStatus,
|
forceDisableStatus: serverSettings.board.forceDisableStatus,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { fetchWithTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
||||||
|
|
||||||
import { createCachedWidgetRequestHandler } from "./lib/cached-widget-request-handler";
|
import { createCachedWidgetRequestHandler } from "./lib/cached-widget-request-handler";
|
||||||
|
|
||||||
@@ -11,7 +12,9 @@ export const minecraftServerStatusRequestHandler = createCachedWidgetRequestHand
|
|||||||
async requestAsync(input: { domain: string; isBedrockServer: boolean }) {
|
async requestAsync(input: { domain: string; isBedrockServer: boolean }) {
|
||||||
const path = `${input.isBedrockServer ? "/bedrock" : ""}/3/${input.domain}`;
|
const path = `${input.isBedrockServer ? "/bedrock" : ""}/3/${input.domain}`;
|
||||||
|
|
||||||
const response = await fetchWithTimeoutAsync(`https://api.mcsrvstat.us${path}`);
|
const response = await withTimeoutAsync(async (signal) =>
|
||||||
|
fetchWithTrustedCertificatesAsync(`https://api.mcsrvstat.us${path}`, { signal }),
|
||||||
|
);
|
||||||
return responseSchema.parse(await response.json());
|
return responseSchema.parse(await response.json());
|
||||||
},
|
},
|
||||||
cacheDuration: dayjs.duration(5, "minutes"),
|
cacheDuration: dayjs.duration(5, "minutes"),
|
||||||
|
|||||||
Loaded 100 of 175 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user