Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b8f0d9a21f | ||
|
|
73a50fa687 | ||
|
|
78626121dd | ||
|
|
c69602ff07 | ||
|
|
7c22e1d05d | ||
|
|
dc08bacebf | ||
|
|
26eb2c08c9 | ||
|
|
f7471b6c63 | ||
|
|
3703f428b0 | ||
|
|
1019657a63 | ||
|
|
789ac65cbd | ||
|
|
d7902f80c2 | ||
|
|
44d4cec3ff | ||
|
|
a843f6043b | ||
|
|
bfcbffbdc6 | ||
|
|
4d57c7ca13 | ||
|
|
a7976e9d70 | ||
|
|
a149d8c3c1 | ||
|
|
3e1285cacd | ||
|
|
5b24eb3074 | ||
|
|
6389fd8807 | ||
|
|
1d9eb9bf24 | ||
|
|
3c9f7ecbf8 | ||
|
|
cd90eaae9d | ||
|
|
fbb86c452d | ||
|
|
a1b5f5ceea | ||
|
|
eb5af11643 | ||
|
|
7ac2a81f94 | ||
|
|
ecf1bd98b7 | ||
|
|
8231efa281 | ||
|
|
1323bb276f | ||
|
|
2eef4a8304 | ||
|
|
842f4f6284 | ||
|
|
4fc38bcd5b | ||
|
|
99179e4e7d | ||
|
|
8fa245910c | ||
|
|
b50ec029fa | ||
|
|
8bf278f603 | ||
|
|
de33439b22 | ||
|
|
b65ec27c0d | ||
|
|
1f4a9037d7 | ||
|
|
e70074b219 | ||
|
|
bc94e34ada | ||
|
|
d9440087b7 | ||
|
|
32b2a09ab4 | ||
|
|
5d8e2a3c7b | ||
|
|
dd67dd794a | ||
|
|
10668ee359 | ||
|
|
d5eb812b72 | ||
|
|
2ac96a11b7 | ||
|
|
52f0b86e7b | ||
|
|
d7146d82d1 | ||
|
|
eef6b86ad6 | ||
|
|
9cb8261ddc | ||
|
|
d4f73d2b39 | ||
|
|
e4f14140a3 | ||
|
|
b77d8114ab | ||
|
|
0df1555b50 | ||
|
|
b2eb2c32f6 | ||
|
|
b34440470f | ||
|
|
047654351a | ||
|
|
4e4483c42d | ||
|
|
5e92e66803 | ||
|
|
83fec579e7 | ||
|
|
1a30ccc857 | ||
|
|
0ee023adf3 | ||
|
|
1bcab1797b | ||
|
|
8ff29b82e5 | ||
|
|
fb6b5e88ff | ||
|
|
ca488f8210 | ||
|
|
d317cacbe8 | ||
|
|
65b9ddd771 | ||
|
|
3e59c20dba | ||
|
|
d2e9b5e983 | ||
|
|
75683c206d | ||
|
|
a3dde2e7ee | ||
|
|
7b26a386eb | ||
|
|
032f7ffd29 | ||
|
|
2b1a3de8df | ||
|
|
4823c0db8b | ||
|
|
b0fe8a9f65 | ||
|
|
a1def95852 | ||
|
|
9c2d50de91 | ||
|
|
0e5f43c1c3 | ||
|
|
42071e36ca | ||
|
|
de7699689f | ||
|
|
be0e78371e | ||
|
|
ea4960e113 | ||
|
|
916542210d | ||
|
|
94eb6772b9 | ||
|
|
afe10b8715 | ||
|
|
99bfc4a0b6 | ||
|
|
d58faf5976 | ||
|
|
cf98156bdc | ||
|
|
f166d153fe | ||
|
|
dc9a83ba3c | ||
|
|
0e3c6f0f97 | ||
|
|
51b06922bd | ||
|
|
9f3e68fdfe | ||
|
|
88eed15faf | ||
|
|
f277ceb302 | ||
|
|
e0c9c0fab7 | ||
|
|
21bde0f3ea | ||
|
|
5d908093ce | ||
|
|
6081a5af13 | ||
|
|
a488efc6f8 | ||
|
|
24e4d718e2 | ||
|
|
71c75a3507 | ||
|
|
5bd6757e22 | ||
|
|
81a7f3e93d | ||
|
|
93186c3be1 | ||
|
|
e695bccfc0 | ||
|
|
a12a86b672 | ||
|
|
feee4b3ad7 | ||
|
|
36f2181643 | ||
|
|
bc746b67b4 | ||
|
|
0fb7fd4292 | ||
|
|
51f3cd2ce7 | ||
|
|
8dea07250f |
No files matched your search
@@ -33,6 +33,10 @@ 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.36.1
|
||||||
|
- 1.36.0
|
||||||
|
- 1.35.1
|
||||||
|
- 1.35.0
|
||||||
- 1.34.0
|
- 1.34.0
|
||||||
- 1.33.0
|
- 1.33.0
|
||||||
- 1.32.0
|
- 1.32.0
|
||||||
|
|||||||
@@ -6,6 +6,11 @@
|
|||||||
matchPackagePatterns: ["^@homarr/"],
|
matchPackagePatterns: ["^@homarr/"],
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
|
// Reenable once https://github.com/privatenumber/tsx/issues/737 is fixed
|
||||||
|
{
|
||||||
|
matchPackagePatterns: ["tsx"],
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
matchUpdateTypes: ["minor", "patch", "pin", "digest"],
|
matchUpdateTypes: ["minor", "patch", "pin", "digest"],
|
||||||
automerge: true,
|
automerge: true,
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ jobs:
|
|||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
with:
|
with:
|
||||||
node-version: 22.18.0
|
node-version: 22.19.0
|
||||||
- run: npm i -g pnpm
|
- run: npm i -g pnpm
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
permissions:
|
||||||
|
statuses: write
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches-ignore: "renovate/*"
|
||||||
|
types: [opened, synchronize]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
skip-stability-days:
|
||||||
|
name: Skip Stability Days
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Add status check
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||||
|
run: |
|
||||||
|
gh api \
|
||||||
|
--method POST \
|
||||||
|
-H "Accept: application/vnd.github+json" \
|
||||||
|
-H "X-GitHub-Api-Version: 2022-11-28" \
|
||||||
|
/repos/${{github.repository}}/statuses/${{github.event.pull_request.head.sha}} \
|
||||||
|
-f 'state=success' \
|
||||||
|
-f 'target_url=https://docs.renovatebot.com/configuration-options#minimumreleaseage' \
|
||||||
|
-f 'description=Skipped for non renovate branches' \
|
||||||
|
-f 'context=renovate/stability-days'
|
||||||
@@ -1,3 +1,88 @@
|
|||||||
|
## [1.37.0](https://github.com/homarr-labs/homarr/compare/v1.36.1...v1.37.0) (2025-09-12)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **integration:** add github app authentication ([#3968](https://github.com/homarr-labs/homarr/issues/3968)) ([bfcbffb](https://github.com/homarr-labs/homarr/commit/bfcbffbdc6499ac5f10bfbf2f5db141eef955049))
|
||||||
|
* **integrations:** add truenas ([#3745](https://github.com/homarr-labs/homarr/issues/3745)) ([dc08bac](https://github.com/homarr-labs/homarr/commit/dc08bacebfe22ee528565259605787720a522b6b))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **adguard-integration:** parse error with protection_disabled_duration field ([#4018](https://github.com/homarr-labs/homarr/issues/4018)) ([eb5af11](https://github.com/homarr-labs/homarr/commit/eb5af116436ddd11b7ff094e882355f951ca622a))
|
||||||
|
* **api:** page is crashing ([#4039](https://github.com/homarr-labs/homarr/issues/4039)) ([a843f60](https://github.com/homarr-labs/homarr/commit/a843f6043b0ed90c5a205b697497490631e0dd19))
|
||||||
|
* **boards:** issues with old-import board name containing spaces ([#4052](https://github.com/homarr-labs/homarr/issues/4052)) ([f7471b6](https://github.com/homarr-labs/homarr/commit/f7471b6c63f80618d0b91b16fb5545e0a3760cbe))
|
||||||
|
* **deps:** update dependency @ctrl/deluge to ^7.2.0 ([#4009](https://github.com/homarr-labs/homarr/issues/4009)) ([e70074b](https://github.com/homarr-labs/homarr/commit/e70074b2191df1dac1e9aa94dbb0cec7073193c9))
|
||||||
|
* **deps:** update dependency @ctrl/qbittorrent to ^9.7.0 ([#4010](https://github.com/homarr-labs/homarr/issues/4010)) ([32b2a09](https://github.com/homarr-labs/homarr/commit/32b2a09ab4e9826b0640d47e1d443682b5fbcff5))
|
||||||
|
* **deps:** update dependency @ctrl/transmission to ^7.3.0 ([#4011](https://github.com/homarr-labs/homarr/issues/4011)) ([bc94e34](https://github.com/homarr-labs/homarr/commit/bc94e34ada04458901389f3d7ba18e76849fe6d4))
|
||||||
|
* **deps:** update dependency @extractus/feed-extractor to v7.1.7 ([#4034](https://github.com/homarr-labs/homarr/issues/4034)) ([fbb86c4](https://github.com/homarr-labs/homarr/commit/fbb86c452d3b8d8cde5357e369fbc14349b71c81))
|
||||||
|
* **deps:** update dependency @gitbeaker/rest to ^43.5.0 ([#4023](https://github.com/homarr-labs/homarr/issues/4023)) ([4fc38bc](https://github.com/homarr-labs/homarr/commit/4fc38bcd5bbed0b3ede2e742c0677bdfbab47295))
|
||||||
|
* **deps:** update dependency dotenv to ^17.2.2 ([#4024](https://github.com/homarr-labs/homarr/issues/4024)) ([1323bb2](https://github.com/homarr-labs/homarr/commit/1323bb276fc8120dd62385b4c79cc630b2078949))
|
||||||
|
* **deps:** update dependency fastify to ^5.6.0 ([#4042](https://github.com/homarr-labs/homarr/issues/4042)) ([a149d8c](https://github.com/homarr-labs/homarr/commit/a149d8c3c112740c9c563463ab72e89c77b9a4ec))
|
||||||
|
* **deps:** update dependency mysql2 to v3.14.4 ([#4013](https://github.com/homarr-labs/homarr/issues/4013)) ([8bf278f](https://github.com/homarr-labs/homarr/commit/8bf278f603ff37e68d7bed41c4c5f6e6351fe94e))
|
||||||
|
* **deps:** update dependency next-intl to v4.3.6 ([#4035](https://github.com/homarr-labs/homarr/issues/4035)) ([a1b5f5c](https://github.com/homarr-labs/homarr/commit/a1b5f5ceea96b18bda8aa7cee7002b10dc4b428c))
|
||||||
|
* **deps:** update dependency next-intl to v4.3.7 ([#4038](https://github.com/homarr-labs/homarr/issues/4038)) ([cd90eaa](https://github.com/homarr-labs/homarr/commit/cd90eaae9da566393114a02765f57f1e6f55fe1c))
|
||||||
|
* **deps:** update dependency sass to ^1.92.0 ([#4025](https://github.com/homarr-labs/homarr/issues/4025)) ([2eef4a8](https://github.com/homarr-labs/homarr/commit/2eef4a8304f0ab5b99313e6e8904582303dd1883))
|
||||||
|
* **deps:** update dependency sass to ^1.92.1 ([#4031](https://github.com/homarr-labs/homarr/issues/4031)) ([8231efa](https://github.com/homarr-labs/homarr/commit/8231efa28195389f4b83a06d137ea6b4b2f49eee))
|
||||||
|
* **deps:** update dependency swagger-ui-react to ^5.28.1 ([#4029](https://github.com/homarr-labs/homarr/issues/4029)) ([ecf1bd9](https://github.com/homarr-labs/homarr/commit/ecf1bd98b74c8e8fca03bcd210fb118382ce2d36))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.42.0 ([#4022](https://github.com/homarr-labs/homarr/issues/4022)) ([99179e4](https://github.com/homarr-labs/homarr/commit/99179e4e7d957f5616a24c63982af957613db427))
|
||||||
|
* **deps:** update trpc monorepo to ^11.5.1 ([#4045](https://github.com/homarr-labs/homarr/issues/4045)) ([a7976e9](https://github.com/homarr-labs/homarr/commit/a7976e9d700793d8f48529bc5c1f11f8bca724ce))
|
||||||
|
* **iframe:** disable scrolling not working ([#4017](https://github.com/homarr-labs/homarr/issues/4017)) ([7ac2a81](https://github.com/homarr-labs/homarr/commit/7ac2a81f945c44745917fe4eb8318fdfff3deb14))
|
||||||
|
* **plex-integration:** unknown badge shown for added tv-shows ([#4032](https://github.com/homarr-labs/homarr/issues/4032)) ([4d57c7c](https://github.com/homarr-labs/homarr/commit/4d57c7ca13bdf78b5ac9d0710cd486ad1f41d4d4))
|
||||||
|
* **update-checker:** cached through updates ([#4046](https://github.com/homarr-labs/homarr/issues/4046)) ([26eb2c0](https://github.com/homarr-labs/homarr/commit/26eb2c08c94bd9d440a3c9e914fc9af4ffd48301))
|
||||||
|
* **video-widget:** hls videos not working ([#4015](https://github.com/homarr-labs/homarr/issues/4015)) ([de33439](https://github.com/homarr-labs/homarr/commit/de33439b22d3f5f2ff5856054cfa31a4f78ee088))
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* **deps:** update actions/setup-node action to v5 ([#4058](https://github.com/homarr-labs/homarr/issues/4058)) ([7862612](https://github.com/homarr-labs/homarr/commit/78626121ddfa5462eaad7a6933733ec03a83c04a))
|
||||||
|
|
||||||
|
## [1.36.1](https://github.com/homarr-labs/homarr/compare/v1.36.0...v1.36.1) (2025-09-05)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **dns:** disable caching by default ([#4007](https://github.com/homarr-labs/homarr/issues/4007)) ([10668ee](https://github.com/homarr-labs/homarr/commit/10668ee359940c1e24b543a7a20fe400474e12bf))
|
||||||
|
|
||||||
|
## [1.36.0](https://github.com/homarr-labs/homarr/compare/v1.35.1...v1.36.0) (2025-09-05)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **kubernetes:** add Talos providers ([#3979](https://github.com/homarr-labs/homarr/issues/3979)) ([3e59c20](https://github.com/homarr-labs/homarr/commit/3e59c20dba543634a6a79359f83c13fa81e7ccf3))
|
||||||
|
* **rss-widget:** add hide description option ([#4000](https://github.com/homarr-labs/homarr/issues/4000)) ([b2eb2c3](https://github.com/homarr-labs/homarr/commit/b2eb2c32f6995563feb3c8b4a100be3bfe1d3d80))
|
||||||
|
* **widget:** show name in edit modal ([#3970](https://github.com/homarr-labs/homarr/issues/3970)) ([d317cac](https://github.com/homarr-labs/homarr/commit/d317cacbe83394dd3f6de3e74b53f683654e91d1))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add dns caching ([#3736](https://github.com/homarr-labs/homarr/issues/3736)) ([fb6b5e8](https://github.com/homarr-labs/homarr/commit/fb6b5e88ff3a5e85d06885aed1f2a99788e04f2c))
|
||||||
|
* **deps:** tsx breaks imports like dns-caching ([#3998](https://github.com/homarr-labs/homarr/issues/3998)) ([0476543](https://github.com/homarr-labs/homarr/commit/047654351ab50a730551e61ce98065c9bb7ca3fa))
|
||||||
|
* **deps:** update dependency @ianvs/prettier-plugin-sort-imports to ^4.6.3 ([#3976](https://github.com/homarr-labs/homarr/issues/3976)) ([2b1a3de](https://github.com/homarr-labs/homarr/commit/2b1a3de8dffdd9f089b82e4bcfb304f156f60670))
|
||||||
|
* **deps:** update dependency @ianvs/prettier-plugin-sort-imports to ^4.7.0 ([#3977](https://github.com/homarr-labs/homarr/issues/3977)) ([a3dde2e](https://github.com/homarr-labs/homarr/commit/a3dde2e7ee40fcfddced43f4b5c124010f0410db))
|
||||||
|
* **deps:** update dependency @testcontainers/postgresql to ^11.5.1 ([#3948](https://github.com/homarr-labs/homarr/issues/3948)) ([9f3e68f](https://github.com/homarr-labs/homarr/commit/9f3e68fdfee5936727c97d0d99e174cd368de260))
|
||||||
|
* **deps:** update dependency dayjs to ^1.11.15 ([#3975](https://github.com/homarr-labs/homarr/issues/3975)) ([032f7ff](https://github.com/homarr-labs/homarr/commit/032f7ffd29eddd200d5434ba1c65b8cd5800c8ff))
|
||||||
|
* **deps:** update dependency dayjs to ^1.11.18 ([#3982](https://github.com/homarr-labs/homarr/issues/3982)) ([5e92e66](https://github.com/homarr-labs/homarr/commit/5e92e66803ddf9256fce8a92aec06dabe2491edc))
|
||||||
|
* **deps:** update dependency drizzle-orm to ^0.44.5 ([#3962](https://github.com/homarr-labs/homarr/issues/3962)) ([ea4960e](https://github.com/homarr-labs/homarr/commit/ea4960e11332af0062df964258d9e24def0984e7))
|
||||||
|
* **deps:** update dependency next-intl to v4.3.5 ([#3937](https://github.com/homarr-labs/homarr/issues/3937)) ([81a7f3e](https://github.com/homarr-labs/homarr/commit/81a7f3e93dfd52eea2c87cae8f2d66dd312f7055))
|
||||||
|
* **deps:** update dependency sass to ^1.91.0 ([#3965](https://github.com/homarr-labs/homarr/issues/3965)) ([0e5f43c](https://github.com/homarr-labs/homarr/commit/0e5f43c1c38a7e0186d86c29a73477f943eeb416))
|
||||||
|
* **deps:** update dependency swagger-ui-react to ^5.28.0 ([#3985](https://github.com/homarr-labs/homarr/issues/3985)) ([d2e9b5e](https://github.com/homarr-labs/homarr/commit/d2e9b5e983e2f277da30e98ad313e1afd35d70d3))
|
||||||
|
* **deps:** update dependency tsx to v4.20.5 ([#3938](https://github.com/homarr-labs/homarr/issues/3938)) ([93186c3](https://github.com/homarr-labs/homarr/commit/93186c3be1fdcf6c215efcd8d7236fc44fc74d77))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.41.0 ([#3963](https://github.com/homarr-labs/homarr/issues/3963)) ([be0e783](https://github.com/homarr-labs/homarr/commit/be0e78371eb98740f313b1abd20413cbafa68a20))
|
||||||
|
* **deps:** update dependency undici to v7.15.0 ([#3949](https://github.com/homarr-labs/homarr/issues/3949)) ([f166d15](https://github.com/homarr-labs/homarr/commit/f166d153fee521ef31a5328f082b4f52fbfd7239))
|
||||||
|
* **deps:** update dependency zod to ^4.1.1 ([#3950](https://github.com/homarr-labs/homarr/issues/3950)) ([94eb677](https://github.com/homarr-labs/homarr/commit/94eb6772b9216b6377f6306b2a88c2bfe58bfb59))
|
||||||
|
* **deps:** update dependency zod to ^4.1.5 ([#3961](https://github.com/homarr-labs/homarr/issues/3961)) ([9165422](https://github.com/homarr-labs/homarr/commit/916542210d9bfbb40abf27123f4989ec15dcd45b))
|
||||||
|
* **deps:** update dependency zod-form-data to ^3.0.1 ([#3986](https://github.com/homarr-labs/homarr/issues/3986)) ([75683c2](https://github.com/homarr-labs/homarr/commit/75683c206d06da3b54c5ab0605b2a4b37674bbd6))
|
||||||
|
* **deps:** update mantine monorepo to ^8.2.7 ([#3939](https://github.com/homarr-labs/homarr/issues/3939)) ([5d90809](https://github.com/homarr-labs/homarr/commit/5d908093ce3c8b395547681ae0a428afd08a255d))
|
||||||
|
* **deps:** update mantine monorepo to ^8.2.8 ([#4004](https://github.com/homarr-labs/homarr/issues/4004)) ([eef6b86](https://github.com/homarr-labs/homarr/commit/eef6b86ad647fe955bdb125f504b4a98a79baf03))
|
||||||
|
* **deps:** update nextjs monorepo to v15.5.1 ([#3971](https://github.com/homarr-labs/homarr/issues/3971)) ([a1def95](https://github.com/homarr-labs/homarr/commit/a1def958525816ec41198407d6d84ef9384be58f))
|
||||||
|
* **deps:** update nextjs monorepo to v15.5.2 ([#3972](https://github.com/homarr-labs/homarr/issues/3972)) ([b0fe8a9](https://github.com/homarr-labs/homarr/commit/b0fe8a9f653e09cb3f861f39f06bb8d4e8dae006))
|
||||||
|
* **deps:** update tanstack-query monorepo to ^5.85.6 ([#3996](https://github.com/homarr-labs/homarr/issues/3996)) ([4e4483c](https://github.com/homarr-labs/homarr/commit/4e4483c42d9edd3187981e57694721ff5337be8e))
|
||||||
|
* **deps:** update tanstack-query monorepo to ^5.87.1 ([#3997](https://github.com/homarr-labs/homarr/issues/3997)) ([d7146d8](https://github.com/homarr-labs/homarr/commit/d7146d82d14885cffb24e14e7e5a610fdeec1b03))
|
||||||
|
* **deps:** update trpc monorepo to ^11.5.0 ([#3951](https://github.com/homarr-labs/homarr/issues/3951)) ([88eed15](https://github.com/homarr-labs/homarr/commit/88eed15fafbc68c1c669c28ff576aca503acd585))
|
||||||
|
* **header:** avatar menu flashes when opening on mobile ([#3999](https://github.com/homarr-labs/homarr/issues/3999)) ([9cb8261](https://github.com/homarr-labs/homarr/commit/9cb8261ddc5701ff5d5786ea1fba823e1e9317b2))
|
||||||
|
* **widgets:** improve integration selection ([#3969](https://github.com/homarr-labs/homarr/issues/3969)) ([65b9ddd](https://github.com/homarr-labs/homarr/commit/65b9ddd771a573330b4c40966f10bd1fc36a6e1d))
|
||||||
|
|
||||||
|
## [1.35.1](https://github.com/homarr-labs/homarr/compare/v1.35.0...v1.35.1) (2025-09-03)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **db:** increase integration kind limit from 16 to 64 characters ([8ff29b8](https://github.com/homarr-labs/homarr/commit/8ff29b82e5133ba0b8eaf2cf88de9bca31128a68))
|
||||||
|
|
||||||
## [1.35.0](https://github.com/homarr-labs/homarr/compare/v1.34.0...v1.35.0) (2025-08-29)
|
## [1.35.0](https://github.com/homarr-labs/homarr/compare/v1.34.0...v1.35.0) (2025-08-29)
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM node:22.18.0-alpine AS base
|
FROM node:22.19.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
|
||||||
|
|||||||
@@ -42,9 +42,11 @@ const nextConfig: NextConfig = {
|
|||||||
headers: [
|
headers: [
|
||||||
{
|
{
|
||||||
key: "Content-Security-Policy",
|
key: "Content-Security-Policy",
|
||||||
|
// worker-src / media-src with blob: is necessary for video.js, see https://github.com/homarr-labs/homarr/issues/3912 and https://stackoverflow.com/questions/65792855/problem-with-video-js-and-content-security-policy-csp
|
||||||
value: `
|
value: `
|
||||||
default-src 'self';
|
default-src 'self';
|
||||||
script-src * 'unsafe-inline' 'unsafe-eval';
|
script-src * 'unsafe-inline' 'unsafe-eval';
|
||||||
|
worker-src * blob:;
|
||||||
base-uri 'self';
|
base-uri 'self';
|
||||||
connect-src *;
|
connect-src *;
|
||||||
style-src * 'unsafe-inline';
|
style-src * 'unsafe-inline';
|
||||||
@@ -53,7 +55,7 @@ const nextConfig: NextConfig = {
|
|||||||
form-action 'self';
|
form-action 'self';
|
||||||
img-src * data:;
|
img-src * data:;
|
||||||
font-src * data:;
|
font-src * data:;
|
||||||
media-src * data:;
|
media-src * data: blob:;
|
||||||
`
|
`
|
||||||
.replace(/\s{2,}/g, " ")
|
.replace(/\s{2,}/g, " ")
|
||||||
.trim(),
|
.trim(),
|
||||||
|
|||||||
+24
-24
@@ -50,57 +50,57 @@
|
|||||||
"@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.2.5",
|
"@mantine/colors-generator": "^8.2.8",
|
||||||
"@mantine/core": "^8.2.5",
|
"@mantine/core": "^8.2.8",
|
||||||
"@mantine/dropzone": "^8.2.5",
|
"@mantine/dropzone": "^8.2.8",
|
||||||
"@mantine/hooks": "^8.2.5",
|
"@mantine/hooks": "^8.2.8",
|
||||||
"@mantine/modals": "^8.2.5",
|
"@mantine/modals": "^8.2.8",
|
||||||
"@mantine/tiptap": "^8.2.5",
|
"@mantine/tiptap": "^8.2.8",
|
||||||
"@million/lint": "1.0.14",
|
"@million/lint": "1.0.14",
|
||||||
"@tabler/icons-react": "^3.34.1",
|
"@tabler/icons-react": "^3.34.1",
|
||||||
"@tanstack/react-query": "^5.85.5",
|
"@tanstack/react-query": "^5.87.1",
|
||||||
"@tanstack/react-query-devtools": "^5.85.5",
|
"@tanstack/react-query-devtools": "^5.87.1",
|
||||||
"@tanstack/react-query-next-experimental": "^5.85.5",
|
"@tanstack/react-query-next-experimental": "^5.87.1",
|
||||||
"@trpc/client": "^11.4.4",
|
"@trpc/client": "^11.5.1",
|
||||||
"@trpc/next": "^11.4.4",
|
"@trpc/next": "^11.5.1",
|
||||||
"@trpc/react-query": "^11.4.4",
|
"@trpc/react-query": "^11.5.1",
|
||||||
"@trpc/server": "^11.4.4",
|
"@trpc/server": "^11.5.1",
|
||||||
"@xterm/addon-canvas": "^0.7.0",
|
"@xterm/addon-canvas": "^0.7.0",
|
||||||
"@xterm/addon-fit": "0.10.0",
|
"@xterm/addon-fit": "0.10.0",
|
||||||
"@xterm/xterm": "^5.5.0",
|
"@xterm/xterm": "^5.5.0",
|
||||||
"chroma-js": "^3.1.2",
|
"chroma-js": "^3.1.2",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.18",
|
||||||
"dotenv": "^17.2.1",
|
"dotenv": "^17.2.2",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
"glob": "^11.0.3",
|
"glob": "^11.0.3",
|
||||||
"jotai": "^2.13.1",
|
"jotai": "^2.13.1",
|
||||||
"mantine-react-table": "2.0.0-beta.9",
|
"mantine-react-table": "2.0.0-beta.9",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"postcss-preset-mantine": "^1.18.0",
|
"postcss-preset-mantine": "^1.18.0",
|
||||||
"prismjs": "^1.30.0",
|
"prismjs": "^1.30.0",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1",
|
"react-dom": "19.1.1",
|
||||||
"react-error-boundary": "^6.0.0",
|
"react-error-boundary": "^6.0.0",
|
||||||
"react-simple-code-editor": "^0.14.1",
|
"react-simple-code-editor": "^0.14.1",
|
||||||
"sass": "^1.90.0",
|
"sass": "^1.92.1",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"swagger-ui-react": "^5.27.1",
|
"swagger-ui-react": "^5.28.1",
|
||||||
"use-deep-compare-effect": "^1.8.1",
|
"use-deep-compare-effect": "^1.8.1",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.1",
|
"@types/chroma-js": "3.1.1",
|
||||||
"@types/node": "^22.17.2",
|
"@types/node": "^22.18.1",
|
||||||
"@types/prismjs": "^1.26.5",
|
"@types/prismjs": "^1.26.5",
|
||||||
"@types/react": "19.1.10",
|
"@types/react": "19.1.12",
|
||||||
"@types/react-dom": "19.1.7",
|
"@types/react-dom": "19.1.9",
|
||||||
"@types/swagger-ui-react": "^5.18.0",
|
"@types/swagger-ui-react": "^5.18.0",
|
||||||
"concurrently": "^9.2.0",
|
"concurrently": "^9.2.1",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"node-loader": "^2.1.0",
|
"node-loader": "^2.1.0",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
|
|||||||
@@ -61,6 +61,10 @@ const getBoardAndPermissionsAsync = async (params: Awaited<Props["params"]>) =>
|
|||||||
notFound();
|
notFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (error instanceof TRPCError && error.code === "BAD_REQUEST") {
|
||||||
|
notFound();
|
||||||
|
}
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -45,6 +45,10 @@ export const createBoardLayout = <TParams extends Params>({
|
|||||||
notFound();
|
notFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (error instanceof TRPCError && error.code === "BAD_REQUEST") {
|
||||||
|
notFound();
|
||||||
|
}
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
});
|
});
|
||||||
const colorScheme = await getCurrentColorSchemeAsync();
|
const colorScheme = await getCurrentColorSchemeAsync();
|
||||||
|
|||||||
+5
@@ -1,9 +1,11 @@
|
|||||||
import {
|
import {
|
||||||
|
IconCode,
|
||||||
IconGrid3x3,
|
IconGrid3x3,
|
||||||
IconKey,
|
IconKey,
|
||||||
IconMessage,
|
IconMessage,
|
||||||
IconPassword,
|
IconPassword,
|
||||||
IconPasswordUser,
|
IconPasswordUser,
|
||||||
|
IconPlug,
|
||||||
IconServer,
|
IconServer,
|
||||||
IconUser,
|
IconUser,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
@@ -21,4 +23,7 @@ export const integrationSecretIcons = {
|
|||||||
topic: IconMessage,
|
topic: IconMessage,
|
||||||
opnsenseApiKey: IconKey,
|
opnsenseApiKey: IconKey,
|
||||||
opnsenseApiSecret: IconPassword,
|
opnsenseApiSecret: IconPassword,
|
||||||
|
githubAppId: IconCode,
|
||||||
|
githubInstallationId: IconPlug,
|
||||||
|
privateKey: IconKey,
|
||||||
} satisfies Record<IntegrationSecretKind, TablerIcon>;
|
} satisfies Record<IntegrationSecretKind, TablerIcon>;
|
||||||
+32
-4
@@ -1,7 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import type { ChangeEventHandler, FocusEventHandler } from "react";
|
import type { ChangeEventHandler, FocusEventHandler } from "react";
|
||||||
import { PasswordInput, TextInput } from "@mantine/core";
|
import { PasswordInput, Textarea, TextInput } from "@mantine/core";
|
||||||
|
|
||||||
import { integrationSecretKindObject } from "@homarr/definitions";
|
import { integrationSecretKindObject } from "@homarr/definitions";
|
||||||
import type { IntegrationSecretKind } from "@homarr/definitions";
|
import type { IntegrationSecretKind } from "@homarr/definitions";
|
||||||
@@ -14,9 +14,9 @@ interface IntegrationSecretInputProps {
|
|||||||
label?: string;
|
label?: string;
|
||||||
kind: IntegrationSecretKind;
|
kind: IntegrationSecretKind;
|
||||||
value?: string;
|
value?: string;
|
||||||
onChange: ChangeEventHandler<HTMLInputElement>;
|
onChange: ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement>;
|
||||||
onFocus?: FocusEventHandler<HTMLInputElement>;
|
onFocus?: FocusEventHandler<HTMLInputElement | HTMLTextAreaElement>;
|
||||||
onBlur?: FocusEventHandler<HTMLInputElement>;
|
onBlur?: FocusEventHandler<HTMLInputElement | HTMLTextAreaElement>;
|
||||||
error?: string;
|
error?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,6 +31,19 @@ export const IntegrationSecretInput = (props: IntegrationSecretInputProps) => {
|
|||||||
const PublicSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
|
const PublicSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const Icon = integrationSecretIcons[kind];
|
const Icon = integrationSecretIcons[kind];
|
||||||
|
const { multiline } = integrationSecretKindObject[kind];
|
||||||
|
if (multiline) {
|
||||||
|
return (
|
||||||
|
<Textarea
|
||||||
|
{...props}
|
||||||
|
label={props.label ?? t(`integration.secrets.kind.${kind}.label`)}
|
||||||
|
w="100%"
|
||||||
|
leftSection={<Icon size={20} stroke={1.5} />}
|
||||||
|
autosize
|
||||||
|
minRows={2}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TextInput
|
<TextInput
|
||||||
@@ -45,6 +58,21 @@ const PublicSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
|
|||||||
const PrivateSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
|
const PrivateSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const Icon = integrationSecretIcons[kind];
|
const Icon = integrationSecretIcons[kind];
|
||||||
|
const { multiline } = integrationSecretKindObject[kind];
|
||||||
|
|
||||||
|
if (multiline) {
|
||||||
|
return (
|
||||||
|
<Textarea
|
||||||
|
{...props}
|
||||||
|
label={props.label ?? t(`integration.secrets.kind.${kind}.label`)}
|
||||||
|
description={t("integration.secrets.secureNotice")}
|
||||||
|
w="100%"
|
||||||
|
leftSection={<Icon size={20} stroke={1.5} />}
|
||||||
|
autosize
|
||||||
|
minRows={2}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
|
|||||||
import { useModalAction } from "@homarr/modals";
|
import { useModalAction } from "@homarr/modals";
|
||||||
import { showSuccessNotification } from "@homarr/notifications";
|
import { showSuccessNotification } from "@homarr/notifications";
|
||||||
import { useSettings } from "@homarr/settings";
|
import { useSettings } from "@homarr/settings";
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
import type { BoardItemAdvancedOptions } from "@homarr/validation/shared";
|
import type { BoardItemAdvancedOptions } from "@homarr/validation/shared";
|
||||||
import { loadWidgetDynamic, reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
|
import { loadWidgetDynamic, reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
|
||||||
import { WidgetError } from "@homarr/widgets/errors";
|
import { WidgetError } from "@homarr/widgets/errors";
|
||||||
@@ -31,7 +31,7 @@ interface WidgetPreviewPageContentProps {
|
|||||||
|
|
||||||
export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPreviewPageContentProps) => {
|
export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPreviewPageContentProps) => {
|
||||||
const settings = useSettings();
|
const settings = useSettings();
|
||||||
const t = useScopedI18n("widgetPreview");
|
const t = useI18n();
|
||||||
const { openModal: openWidgetEditModal } = useModalAction(WidgetEditModal);
|
const { openModal: openWidgetEditModal } = useModalAction(WidgetEditModal);
|
||||||
const { openModal: openPreviewDimensionsModal } = useModalAction(PreviewDimensionsModal);
|
const { openModal: openPreviewDimensionsModal } = useModalAction(PreviewDimensionsModal);
|
||||||
const currentDefinition = useMemo(() => widgetImports[kind].definition, [kind]);
|
const currentDefinition = useMemo(() => widgetImports[kind].definition, [kind]);
|
||||||
@@ -55,20 +55,27 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
|
|||||||
});
|
});
|
||||||
|
|
||||||
const handleOpenEditWidgetModal = useCallback(() => {
|
const handleOpenEditWidgetModal = useCallback(() => {
|
||||||
openWidgetEditModal({
|
openWidgetEditModal(
|
||||||
kind,
|
{
|
||||||
value: state,
|
kind,
|
||||||
onSuccessfulEdit: (value) => {
|
value: state,
|
||||||
setState(value);
|
onSuccessfulEdit: (value) => {
|
||||||
|
setState(value);
|
||||||
|
},
|
||||||
|
integrationData: integrationData.filter(
|
||||||
|
(integration) =>
|
||||||
|
"supportedIntegrations" in currentDefinition &&
|
||||||
|
(currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
|
||||||
|
),
|
||||||
|
integrationSupport: "supportedIntegrations" in currentDefinition,
|
||||||
|
settings,
|
||||||
},
|
},
|
||||||
integrationData: integrationData.filter(
|
{
|
||||||
(integration) =>
|
title(t) {
|
||||||
"supportedIntegrations" in currentDefinition &&
|
return `${t("item.edit.title")} - ${t(`widget.${kind}.name`)}`;
|
||||||
(currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
|
},
|
||||||
),
|
},
|
||||||
integrationSupport: "supportedIntegrations" in currentDefinition,
|
);
|
||||||
settings,
|
|
||||||
});
|
|
||||||
}, [currentDefinition, integrationData, kind, openWidgetEditModal, settings, state]);
|
}, [currentDefinition, integrationData, kind, openWidgetEditModal, settings, state]);
|
||||||
|
|
||||||
const Comp = loadWidgetDynamic(kind);
|
const Comp = loadWidgetDynamic(kind);
|
||||||
@@ -76,7 +83,7 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
|
|||||||
const toggleEditMode = useCallback(() => {
|
const toggleEditMode = useCallback(() => {
|
||||||
setEditMode((editMode) => !editMode);
|
setEditMode((editMode) => !editMode);
|
||||||
showSuccessNotification({
|
showSuccessNotification({
|
||||||
message: editMode ? t("toggle.disabled") : t("toggle.enabled"),
|
message: editMode ? t("widgetPreview.toggle.disabled") : t("widgetPreview.toggle.enabled"),
|
||||||
});
|
});
|
||||||
}, [editMode, t]);
|
}, [editMode, t]);
|
||||||
|
|
||||||
|
|||||||
@@ -49,36 +49,43 @@ export const BoardItemMenu = ({
|
|||||||
if (!isEditMode || isPending) return null;
|
if (!isEditMode || isPending) return null;
|
||||||
|
|
||||||
const openEditModal = () => {
|
const openEditModal = () => {
|
||||||
openModal({
|
openModal(
|
||||||
kind: item.kind,
|
{
|
||||||
value: {
|
kind: item.kind,
|
||||||
advancedOptions: item.advancedOptions,
|
value: {
|
||||||
options: item.options,
|
advancedOptions: item.advancedOptions,
|
||||||
integrationIds: item.integrationIds,
|
options: item.options,
|
||||||
|
integrationIds: item.integrationIds,
|
||||||
|
},
|
||||||
|
onSuccessfulEdit: ({ options, integrationIds, advancedOptions }) => {
|
||||||
|
updateItemOptions({
|
||||||
|
itemId: item.id,
|
||||||
|
newOptions: options,
|
||||||
|
});
|
||||||
|
updateItemAdvancedOptions({
|
||||||
|
itemId: item.id,
|
||||||
|
newAdvancedOptions: advancedOptions,
|
||||||
|
});
|
||||||
|
updateItemIntegrations({
|
||||||
|
itemId: item.id,
|
||||||
|
newIntegrations: integrationIds,
|
||||||
|
});
|
||||||
|
refResetErrorBoundaryOnNextRender.current = true;
|
||||||
|
},
|
||||||
|
integrationData: (integrationData ?? []).filter(
|
||||||
|
(integration) =>
|
||||||
|
"supportedIntegrations" in currentDefinition &&
|
||||||
|
(currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
|
||||||
|
),
|
||||||
|
integrationSupport: "supportedIntegrations" in currentDefinition,
|
||||||
|
settings,
|
||||||
},
|
},
|
||||||
onSuccessfulEdit: ({ options, integrationIds, advancedOptions }) => {
|
{
|
||||||
updateItemOptions({
|
title(t) {
|
||||||
itemId: item.id,
|
return `${t("item.edit.title")} - ${t(`widget.${item.kind}.name`)}`;
|
||||||
newOptions: options,
|
},
|
||||||
});
|
|
||||||
updateItemAdvancedOptions({
|
|
||||||
itemId: item.id,
|
|
||||||
newAdvancedOptions: advancedOptions,
|
|
||||||
});
|
|
||||||
updateItemIntegrations({
|
|
||||||
itemId: item.id,
|
|
||||||
newIntegrations: integrationIds,
|
|
||||||
});
|
|
||||||
refResetErrorBoundaryOnNextRender.current = true;
|
|
||||||
},
|
},
|
||||||
integrationData: (integrationData ?? []).filter(
|
);
|
||||||
(integration) =>
|
|
||||||
"supportedIntegrations" in currentDefinition &&
|
|
||||||
(currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
|
|
||||||
),
|
|
||||||
integrationSupport: "supportedIntegrations" in currentDefinition,
|
|
||||||
settings,
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const openRemoveModal = () => {
|
const openRemoveModal = () => {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ interface Props {
|
|||||||
|
|
||||||
export const MainHeader = ({ logo, actions, hasNavigation = true }: Props) => {
|
export const MainHeader = ({ logo, actions, hasNavigation = true }: Props) => {
|
||||||
return (
|
return (
|
||||||
<AppShellHeader>
|
<AppShellHeader maw="100vw" style={{ overflowX: "hidden" }}>
|
||||||
<Group h="100%" gap="xl" px="md" justify="apart" wrap="nowrap">
|
<Group h="100%" gap="xl" px="md" justify="apart" wrap="nowrap">
|
||||||
<Group h="100%" align="center" style={{ flex: 1 }} wrap="nowrap">
|
<Group h="100%" align="center" style={{ flex: 1 }} wrap="nowrap">
|
||||||
{hasNavigation && <ClientBurger />}
|
{hasNavigation && <ClientBurger />}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/analytics": "workspace:^0.1.0",
|
"@homarr/analytics": "workspace:^0.1.0",
|
||||||
|
"@homarr/auth": "workspace:^0.1.0",
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/cron-job-api": "workspace:^0.1.0",
|
"@homarr/cron-job-api": "workspace:^0.1.0",
|
||||||
"@homarr/cron-jobs": "workspace:^0.1.0",
|
"@homarr/cron-jobs": "workspace:^0.1.0",
|
||||||
@@ -32,23 +33,24 @@
|
|||||||
"@homarr/log": "workspace:^",
|
"@homarr/log": "workspace:^",
|
||||||
"@homarr/ping": "workspace:^0.1.0",
|
"@homarr/ping": "workspace:^0.1.0",
|
||||||
"@homarr/redis": "workspace:^0.1.0",
|
"@homarr/redis": "workspace:^0.1.0",
|
||||||
|
"@homarr/request-handler": "workspace:^0.1.0",
|
||||||
"@homarr/server-settings": "workspace:^0.1.0",
|
"@homarr/server-settings": "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",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.18",
|
||||||
"dotenv": "^17.2.1",
|
"dotenv": "^17.2.2",
|
||||||
"fastify": "^5.5.0",
|
"fastify": "^5.6.0",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"undici": "7.14.0"
|
"undici": "7.15.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/node": "^22.17.2",
|
"@types/node": "^22.18.1",
|
||||||
"dotenv-cli": "^10.0.0",
|
"dotenv-cli": "^10.0.0",
|
||||||
"esbuild": "^0.25.9",
|
"esbuild": "^0.25.9",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ export class JobManager implements IJobManager {
|
|||||||
logger.info(`Updating cron job interval name="${name}" expression="${cron}"`);
|
logger.info(`Updating cron job interval name="${name}" expression="${cron}"`);
|
||||||
const job = this.jobGroup.getJobRegistry().get(name);
|
const job = this.jobGroup.getJobRegistry().get(name);
|
||||||
if (!job) throw new Error(`Job ${name} not found`);
|
if (!job) throw new Error(`Job ${name} not found`);
|
||||||
if (job.cronExpression === "never") throw new Error(`Job ${name} cannot be updated as it is set to "never"`);
|
|
||||||
if (!validateCron(cron)) {
|
if (!validateCron(cron)) {
|
||||||
throw new Error(`Invalid cron expression: ${cron}`);
|
throw new Error(`Invalid cron expression: ${cron}`);
|
||||||
}
|
}
|
||||||
@@ -45,7 +44,6 @@ export class JobManager implements IJobManager {
|
|||||||
logger.info(`Disabling cron job name="${name}"`);
|
logger.info(`Disabling cron job name="${name}"`);
|
||||||
const job = this.jobGroup.getJobRegistry().get(name);
|
const job = this.jobGroup.getJobRegistry().get(name);
|
||||||
if (!job) throw new Error(`Job ${name} not found`);
|
if (!job) throw new Error(`Job ${name} not found`);
|
||||||
if (job.cronExpression === "never") throw new Error(`Job ${name} cannot be disabled as it is set to "never"`);
|
|
||||||
|
|
||||||
await this.updateConfigurationAsync(name, { isEnabled: false });
|
await this.updateConfigurationAsync(name, { isEnabled: false });
|
||||||
await this.jobGroup.stopAsync(name);
|
await this.jobGroup.stopAsync(name);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// This import has to be the first import in the file so that the agent is overridden before any other modules are imported.
|
// This import has to be the first import in the file so that the agent is overridden before any other modules are imported.
|
||||||
import "./undici-log-agent-override";
|
import "./overrides";
|
||||||
|
|
||||||
import type { FastifyTRPCPluginOptions } from "@trpc/server/adapters/fastify";
|
import type { FastifyTRPCPluginOptions } from "@trpc/server/adapters/fastify";
|
||||||
import { fastifyTRPCPlugin } from "@trpc/server/adapters/fastify";
|
import { fastifyTRPCPlugin } from "@trpc/server/adapters/fastify";
|
||||||
@@ -13,6 +13,7 @@ import { db } from "@homarr/db";
|
|||||||
import { logger } from "@homarr/log";
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
import { JobManager } from "./job-manager";
|
import { JobManager } from "./job-manager";
|
||||||
|
import { onStartAsync } from "./on-start";
|
||||||
|
|
||||||
const server = fastify({
|
const server = fastify({
|
||||||
maxParamLength: 5000,
|
maxParamLength: 5000,
|
||||||
@@ -32,6 +33,7 @@ server.register(fastifyTRPCPlugin, {
|
|||||||
});
|
});
|
||||||
|
|
||||||
void (async () => {
|
void (async () => {
|
||||||
|
await onStartAsync();
|
||||||
await jobGroup.initializeAsync();
|
await jobGroup.initializeAsync();
|
||||||
await jobGroup.startAllAsync();
|
await jobGroup.startAllAsync();
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import { invalidateUpdateCheckerCacheAsync } from "./invalidate-update-checker-cache";
|
||||||
|
import { cleanupSessionsAsync } from "./session-cleanup";
|
||||||
|
|
||||||
|
export async function onStartAsync() {
|
||||||
|
await cleanupSessionsAsync();
|
||||||
|
await invalidateUpdateCheckerCacheAsync();
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { logger } from "@homarr/log";
|
||||||
|
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
|
||||||
|
|
||||||
|
const localLogger = logger.child({ module: "invalidateUpdateCheckerCache" });
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invalidates the update checker cache on startup to ensure fresh data.
|
||||||
|
* It is important as we want to avoid showing pending updates after the update to latest version.
|
||||||
|
*/
|
||||||
|
export async function invalidateUpdateCheckerCacheAsync() {
|
||||||
|
try {
|
||||||
|
const handler = updateCheckerRequestHandler.handler({});
|
||||||
|
await handler.invalidateAsync();
|
||||||
|
localLogger.debug("Update checker cache invalidated");
|
||||||
|
} catch (error) {
|
||||||
|
localLogger.error(new Error("Failed to invalidate update checker cache", { cause: error }));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import { env } from "@homarr/auth/env";
|
||||||
|
import { db, eq, inArray } from "@homarr/db";
|
||||||
|
import { sessions, users } from "@homarr/db/schema";
|
||||||
|
import { supportedAuthProviders } from "@homarr/definitions";
|
||||||
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
|
const localLogger = logger.child({ module: "sessionCleanup" });
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes sessions for users that have inactive auth providers.
|
||||||
|
* Sessions from other providers are deleted so they can no longer be used.
|
||||||
|
*/
|
||||||
|
export async function cleanupSessionsAsync() {
|
||||||
|
try {
|
||||||
|
const currentAuthProviders = env.AUTH_PROVIDERS;
|
||||||
|
|
||||||
|
const inactiveAuthProviders = supportedAuthProviders.filter((provider) => !currentAuthProviders.includes(provider));
|
||||||
|
const subQuery = db
|
||||||
|
.select({ id: users.id })
|
||||||
|
.from(users)
|
||||||
|
.where(inArray(users.provider, inactiveAuthProviders))
|
||||||
|
.as("sq");
|
||||||
|
const sessionsWithInactiveProviders = await db
|
||||||
|
.select({ userId: sessions.userId })
|
||||||
|
.from(sessions)
|
||||||
|
.rightJoin(subQuery, eq(sessions.userId, subQuery.id));
|
||||||
|
|
||||||
|
const userIds = sessionsWithInactiveProviders.map(({ userId }) => userId).filter((value) => value !== null);
|
||||||
|
await db.delete(sessions).where(inArray(sessions.userId, userIds));
|
||||||
|
|
||||||
|
if (sessionsWithInactiveProviders.length > 0) {
|
||||||
|
localLogger.info(`Deleted sessions for inactive providers count=${userIds.length}`);
|
||||||
|
} else {
|
||||||
|
localLogger.debug("No sessions to delete");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
localLogger.error(new Error("Failed to clean up sessions", { cause: error }));
|
||||||
|
}
|
||||||
|
}
|
||||||
File renamed without changes.
@@ -25,7 +25,7 @@
|
|||||||
"@homarr/log": "workspace:^",
|
"@homarr/log": "workspace:^",
|
||||||
"@homarr/redis": "workspace:^0.1.0",
|
"@homarr/redis": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"dotenv": "^17.2.1",
|
"dotenv": "^17.2.2",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"ws": "^8.18.3"
|
"ws": "^8.18.3"
|
||||||
},
|
},
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/ws": "^8.18.1",
|
"@types/ws": "^8.18.1",
|
||||||
"esbuild": "^0.25.9",
|
"esbuild": "^0.25.9",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -293,6 +293,13 @@
|
|||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
|
<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" />
|
||||||
|
<br/>
|
||||||
|
<p align="center">TrueNAS</p>
|
||||||
|
</a>
|
||||||
|
</td></tr>
|
||||||
|
<tr><td align="center">
|
||||||
<a href="https://homarr.dev/docs/integrations/unifi-controller" target="_blank" rel="noreferrer noopener">
|
<a href="https://homarr.dev/docs/integrations/unifi-controller" target="_blank" rel="noreferrer noopener">
|
||||||
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/unifi.png" alt="Unifi Controller" width="90" height="90" />
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/unifi.png" alt="Unifi Controller" width="90" height="90" />
|
||||||
<br/>
|
<br/>
|
||||||
|
|||||||
+21
-21
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "homarr",
|
"name": "homarr",
|
||||||
"version": "1.35.0",
|
"version": "1.37.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "cross-env CI=true turbo build",
|
"build": "cross-env CI=true turbo build",
|
||||||
@@ -39,28 +39,28 @@
|
|||||||
"@semantic-release/changelog": "^6.0.3",
|
"@semantic-release/changelog": "^6.0.3",
|
||||||
"@semantic-release/commit-analyzer": "^13.0.1",
|
"@semantic-release/commit-analyzer": "^13.0.1",
|
||||||
"@semantic-release/git": "^10.0.1",
|
"@semantic-release/git": "^10.0.1",
|
||||||
"@semantic-release/github": "^11.0.4",
|
"@semantic-release/github": "^11.0.5",
|
||||||
"@semantic-release/npm": "^12.0.2",
|
"@semantic-release/npm": "^12.0.2",
|
||||||
"@semantic-release/release-notes-generator": "^14.0.3",
|
"@semantic-release/release-notes-generator": "^14.1.0",
|
||||||
"@testcontainers/redis": "^11.5.1",
|
"@testcontainers/redis": "^11.5.1",
|
||||||
"@turbo/gen": "^2.5.6",
|
"@turbo/gen": "^2.5.6",
|
||||||
"@vitejs/plugin-react": "^5.0.1",
|
"@vitejs/plugin-react": "^5.0.2",
|
||||||
"@vitest/coverage-v8": "^3.2.4",
|
"@vitest/coverage-v8": "^3.2.4",
|
||||||
"@vitest/ui": "^3.2.4",
|
"@vitest/ui": "^3.2.4",
|
||||||
"conventional-changelog-conventionalcommits": "^9.1.0",
|
"conventional-changelog-conventionalcommits": "^9.1.0",
|
||||||
"cross-env": "^10.0.0",
|
"cross-env": "^10.0.0",
|
||||||
"jsdom": "^26.1.0",
|
"jsdom": "^26.1.0",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"semantic-release": "^24.2.7",
|
"semantic-release": "^24.2.8",
|
||||||
"testcontainers": "^11.5.1",
|
"testcontainers": "^11.5.1",
|
||||||
"turbo": "^2.5.6",
|
"turbo": "^2.5.6",
|
||||||
"typescript": "^5.9.2",
|
"typescript": "^5.9.2",
|
||||||
"vite-tsconfig-paths": "^5.1.4",
|
"vite-tsconfig-paths": "^5.1.4",
|
||||||
"vitest": "^3.2.4"
|
"vitest": "^3.2.4"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@10.15.0",
|
"packageManager": "pnpm@10.15.1",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=22.18.0"
|
"node": ">=22.19.0"
|
||||||
},
|
},
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"onlyBuiltDependencies": [
|
"onlyBuiltDependencies": [
|
||||||
@@ -75,24 +75,24 @@
|
|||||||
"tree-sitter-json"
|
"tree-sitter-json"
|
||||||
],
|
],
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"@babel/helpers@<7.26.10": ">=7.26.10",
|
"@babel/helpers@<7.26.10": ">=7.28.4",
|
||||||
"@babel/runtime@<7.26.10": ">=7.26.10",
|
"@babel/runtime@<7.26.10": ">=7.28.4",
|
||||||
"axios@>=1.0.0 <1.8.2": ">=1.8.2",
|
"axios@>=1.0.0 <1.8.2": ">=1.12.1",
|
||||||
"brace-expansion@>=2.0.0 <=2.0.1": ">=2.0.2",
|
"brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1",
|
||||||
"brace-expansion@>=1.0.0 <=1.1.11": ">=1.1.12",
|
"brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1",
|
||||||
"esbuild@<=0.24.2": ">=0.25.0",
|
"esbuild@<=0.24.2": ">=0.25.9",
|
||||||
"form-data@>=4.0.0 <4.0.4": ">=4.0.4",
|
"form-data@>=4.0.0 <4.0.4": ">=4.0.4",
|
||||||
"hono@<4.6.5": ">=4.6.5",
|
"hono@<4.6.5": ">=4.9.6",
|
||||||
"linkifyjs@<4.3.2": ">=4.3.2",
|
"linkifyjs@<4.3.2": ">=4.3.2",
|
||||||
"nanoid@>=4.0.0 <5.0.9": ">=5.0.9",
|
"nanoid@>=4.0.0 <5.0.9": ">=5.1.5",
|
||||||
"prismjs@<1.30.0": ">=1.30.0",
|
"prismjs@<1.30.0": ">=1.30.0",
|
||||||
"proxmox-api>undici": "7.14.0",
|
"proxmox-api>undici": "7.15.0",
|
||||||
"rollup@>=4.0.0 <4.22.4": ">=4.22.4",
|
"rollup@>=4.0.0 <4.22.4": ">=4.50.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.0.9",
|
"tar-fs@>=3.0.0 <3.0.9": ">=3.1.0",
|
||||||
"tar-fs@>=2.0.0 <2.1.3": ">=2.1.3",
|
"tar-fs@>=2.0.0 <2.1.3": ">=3.1.0",
|
||||||
"tmp@<=0.2.3": ">=0.2.4",
|
"tmp@<=0.2.3": ">=0.2.5",
|
||||||
"vite@>=5.0.0 <=5.4.18": ">=5.4.19"
|
"vite@>=5.0.0 <=5.4.18": ">=7.1.5"
|
||||||
},
|
},
|
||||||
"patchedDependencies": {
|
"patchedDependencies": {
|
||||||
"@types/node-unifi": "patches/@types__node-unifi.patch",
|
"@types/node-unifi": "patches/@types__node-unifi.patch",
|
||||||
|
|||||||
@@ -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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -42,24 +42,24 @@
|
|||||||
"@homarr/server-settings": "workspace:^0.1.0",
|
"@homarr/server-settings": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@kubernetes/client-node": "^1.3.0",
|
"@kubernetes/client-node": "^1.3.0",
|
||||||
"@tanstack/react-query": "^5.85.5",
|
"@tanstack/react-query": "^5.87.1",
|
||||||
"@trpc/client": "^11.4.4",
|
"@trpc/client": "^11.5.1",
|
||||||
"@trpc/react-query": "^11.4.4",
|
"@trpc/react-query": "^11.5.1",
|
||||||
"@trpc/server": "^11.4.4",
|
"@trpc/server": "^11.5.1",
|
||||||
"@trpc/tanstack-react-query": "^11.4.4",
|
"@trpc/tanstack-react-query": "^11.5.1",
|
||||||
"lodash.clonedeep": "^4.5.0",
|
"lodash.clonedeep": "^4.5.0",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1",
|
"react-dom": "19.1.1",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"trpc-to-openapi": "^3.0.1",
|
"trpc-to-openapi": "^3.0.1",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,16 +25,6 @@ export const testConnectionAsync = async (
|
|||||||
integrationUrl: integration.url,
|
integrationUrl: integration.url,
|
||||||
});
|
});
|
||||||
|
|
||||||
const formSecrets = integration.secrets
|
|
||||||
.filter((secret) => secret.value !== null)
|
|
||||||
.map((secret) => ({
|
|
||||||
...secret,
|
|
||||||
// We ensured above that the value is not null
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
||||||
value: secret.value!,
|
|
||||||
source: "form" as const,
|
|
||||||
}));
|
|
||||||
|
|
||||||
const decryptedDbSecrets = dbSecrets
|
const decryptedDbSecrets = dbSecrets
|
||||||
.map((secret) => {
|
.map((secret) => {
|
||||||
try {
|
try {
|
||||||
@@ -55,6 +45,15 @@ export const testConnectionAsync = async (
|
|||||||
})
|
})
|
||||||
.filter((secret) => secret !== null);
|
.filter((secret) => secret !== null);
|
||||||
|
|
||||||
|
const formSecrets = integration.secrets
|
||||||
|
.map((secret) => ({
|
||||||
|
...secret,
|
||||||
|
// If the value is not defined in the form (because we only changed other values) we use the existing value from the db if it exists
|
||||||
|
value: secret.value ?? decryptedDbSecrets.find((dbSecret) => dbSecret.kind === secret.kind)?.value ?? null,
|
||||||
|
source: "form" as const,
|
||||||
|
}))
|
||||||
|
.filter((secret): secret is SourcedIntegrationSecret<"form"> => secret.value !== null);
|
||||||
|
|
||||||
const sourcedSecrets = [...formSecrets, ...decryptedDbSecrets];
|
const sourcedSecrets = [...formSecrets, ...decryptedDbSecrets];
|
||||||
const secretKinds = getSecretKindOption(integration.kind, sourcedSecrets);
|
const secretKinds = getSecretKindOption(integration.kind, sourcedSecrets);
|
||||||
|
|
||||||
@@ -89,10 +88,10 @@ export const testConnectionAsync = async (
|
|||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
interface SourcedIntegrationSecret {
|
interface SourcedIntegrationSecret<TSource extends string = "db" | "form"> {
|
||||||
kind: IntegrationSecretKind;
|
kind: IntegrationSecretKind;
|
||||||
value: string;
|
value: string;
|
||||||
source: "db" | "form";
|
source: TSource;
|
||||||
}
|
}
|
||||||
|
|
||||||
const getSecretKindOption = (kind: IntegrationKind, sourcedSecrets: SourcedIntegrationSecret[]) => {
|
const getSecretKindOption = (kind: IntegrationKind, sourcedSecrets: SourcedIntegrationSecret[]) => {
|
||||||
@@ -111,7 +110,9 @@ const getSecretKindOption = (kind: IntegrationKind, sourcedSecrets: SourcedInteg
|
|||||||
}
|
}
|
||||||
|
|
||||||
const onlyFormSecretsKindOptions = matchingSecretKindOptions.filter((secretKinds) =>
|
const onlyFormSecretsKindOptions = matchingSecretKindOptions.filter((secretKinds) =>
|
||||||
sourcedSecrets.filter((secret) => secretKinds.includes(secret.kind)).every((secret) => secret.source === "form"),
|
secretKinds.every((secretKind) =>
|
||||||
|
sourcedSecrets.find((secret) => secret.kind === secretKind && secret.source === "form"),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
if (onlyFormSecretsKindOptions.length >= 1) {
|
if (onlyFormSecretsKindOptions.length >= 1) {
|
||||||
|
|||||||
@@ -184,12 +184,23 @@ function getProviders(versionInfo: VersionInfo, nodes: V1NodeList) {
|
|||||||
if (versionInfo.gitVersion.includes("aks")) providers.add("AKS");
|
if (versionInfo.gitVersion.includes("aks")) providers.add("AKS");
|
||||||
|
|
||||||
nodes.items.forEach((node) => {
|
nodes.items.forEach((node) => {
|
||||||
const nodeProviderLabel =
|
const labels = node.metadata?.labels ?? {};
|
||||||
node.metadata?.labels?.["node.kubernetes.io/instance-type"] ?? node.metadata?.labels?.provider ?? "";
|
const nodeProviderLabel = labels["node.kubernetes.io/instance-type"] ?? labels.provider ?? "";
|
||||||
|
|
||||||
if (nodeProviderLabel.includes("aws")) providers.add("EKS");
|
if (nodeProviderLabel.includes("aws")) providers.add("EKS");
|
||||||
if (nodeProviderLabel.includes("azure")) providers.add("AKS");
|
if (nodeProviderLabel.includes("azure")) providers.add("AKS");
|
||||||
if (nodeProviderLabel.includes("gce")) providers.add("GKE");
|
if (nodeProviderLabel.includes("gce")) providers.add("GKE");
|
||||||
if (nodeProviderLabel.includes("k3s")) providers.add("k3s");
|
if (nodeProviderLabel.includes("k3s")) providers.add("k3s");
|
||||||
|
|
||||||
|
const nodeInfo = node.status?.nodeInfo;
|
||||||
|
if (nodeInfo) {
|
||||||
|
const osImage = nodeInfo.osImage.toLowerCase();
|
||||||
|
const kernelVersion = nodeInfo.kernelVersion.toLowerCase();
|
||||||
|
|
||||||
|
if (osImage.includes("talos") || kernelVersion.includes("talos")) {
|
||||||
|
providers.add("Talos");
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return Array.from(providers).join(", ");
|
return Array.from(providers).join(", ");
|
||||||
|
|||||||
@@ -265,4 +265,77 @@ describe("testConnectionAsync should run test connection of integration", () =>
|
|||||||
],
|
],
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("with input of existing github app", async () => {
|
||||||
|
// Arrange
|
||||||
|
const factorySpy = vi.spyOn(homarrIntegrations, "createIntegrationAsync");
|
||||||
|
const optionsSpy = vi.spyOn(homarrDefinitions, "getAllSecretKindOptions");
|
||||||
|
factorySpy.mockReturnValue(
|
||||||
|
Promise.resolve({
|
||||||
|
testConnectionAsync: async () => await Promise.resolve({ success: true }),
|
||||||
|
} as homarrIntegrations.PiHoleIntegrationV6),
|
||||||
|
);
|
||||||
|
optionsSpy.mockReturnValue([[], ["githubAppId", "githubInstallationId", "privateKey"]]);
|
||||||
|
|
||||||
|
const integration = {
|
||||||
|
id: "new",
|
||||||
|
name: "GitHub",
|
||||||
|
url: "https://api.github.com",
|
||||||
|
kind: "github" as const,
|
||||||
|
secrets: [
|
||||||
|
{
|
||||||
|
kind: "githubAppId" as const,
|
||||||
|
value: "345",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "githubInstallationId" as const,
|
||||||
|
value: "456",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "privateKey" as const,
|
||||||
|
value: null,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
const dbSecrets = [
|
||||||
|
{
|
||||||
|
kind: "githubAppId" as const,
|
||||||
|
value: "123.encrypted" as const,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "githubInstallationId" as const,
|
||||||
|
value: "234.encrypted" as const,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "privateKey" as const,
|
||||||
|
value: "privateKey.encrypted" as const,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await testConnectionAsync(integration, dbSecrets);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expect(factorySpy).toHaveBeenCalledWith({
|
||||||
|
id: "new",
|
||||||
|
name: "GitHub",
|
||||||
|
url: "https://api.github.com",
|
||||||
|
kind: "github" as const,
|
||||||
|
decryptedSecrets: [
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: "githubAppId",
|
||||||
|
value: "345",
|
||||||
|
}),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: "githubInstallationId",
|
||||||
|
value: "456",
|
||||||
|
}),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: "privateKey",
|
||||||
|
value: "privateKey",
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -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", "mock"))
|
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "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", "mock"))
|
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "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)[] = [];
|
||||||
|
|||||||
@@ -35,11 +35,11 @@
|
|||||||
"bcrypt": "^6.0.0",
|
"bcrypt": "^6.0.0",
|
||||||
"cookies": "^0.9.1",
|
"cookies": "^0.9.1",
|
||||||
"ldapts": "8.0.9",
|
"ldapts": "8.0.9",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"next-auth": "5.0.0-beta.29",
|
"next-auth": "5.0.0-beta.29",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1",
|
"react-dom": "19.1.1",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/bcrypt": "6.0.0",
|
"@types/bcrypt": "6.0.0",
|
||||||
"@types/cookies": "0.9.1",
|
"@types/cookies": "0.9.1",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,13 +24,13 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/db": "workspace:^0.1.0",
|
"@homarr/db": "workspace:^0.1.0",
|
||||||
"undici": "7.14.0"
|
"undici": "7.15.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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -28,14 +28,14 @@
|
|||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/db": "workspace:^0.1.0",
|
"@homarr/db": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"dotenv": "^17.2.1"
|
"dotenv": "^17.2.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",
|
||||||
"esbuild": "^0.25.9",
|
"esbuild": "^0.25.9",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,10 +24,12 @@ export const env = createEnv({
|
|||||||
message: `SECRET_ENCRYPTION_KEY must only contain hex characters${errorSuffix}`,
|
message: `SECRET_ENCRYPTION_KEY must only contain hex characters${errorSuffix}`,
|
||||||
}),
|
}),
|
||||||
NO_EXTERNAL_CONNECTION: createBooleanSchema(false),
|
NO_EXTERNAL_CONNECTION: createBooleanSchema(false),
|
||||||
|
ENABLE_DNS_CACHING: createBooleanSchema(false),
|
||||||
},
|
},
|
||||||
runtimeEnv: {
|
runtimeEnv: {
|
||||||
SECRET_ENCRYPTION_KEY: process.env.SECRET_ENCRYPTION_KEY,
|
SECRET_ENCRYPTION_KEY: process.env.SECRET_ENCRYPTION_KEY,
|
||||||
NODE_ENV: process.env.NODE_ENV,
|
NODE_ENV: process.env.NODE_ENV,
|
||||||
NO_EXTERNAL_CONNECTION: process.env.NO_EXTERNAL_CONNECTION,
|
NO_EXTERNAL_CONNECTION: process.env.NO_EXTERNAL_CONNECTION,
|
||||||
|
ENABLE_DNS_CACHING: process.env.ENABLE_DNS_CACHING,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
".": "./index.ts",
|
".": "./index.ts",
|
||||||
"./types": "./src/types.ts",
|
"./types": "./src/types.ts",
|
||||||
"./server": "./src/server.ts",
|
"./server": "./src/server.ts",
|
||||||
|
"./init-dns": "./src/dns.ts",
|
||||||
"./client": "./src/client.ts",
|
"./client": "./src/client.ts",
|
||||||
"./env": "./env.ts"
|
"./env": "./env.ts"
|
||||||
},
|
},
|
||||||
@@ -29,19 +30,21 @@
|
|||||||
"@homarr/core": "workspace:^0.1.0",
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^0.1.0",
|
"@homarr/log": "workspace:^0.1.0",
|
||||||
"@paralleldrive/cuid2": "^2.2.2",
|
"@paralleldrive/cuid2": "^2.2.2",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.18",
|
||||||
"next": "15.5.0",
|
"dns-caching": "^0.2.5",
|
||||||
|
"next": "15.5.2",
|
||||||
|
"octokit": "^5.0.3",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1",
|
"react-dom": "19.1.1",
|
||||||
"undici": "7.14.0",
|
"undici": "7.15.0",
|
||||||
"zod": "^4.0.17",
|
"zod": "^4.1.5",
|
||||||
"zod-validation-error": "^4.0.1"
|
"zod-validation-error": "^4.0.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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { DnsCacheManager } from "dns-caching";
|
||||||
|
|
||||||
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
|
import { env } from "../env";
|
||||||
|
|
||||||
|
// Add global type augmentation for homarr
|
||||||
|
declare global {
|
||||||
|
var homarr: {
|
||||||
|
dnsCacheManager?: DnsCacheManager;
|
||||||
|
// add other properties if needed
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize global.homarr if not present
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
||||||
|
global.homarr ??= {};
|
||||||
|
global.homarr.dnsCacheManager ??= new DnsCacheManager({
|
||||||
|
cacheMaxEntries: 1000,
|
||||||
|
forceMinTtl: 5 * 60 * 1000, // 5 minutes
|
||||||
|
logger,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (env.ENABLE_DNS_CACHING) {
|
||||||
|
global.homarr.dnsCacheManager.initialize();
|
||||||
|
}
|
||||||
@@ -3,3 +3,4 @@ export * from "./fetch-http-error-handler";
|
|||||||
export * from "./ofetch-http-error-handler";
|
export * from "./ofetch-http-error-handler";
|
||||||
export * from "./axios-http-error-handler";
|
export * from "./axios-http-error-handler";
|
||||||
export * from "./tsdav-http-error-handler";
|
export * from "./tsdav-http-error-handler";
|
||||||
|
export * from "./octokit-http-error-handler";
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { RequestError as OctokitRequestError } from "octokit";
|
||||||
|
|
||||||
|
import type { AnyRequestError } from "../request-error";
|
||||||
|
import { ResponseError } from "../response-error";
|
||||||
|
import { HttpErrorHandler } from "./http-error-handler";
|
||||||
|
|
||||||
|
export class OctokitHttpErrorHandler extends HttpErrorHandler {
|
||||||
|
/**
|
||||||
|
* I wasn't able to get a request error triggered. Therefore we ignore them for now
|
||||||
|
* and just forward them as unknown errors
|
||||||
|
*/
|
||||||
|
handleRequestError(_: unknown): AnyRequestError | undefined {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
handleResponseError(error: unknown): ResponseError | undefined {
|
||||||
|
if (!(error instanceof OctokitRequestError)) return undefined;
|
||||||
|
|
||||||
|
return new ResponseError({
|
||||||
|
status: error.status,
|
||||||
|
url: error.response?.url,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,9 @@ import { Agent } from "undici";
|
|||||||
|
|
||||||
import { logger } from "@homarr/log";
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
|
// The below import statement initializes dns-caching
|
||||||
|
import "./dns";
|
||||||
|
|
||||||
export class LoggingAgent extends Agent {
|
export class LoggingAgent extends Agent {
|
||||||
constructor(...props: ConstructorParameters<typeof Agent>) {
|
constructor(...props: ConstructorParameters<typeof Agent>) {
|
||||||
super(...props);
|
super(...props);
|
||||||
|
|||||||
@@ -26,13 +26,13 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@t3-oss/env-nextjs": "^0.13.8",
|
"@t3-oss/env-nextjs": "^0.13.8",
|
||||||
"ioredis": "5.7.0",
|
"ioredis": "5.7.0",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,21 +29,21 @@
|
|||||||
"@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",
|
||||||
"@homarr/log": "workspace:^0.1.0",
|
"@homarr/log": "workspace:^0.1.0",
|
||||||
"@tanstack/react-query": "^5.85.5",
|
"@tanstack/react-query": "^5.87.1",
|
||||||
"@trpc/client": "^11.4.4",
|
"@trpc/client": "^11.5.1",
|
||||||
"@trpc/server": "^11.4.4",
|
"@trpc/server": "^11.5.1",
|
||||||
"@trpc/tanstack-react-query": "^11.4.4",
|
"@trpc/tanstack-react-query": "^11.5.1",
|
||||||
"node-cron": "^4.2.1",
|
"node-cron": "^4.2.1",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.1.10",
|
"@types/react": "19.1.12",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
"@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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,8 +72,6 @@ const createCallback = <TAllowedNames extends string, TName extends TAllowedName
|
|||||||
where: (cronJobConfigurations, { eq }) => eq(cronJobConfigurations.name, name),
|
where: (cronJobConfigurations, { eq }) => eq(cronJobConfigurations.name, name),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (defaultCronExpression === "never") return null;
|
|
||||||
|
|
||||||
const scheduledTask = createTask(
|
const scheduledTask = createTask(
|
||||||
configuration?.cronExpression ?? defaultCronExpression,
|
configuration?.cronExpression ?? defaultCronExpression,
|
||||||
() => void catchingCallbackAsync(),
|
() => void catchingCallbackAsync(),
|
||||||
@@ -120,7 +118,7 @@ export const createCronJobCreator = <TAllowedNames extends string = string>(
|
|||||||
options: CreateCronJobOptions = { runOnStart: false },
|
options: CreateCronJobOptions = { runOnStart: false },
|
||||||
) => {
|
) => {
|
||||||
creatorOptions.logger.logDebug(`Validating cron expression '${defaultCronExpression}' for job: ${name}`);
|
creatorOptions.logger.logDebug(`Validating cron expression '${defaultCronExpression}' for job: ${name}`);
|
||||||
if (defaultCronExpression !== "never" && !validate(defaultCronExpression)) {
|
if (!validate(defaultCronExpression)) {
|
||||||
throw new Error(`Invalid cron expression '${defaultCronExpression}' for job '${name}'`);
|
throw new Error(`Invalid cron expression '${defaultCronExpression}' for job '${name}'`);
|
||||||
}
|
}
|
||||||
creatorOptions.logger.logDebug(`Cron job expression '${defaultCronExpression}' for job ${name} is valid`);
|
creatorOptions.logger.logDebug(`Cron job expression '${defaultCronExpression}' for job ${name} is valid`);
|
||||||
@@ -132,8 +130,6 @@ export const createCronJobCreator = <TAllowedNames extends string = string>(
|
|||||||
// This is a type guard to check if the cron expression is valid and give the user a type hint
|
// This is a type guard to check if the cron expression is valid and give the user a type hint
|
||||||
return returnValue as unknown as ValidateCron<TExpression> extends true
|
return returnValue as unknown as ValidateCron<TExpression> extends true
|
||||||
? typeof returnValue
|
? typeof returnValue
|
||||||
: TExpression extends "never"
|
: "Invalid cron expression";
|
||||||
? typeof returnValue
|
|
||||||
: "Invalid cron expression";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -8,4 +8,3 @@ export const EVERY_10_MINUTES = checkCron("*/10 * * * *") satisfies string;
|
|||||||
export const EVERY_HOUR = checkCron("0 * * * *") satisfies string;
|
export const EVERY_HOUR = checkCron("0 * * * *") satisfies string;
|
||||||
export const EVERY_DAY = checkCron("0 0 * * */1") satisfies string;
|
export const EVERY_DAY = checkCron("0 0 * * */1") satisfies string;
|
||||||
export const EVERY_WEEK = checkCron("0 0 * * 1") satisfies string;
|
export const EVERY_WEEK = checkCron("0 0 * * 1") satisfies string;
|
||||||
export const NEVER = "never";
|
|
||||||
@@ -45,7 +45,6 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const scheduledTask = await job.createTaskAsync();
|
const scheduledTask = await job.createTaskAsync();
|
||||||
if (!scheduledTask) continue;
|
|
||||||
|
|
||||||
tasks.set(job.name, scheduledTask);
|
tasks.set(job.name, scheduledTask);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -21,7 +21,6 @@ import { refreshNotificationsJob } from "./jobs/integrations/notifications";
|
|||||||
import { minecraftServerStatusJob } from "./jobs/minecraft-server-status";
|
import { minecraftServerStatusJob } from "./jobs/minecraft-server-status";
|
||||||
import { pingJob } from "./jobs/ping";
|
import { pingJob } from "./jobs/ping";
|
||||||
import { rssFeedsJob } from "./jobs/rss-feeds";
|
import { rssFeedsJob } from "./jobs/rss-feeds";
|
||||||
import { sessionCleanupJob } from "./jobs/session-cleanup";
|
|
||||||
import { updateCheckerJob } from "./jobs/update-checker";
|
import { updateCheckerJob } from "./jobs/update-checker";
|
||||||
import { createCronJobGroup } from "./lib";
|
import { createCronJobGroup } from "./lib";
|
||||||
|
|
||||||
@@ -39,7 +38,6 @@ export const jobGroup = createCronJobGroup({
|
|||||||
rssFeeds: rssFeedsJob,
|
rssFeeds: rssFeedsJob,
|
||||||
indexerManager: indexerManagerJob,
|
indexerManager: indexerManagerJob,
|
||||||
healthMonitoring: healthMonitoringJob,
|
healthMonitoring: healthMonitoringJob,
|
||||||
sessionCleanup: sessionCleanupJob,
|
|
||||||
updateChecker: updateCheckerJob,
|
updateChecker: updateCheckerJob,
|
||||||
mediaTranscoding: mediaTranscodingJob,
|
mediaTranscoding: mediaTranscodingJob,
|
||||||
minecraftServerStatus: minecraftServerStatusJob,
|
minecraftServerStatus: minecraftServerStatusJob,
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
import { env } from "@homarr/auth/env";
|
|
||||||
import { NEVER } from "@homarr/cron-jobs-core/expressions";
|
|
||||||
import { db, eq, inArray } from "@homarr/db";
|
|
||||||
import { sessions, users } from "@homarr/db/schema";
|
|
||||||
import { supportedAuthProviders } from "@homarr/definitions";
|
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { createCronJob } from "../lib";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes sessions for users that have inactive auth providers.
|
|
||||||
* Sessions from other providers are deleted so they can no longer be used.
|
|
||||||
*/
|
|
||||||
export const sessionCleanupJob = createCronJob("sessionCleanup", NEVER, {
|
|
||||||
runOnStart: true,
|
|
||||||
}).withCallback(async () => {
|
|
||||||
const currentAuthProviders = env.AUTH_PROVIDERS;
|
|
||||||
|
|
||||||
const inactiveAuthProviders = supportedAuthProviders.filter((provider) => !currentAuthProviders.includes(provider));
|
|
||||||
const subQuery = db
|
|
||||||
.select({ id: users.id })
|
|
||||||
.from(users)
|
|
||||||
.where(inArray(users.provider, inactiveAuthProviders))
|
|
||||||
.as("sq");
|
|
||||||
const sessionsWithInactiveProviders = await db
|
|
||||||
.select({ userId: sessions.userId })
|
|
||||||
.from(sessions)
|
|
||||||
.rightJoin(subQuery, eq(sessions.userId, subQuery.id));
|
|
||||||
|
|
||||||
const userIds = sessionsWithInactiveProviders.map(({ userId }) => userId).filter((value) => value !== null);
|
|
||||||
await db.delete(sessions).where(inArray(sessions.userId, userIds));
|
|
||||||
|
|
||||||
if (sessionsWithInactiveProviders.length > 0) {
|
|
||||||
logger.info(`Deleted sessions for inactive providers count=${userIds.length}`);
|
|
||||||
} else {
|
|
||||||
logger.debug("No sessions to delete");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE `integrationSecret` MODIFY COLUMN `kind` varchar(64) NOT NULL;
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -246,6 +246,13 @@
|
|||||||
"when": 1754929897145,
|
"when": 1754929897145,
|
||||||
"tag": "0034_increase-blob-size",
|
"tag": "0034_increase-blob-size",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 35,
|
||||||
|
"version": "5",
|
||||||
|
"when": 1756701556908,
|
||||||
|
"tag": "0035_increase-secret-kind-length",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "integrationSecret" ALTER COLUMN "kind" SET DATA TYPE varchar(64);
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -8,6 +8,13 @@
|
|||||||
"when": 1754853510707,
|
"when": 1754853510707,
|
||||||
"tag": "0000_initial",
|
"tag": "0000_initial",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 1,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1756701573101,
|
||||||
|
"tag": "0001_increase-secret-kind-length",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -49,16 +49,16 @@
|
|||||||
"@homarr/definitions": "workspace:^0.1.0",
|
"@homarr/definitions": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^0.1.0",
|
"@homarr/log": "workspace:^0.1.0",
|
||||||
"@homarr/server-settings": "workspace:^0.1.0",
|
"@homarr/server-settings": "workspace:^0.1.0",
|
||||||
"@mantine/core": "^8.2.5",
|
"@mantine/core": "^8.2.8",
|
||||||
"@paralleldrive/cuid2": "^2.2.2",
|
"@paralleldrive/cuid2": "^2.2.2",
|
||||||
"@testcontainers/mysql": "^11.5.1",
|
"@testcontainers/mysql": "^11.5.1",
|
||||||
"@testcontainers/postgresql": "^11.4.0",
|
"@testcontainers/postgresql": "^11.5.1",
|
||||||
"better-sqlite3": "^12.2.0",
|
"better-sqlite3": "^12.2.0",
|
||||||
"dotenv": "^17.2.1",
|
"dotenv": "^17.2.2",
|
||||||
"drizzle-kit": "^0.31.4",
|
"drizzle-kit": "^0.31.4",
|
||||||
"drizzle-orm": "^0.44.4",
|
"drizzle-orm": "^0.44.5",
|
||||||
"drizzle-zod": "^0.8.3",
|
"drizzle-zod": "^0.8.3",
|
||||||
"mysql2": "3.14.3",
|
"mysql2": "3.14.4",
|
||||||
"pg": "^8.16.3",
|
"pg": "^8.16.3",
|
||||||
"superjson": "2.2.2"
|
"superjson": "2.2.2"
|
||||||
},
|
},
|
||||||
@@ -67,10 +67,10 @@
|
|||||||
"@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/better-sqlite3": "7.6.13",
|
"@types/better-sqlite3": "7.6.13",
|
||||||
"@types/pg": "^8.15.4",
|
"@types/pg": "^8.15.5",
|
||||||
"dotenv-cli": "^10.0.0",
|
"dotenv-cli": "^10.0.0",
|
||||||
"esbuild": "^0.25.9",
|
"esbuild": "^0.25.9",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ export const integrations = mysqlTable(
|
|||||||
export const integrationSecrets = mysqlTable(
|
export const integrationSecrets = mysqlTable(
|
||||||
"integrationSecret",
|
"integrationSecret",
|
||||||
{
|
{
|
||||||
kind: varchar({ length: 16 }).$type<IntegrationSecretKind>().notNull(),
|
kind: varchar({ length: 64 }).$type<IntegrationSecretKind>().notNull(),
|
||||||
value: text().$type<`${string}.${string}`>().notNull(),
|
value: text().$type<`${string}.${string}`>().notNull(),
|
||||||
updatedAt: timestamp()
|
updatedAt: timestamp()
|
||||||
.$onUpdateFn(() => new Date())
|
.$onUpdateFn(() => new Date())
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ export const integrations = pgTable(
|
|||||||
export const integrationSecrets = pgTable(
|
export const integrationSecrets = pgTable(
|
||||||
"integrationSecret",
|
"integrationSecret",
|
||||||
{
|
{
|
||||||
kind: varchar({ length: 16 }).$type<IntegrationSecretKind>().notNull(),
|
kind: varchar({ length: 64 }).$type<IntegrationSecretKind>().notNull(),
|
||||||
value: text().$type<`${string}.${string}`>().notNull(),
|
value: text().$type<`${string}.${string}`>().notNull(),
|
||||||
updatedAt: timestamp()
|
updatedAt: timestamp()
|
||||||
.$onUpdateFn(() => new Date())
|
.$onUpdateFn(() => new Date())
|
||||||
|
|||||||
@@ -25,13 +25,13 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"fast-xml-parser": "^5.2.5",
|
"fast-xml-parser": "^5.2.5",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,16 +4,19 @@ import type { AtLeastOneOf } from "@homarr/common/types";
|
|||||||
import { createDocumentationLink } from "./docs";
|
import { createDocumentationLink } from "./docs";
|
||||||
|
|
||||||
export const integrationSecretKindObject = {
|
export const integrationSecretKindObject = {
|
||||||
apiKey: { isPublic: false },
|
apiKey: { isPublic: false, multiline: false },
|
||||||
username: { isPublic: true },
|
username: { isPublic: true, multiline: false },
|
||||||
password: { isPublic: false },
|
password: { isPublic: false, multiline: false },
|
||||||
tokenId: { isPublic: true },
|
tokenId: { isPublic: true, multiline: false },
|
||||||
realm: { isPublic: true },
|
realm: { isPublic: true, multiline: false },
|
||||||
personalAccessToken: { isPublic: false },
|
personalAccessToken: { isPublic: false, multiline: false },
|
||||||
topic: { isPublic: true },
|
topic: { isPublic: true, multiline: false },
|
||||||
opnsenseApiKey: { isPublic: false },
|
opnsenseApiKey: { isPublic: false, multiline: false },
|
||||||
opnsenseApiSecret: { isPublic: false },
|
opnsenseApiSecret: { isPublic: false, multiline: false },
|
||||||
} satisfies Record<string, { isPublic: boolean }>;
|
privateKey: { isPublic: false, multiline: true },
|
||||||
|
githubAppId: { isPublic: true, multiline: false },
|
||||||
|
githubInstallationId: { isPublic: true, multiline: false },
|
||||||
|
} satisfies Record<string, { isPublic: boolean; multiline: boolean }>;
|
||||||
|
|
||||||
export const integrationSecretKinds = objectKeys(integrationSecretKindObject);
|
export const integrationSecretKinds = objectKeys(integrationSecretKindObject);
|
||||||
|
|
||||||
@@ -211,7 +214,7 @@ export const integrationDefs = {
|
|||||||
},
|
},
|
||||||
github: {
|
github: {
|
||||||
name: "Github",
|
name: "Github",
|
||||||
secretKinds: [[], ["personalAccessToken"]],
|
secretKinds: [[], ["personalAccessToken"], ["githubAppId", "githubInstallationId", "privateKey"]],
|
||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/github.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/github.svg",
|
||||||
category: ["releasesProvider"],
|
category: ["releasesProvider"],
|
||||||
defaultUrl: "https://api.github.com",
|
defaultUrl: "https://api.github.com",
|
||||||
@@ -259,7 +262,7 @@ export const integrationDefs = {
|
|||||||
},
|
},
|
||||||
gitHubContainerRegistry: {
|
gitHubContainerRegistry: {
|
||||||
name: "GitHub Container Registry",
|
name: "GitHub Container Registry",
|
||||||
secretKinds: [[], ["personalAccessToken"]],
|
secretKinds: [[], ["personalAccessToken"], ["githubAppId", "githubInstallationId", "privateKey"]],
|
||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/github.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/github.svg",
|
||||||
category: ["releasesProvider"],
|
category: ["releasesProvider"],
|
||||||
defaultUrl: "https://api.github.com",
|
defaultUrl: "https://api.github.com",
|
||||||
@@ -280,6 +283,13 @@ export const integrationDefs = {
|
|||||||
category: ["notifications"],
|
category: ["notifications"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/ntfy"),
|
documentationUrl: createDocumentationLink("/docs/integrations/ntfy"),
|
||||||
},
|
},
|
||||||
|
truenas: {
|
||||||
|
name: "TrueNAS",
|
||||||
|
secretKinds: [["username", "password"]],
|
||||||
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/truenas.svg",
|
||||||
|
category: ["healthMonitoring"],
|
||||||
|
documentationUrl: createDocumentationLink("/docs/integrations/truenas"),
|
||||||
|
},
|
||||||
// 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",
|
||||||
|
|||||||
@@ -32,8 +32,8 @@
|
|||||||
"@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.42",
|
"@types/dockerode": "^3.3.43",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,15 +26,15 @@
|
|||||||
"@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.2.5",
|
"@mantine/form": "^8.2.8",
|
||||||
"mantine-form-zod-resolver": "^1.3.0",
|
"mantine-form-zod-resolver": "^1.3.0",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,15 +29,15 @@
|
|||||||
"@homarr/notifications": "workspace:^0.1.0",
|
"@homarr/notifications": "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/core": "^8.2.5",
|
"@mantine/core": "^8.2.8",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -31,7 +31,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
"@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/bcrypt": "6.0.0",
|
"@types/bcrypt": "6.0.0",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -25,10 +25,10 @@
|
|||||||
},
|
},
|
||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ctrl/deluge": "^7.1.1",
|
"@ctrl/deluge": "^7.2.0",
|
||||||
"@ctrl/qbittorrent": "^9.6.0",
|
"@ctrl/qbittorrent": "^9.7.0",
|
||||||
"@ctrl/transmission": "^7.2.0",
|
"@ctrl/transmission": "^7.3.0",
|
||||||
"@gitbeaker/rest": "^43.4.0",
|
"@gitbeaker/rest": "^43.5.0",
|
||||||
"@homarr/certificates": "workspace:^0.1.0",
|
"@homarr/certificates": "workspace:^0.1.0",
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/db": "workspace:^0.1.0",
|
"@homarr/db": "workspace:^0.1.0",
|
||||||
@@ -40,14 +40,15 @@
|
|||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@jellyfin/sdk": "^0.11.0",
|
"@jellyfin/sdk": "^0.11.0",
|
||||||
|
"@octokit/auth-app": "^8.1.0",
|
||||||
"maria2": "^0.4.1",
|
"maria2": "^0.4.1",
|
||||||
"node-ical": "^0.20.1",
|
"node-ical": "^0.20.1",
|
||||||
"octokit": "^5.0.3",
|
"octokit": "^5.0.3",
|
||||||
"proxmox-api": "1.1.1",
|
"proxmox-api": "1.1.1",
|
||||||
"tsdav": "^2.1.5",
|
"tsdav": "^2.1.5",
|
||||||
"undici": "7.14.0",
|
"undici": "7.15.0",
|
||||||
"xml2js": "^0.6.2",
|
"xml2js": "^0.6.2",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
@@ -55,7 +56,7 @@
|
|||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/node-unifi": "^2.5.1",
|
"@types/node-unifi": "^2.5.1",
|
||||||
"@types/xml2js": "^0.4.14",
|
"@types/xml2js": "^0.4.14",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,6 @@ export const statusResponseSchema = z.object({
|
|||||||
dns_addresses: z.array(z.string()),
|
dns_addresses: z.array(z.string()),
|
||||||
dns_port: z.number().positive(),
|
dns_port: z.number().positive(),
|
||||||
http_port: z.number().positive(),
|
http_port: z.number().positive(),
|
||||||
protection_disabled_duration: z.number(),
|
|
||||||
protection_enabled: z.boolean(),
|
protection_enabled: z.boolean(),
|
||||||
dhcp_available: z.boolean(),
|
dhcp_available: z.boolean(),
|
||||||
running: z.boolean(),
|
running: z.boolean(),
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import { PlexIntegration } from "../plex/plex-integration";
|
|||||||
import { ProwlarrIntegration } from "../prowlarr/prowlarr-integration";
|
import { ProwlarrIntegration } from "../prowlarr/prowlarr-integration";
|
||||||
import { ProxmoxIntegration } from "../proxmox/proxmox-integration";
|
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 { UnifiControllerIntegration } from "../unifi-controller/unifi-controller-integration";
|
import { UnifiControllerIntegration } from "../unifi-controller/unifi-controller-integration";
|
||||||
import type { Integration, IntegrationInput } from "./integration";
|
import type { Integration, IntegrationInput } from "./integration";
|
||||||
|
|
||||||
@@ -114,6 +115,7 @@ export const integrationCreators = {
|
|||||||
quay: QuayIntegration,
|
quay: QuayIntegration,
|
||||||
ntfy: NTFYIntegration,
|
ntfy: NTFYIntegration,
|
||||||
mock: MockIntegration,
|
mock: MockIntegration,
|
||||||
|
truenas: TrueNasIntegration,
|
||||||
} 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> = {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
AxiosHttpErrorHandler,
|
AxiosHttpErrorHandler,
|
||||||
FetchHttpErrorHandler,
|
FetchHttpErrorHandler,
|
||||||
|
OctokitHttpErrorHandler,
|
||||||
OFetchHttpErrorHandler,
|
OFetchHttpErrorHandler,
|
||||||
TsdavHttpErrorHandler,
|
TsdavHttpErrorHandler,
|
||||||
} from "@homarr/common/server";
|
} from "@homarr/common/server";
|
||||||
@@ -11,3 +12,4 @@ export const integrationFetchHttpErrorHandler = new IntegrationHttpErrorHandler(
|
|||||||
export const integrationOFetchHttpErrorHandler = new IntegrationHttpErrorHandler(new OFetchHttpErrorHandler());
|
export const integrationOFetchHttpErrorHandler = new IntegrationHttpErrorHandler(new OFetchHttpErrorHandler());
|
||||||
export const integrationAxiosHttpErrorHandler = new IntegrationHttpErrorHandler(new AxiosHttpErrorHandler());
|
export const integrationAxiosHttpErrorHandler = new IntegrationHttpErrorHandler(new AxiosHttpErrorHandler());
|
||||||
export const integrationTsdavHttpErrorHandler = new IntegrationHttpErrorHandler(new TsdavHttpErrorHandler());
|
export const integrationTsdavHttpErrorHandler = new IntegrationHttpErrorHandler(new TsdavHttpErrorHandler());
|
||||||
|
export const integrationOctokitHttpErrorHandler = new IntegrationHttpErrorHandler(new OctokitHttpErrorHandler());
|
||||||
+41
-17
@@ -1,11 +1,14 @@
|
|||||||
|
import { createAppAuth } from "@octokit/auth-app";
|
||||||
import { Octokit, RequestError } from "octokit";
|
import { Octokit, RequestError } from "octokit";
|
||||||
|
import type { fetch } from "undici";
|
||||||
|
|
||||||
import { fetchWithTrustedCertificatesAsync } from "@homarr/certificates/server";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/certificates/server";
|
||||||
import { logger } from "@homarr/log";
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
|
import { HandleIntegrationErrors } from "../base/errors/decorator";
|
||||||
|
import { integrationOctokitHttpErrorHandler } from "../base/errors/http";
|
||||||
import type { IntegrationTestingInput } from "../base/integration";
|
import type { IntegrationTestingInput } from "../base/integration";
|
||||||
import { Integration } from "../base/integration";
|
import { Integration } from "../base/integration";
|
||||||
import { TestConnectionError } from "../base/test-connection/test-connection-error";
|
|
||||||
import type { TestingResult } from "../base/test-connection/test-connection-service";
|
import type { TestingResult } from "../base/test-connection/test-connection-service";
|
||||||
import type { ReleasesProviderIntegration } from "../interfaces/releases-providers/releases-providers-integration";
|
import type { ReleasesProviderIntegration } from "../interfaces/releases-providers/releases-providers-integration";
|
||||||
import { getLatestRelease } from "../interfaces/releases-providers/releases-providers-integration";
|
import { getLatestRelease } from "../interfaces/releases-providers/releases-providers-integration";
|
||||||
@@ -18,23 +21,21 @@ import type {
|
|||||||
|
|
||||||
const localLogger = logger.child({ module: "GitHubContainerRegistryIntegration" });
|
const localLogger = logger.child({ module: "GitHubContainerRegistryIntegration" });
|
||||||
|
|
||||||
|
@HandleIntegrationErrors([integrationOctokitHttpErrorHandler])
|
||||||
export class GitHubContainerRegistryIntegration extends Integration implements ReleasesProviderIntegration {
|
export class GitHubContainerRegistryIntegration extends Integration implements ReleasesProviderIntegration {
|
||||||
private static readonly userAgent = "Homarr-Lab/Homarr:GitHubContainerRegistryIntegration";
|
private static readonly userAgent = "Homarr-Lab/Homarr:GitHubContainerRegistryIntegration";
|
||||||
|
|
||||||
protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
|
protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
|
||||||
const headers: RequestInit["headers"] = {
|
const api = this.getApi(input.fetchAsync);
|
||||||
"User-Agent": GitHubContainerRegistryIntegration.userAgent,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (this.hasSecretValue("personalAccessToken"))
|
if (this.hasSecretValue("personalAccessToken")) {
|
||||||
headers.Authorization = `Bearer ${this.getSecretValue("personalAccessToken")}`;
|
await api.rest.users.getAuthenticated();
|
||||||
|
} else if (this.hasSecretValue("githubAppId")) {
|
||||||
const response = await input.fetchAsync(this.url("/octocat"), {
|
await api.rest.apps.getInstallation({
|
||||||
headers,
|
installation_id: Number(this.getSecretValue("githubInstallationId")),
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
if (!response.ok) {
|
await api.request("GET /octocat");
|
||||||
return TestConnectionError.StatusResult(response);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -131,15 +132,38 @@ export class GitHubContainerRegistryIntegration extends Integration implements R
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private getApi() {
|
private getAuthProperties(): Pick<OctokitOptions, "auth" | "authStrategy"> {
|
||||||
|
if (this.hasSecretValue("personalAccessToken"))
|
||||||
|
return {
|
||||||
|
auth: this.getSecretValue("personalAccessToken"),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (this.hasSecretValue("githubAppId"))
|
||||||
|
return {
|
||||||
|
authStrategy: createAppAuth,
|
||||||
|
auth: {
|
||||||
|
appId: this.getSecretValue("githubAppId"),
|
||||||
|
installationId: this.getSecretValue("githubInstallationId"),
|
||||||
|
privateKey: this.getSecretValue("privateKey"),
|
||||||
|
} satisfies Parameters<typeof createAppAuth>[0],
|
||||||
|
};
|
||||||
|
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
private getApi(customFetch?: typeof fetch) {
|
||||||
return new Octokit({
|
return new Octokit({
|
||||||
baseUrl: this.url("/").origin,
|
baseUrl: this.url("/").origin,
|
||||||
request: {
|
request: {
|
||||||
fetch: fetchWithTrustedCertificatesAsync,
|
fetch: customFetch ?? fetchWithTrustedCertificatesAsync,
|
||||||
},
|
},
|
||||||
userAgent: GitHubContainerRegistryIntegration.userAgent,
|
userAgent: GitHubContainerRegistryIntegration.userAgent,
|
||||||
throttle: { enabled: false }, // Disable throttling for this integration, Octokit will retry by default after a set time, thus delaying the repsonse to the user in case of errors. Errors will be shown to the user, no need to retry the request.
|
// Disable throttling for this integration, Octokit will retry by default after a set time,
|
||||||
...(this.hasSecretValue("personalAccessToken") ? { auth: this.getSecretValue("personalAccessToken") } : {}),
|
// thus delaying the repsonse to the user in case of errors. Errors will be shown to the user, no need to retry the request.
|
||||||
|
throttle: { enabled: false },
|
||||||
|
...this.getAuthProperties(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type OctokitOptions = Exclude<ConstructorParameters<typeof Octokit>[0], undefined>;
|
||||||
@@ -1,11 +1,14 @@
|
|||||||
import { Octokit, RequestError } from "octokit";
|
import { createAppAuth } from "@octokit/auth-app";
|
||||||
|
import { Octokit, RequestError as OctokitRequestError } from "octokit";
|
||||||
|
import type { fetch } from "undici";
|
||||||
|
|
||||||
import { fetchWithTrustedCertificatesAsync } from "@homarr/certificates/server";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/certificates/server";
|
||||||
import { logger } from "@homarr/log";
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
|
import { HandleIntegrationErrors } from "../base/errors/decorator";
|
||||||
|
import { integrationOctokitHttpErrorHandler } from "../base/errors/http";
|
||||||
import type { IntegrationTestingInput } from "../base/integration";
|
import type { IntegrationTestingInput } from "../base/integration";
|
||||||
import { Integration } from "../base/integration";
|
import { Integration } from "../base/integration";
|
||||||
import { TestConnectionError } from "../base/test-connection/test-connection-error";
|
|
||||||
import type { TestingResult } from "../base/test-connection/test-connection-service";
|
import type { TestingResult } from "../base/test-connection/test-connection-service";
|
||||||
import type { ReleasesProviderIntegration } from "../interfaces/releases-providers/releases-providers-integration";
|
import type { ReleasesProviderIntegration } from "../interfaces/releases-providers/releases-providers-integration";
|
||||||
import { getLatestRelease } from "../interfaces/releases-providers/releases-providers-integration";
|
import { getLatestRelease } from "../interfaces/releases-providers/releases-providers-integration";
|
||||||
@@ -18,23 +21,21 @@ import type {
|
|||||||
|
|
||||||
const localLogger = logger.child({ module: "GithubIntegration" });
|
const localLogger = logger.child({ module: "GithubIntegration" });
|
||||||
|
|
||||||
|
@HandleIntegrationErrors([integrationOctokitHttpErrorHandler])
|
||||||
export class GithubIntegration extends Integration implements ReleasesProviderIntegration {
|
export class GithubIntegration extends Integration implements ReleasesProviderIntegration {
|
||||||
private static readonly userAgent = "Homarr-Lab/Homarr:GithubIntegration";
|
private static readonly userAgent = "Homarr-Lab/Homarr:GithubIntegration";
|
||||||
|
|
||||||
protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
|
protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
|
||||||
const headers: RequestInit["headers"] = {
|
const api = this.getApi(input.fetchAsync);
|
||||||
"User-Agent": GithubIntegration.userAgent,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (this.hasSecretValue("personalAccessToken"))
|
if (this.hasSecretValue("personalAccessToken")) {
|
||||||
headers.Authorization = `Bearer ${this.getSecretValue("personalAccessToken")}`;
|
await api.rest.users.getAuthenticated();
|
||||||
|
} else if (this.hasSecretValue("githubAppId")) {
|
||||||
const response = await input.fetchAsync(this.url("/octocat"), {
|
await api.rest.apps.getInstallation({
|
||||||
headers,
|
installation_id: Number(this.getSecretValue("githubInstallationId")),
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
if (!response.ok) {
|
await api.request("GET /octocat");
|
||||||
return TestConnectionError.StatusResult(response);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -91,7 +92,7 @@ export class GithubIntegration extends Integration implements ReleasesProviderIn
|
|||||||
|
|
||||||
return getLatestRelease(releasesProviderResponse, repository, details);
|
return getLatestRelease(releasesProviderResponse, repository, details);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const errorMessage = error instanceof RequestError ? error.message : String(error);
|
const errorMessage = error instanceof OctokitRequestError ? error.message : String(error);
|
||||||
|
|
||||||
localLogger.warn(`Failed to get releases for ${owner}\\${name} with Github integration`, {
|
localLogger.warn(`Failed to get releases for ${owner}\\${name} with Github integration`, {
|
||||||
owner,
|
owner,
|
||||||
@@ -131,21 +132,44 @@ export class GithubIntegration extends Integration implements ReleasesProviderIn
|
|||||||
localLogger.warn(`Failed to get details for ${owner}\\${name} with Github integration`, {
|
localLogger.warn(`Failed to get details for ${owner}\\${name} with Github integration`, {
|
||||||
owner,
|
owner,
|
||||||
name,
|
name,
|
||||||
error: error instanceof RequestError ? error.message : String(error),
|
error: error instanceof OctokitRequestError ? error.message : String(error),
|
||||||
});
|
});
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private getApi() {
|
private getAuthProperties(): Pick<OctokitOptions, "auth" | "authStrategy"> {
|
||||||
|
if (this.hasSecretValue("personalAccessToken"))
|
||||||
|
return {
|
||||||
|
auth: this.getSecretValue("personalAccessToken"),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (this.hasSecretValue("githubAppId"))
|
||||||
|
return {
|
||||||
|
authStrategy: createAppAuth,
|
||||||
|
auth: {
|
||||||
|
appId: this.getSecretValue("githubAppId"),
|
||||||
|
installationId: this.getSecretValue("githubInstallationId"),
|
||||||
|
privateKey: this.getSecretValue("privateKey"),
|
||||||
|
} satisfies Parameters<typeof createAppAuth>[0],
|
||||||
|
};
|
||||||
|
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
private getApi(customFetch?: typeof fetch) {
|
||||||
return new Octokit({
|
return new Octokit({
|
||||||
baseUrl: this.url("/").origin,
|
baseUrl: this.url("/").origin,
|
||||||
request: {
|
request: {
|
||||||
fetch: fetchWithTrustedCertificatesAsync,
|
fetch: customFetch ?? fetchWithTrustedCertificatesAsync,
|
||||||
},
|
},
|
||||||
userAgent: GithubIntegration.userAgent,
|
userAgent: GithubIntegration.userAgent,
|
||||||
throttle: { enabled: false }, // Disable throttling for this integration, Octokit will retry by default after a set time, thus delaying the repsonse to the user in case of errors. Errors will be shown to the user, no need to retry the request.
|
// Disable throttling for this integration, Octokit will retry by default after a set time,
|
||||||
...(this.hasSecretValue("personalAccessToken") ? { auth: this.getSecretValue("personalAccessToken") } : {}),
|
// thus delaying the repsonse to the user in case of errors. Errors will be shown to the user, no need to retry the request.
|
||||||
|
throttle: { enabled: false },
|
||||||
|
...this.getAuthProperties(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type OctokitOptions = Exclude<ConstructorParameters<typeof Octokit>[0], undefined>;
|
||||||
@@ -21,6 +21,7 @@ export { PiHoleIntegrationV5 } from "./pi-hole/v5/pi-hole-integration-v5";
|
|||||||
export { PiHoleIntegrationV6 } from "./pi-hole/v6/pi-hole-integration-v6";
|
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 { OPNsenseIntegration } from "./opnsense/opnsense-integration";
|
export { OPNsenseIntegration } from "./opnsense/opnsense-integration";
|
||||||
|
|
||||||
// Types
|
// Types
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export interface SystemHealthMonitoring {
|
|||||||
"1min": number;
|
"1min": number;
|
||||||
"5min": number;
|
"5min": number;
|
||||||
"15min": number;
|
"15min": number;
|
||||||
};
|
} | null;
|
||||||
rebootRequired: boolean;
|
rebootRequired: boolean;
|
||||||
availablePkgUpdates: number;
|
availablePkgUpdates: number;
|
||||||
cpuTemp: number | undefined;
|
cpuTemp: number | undefined;
|
||||||
|
|||||||
@@ -265,7 +265,9 @@ const mapType = (type: string): "movie" | "tv" | "unknown" => {
|
|||||||
switch (type) {
|
switch (type) {
|
||||||
case "movie":
|
case "movie":
|
||||||
return "movie";
|
return "movie";
|
||||||
case "tv":
|
case "show":
|
||||||
|
case "season":
|
||||||
|
case "episode":
|
||||||
return "tv";
|
return "tv";
|
||||||
default:
|
default:
|
||||||
return "unknown";
|
return "unknown";
|
||||||
|
|||||||
@@ -0,0 +1,375 @@
|
|||||||
|
import dayjs from "dayjs";
|
||||||
|
import z from "zod";
|
||||||
|
|
||||||
|
import { createId } from "@homarr/common";
|
||||||
|
import { RequestError, ResponseError } from "@homarr/common/server";
|
||||||
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
|
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";
|
||||||
|
|
||||||
|
const localLogger = logger.child({ module: "TrueNasIntegration" });
|
||||||
|
|
||||||
|
const NETWORK_MULTIPLIER = 100;
|
||||||
|
|
||||||
|
export class TrueNasIntegration extends Integration implements ISystemHealthMonitoringIntegration {
|
||||||
|
private static webSocketMap = new Map<string, WebSocket>();
|
||||||
|
|
||||||
|
private wsUrl() {
|
||||||
|
const url = super.url("/websocket");
|
||||||
|
url.protocol = url.protocol.replace("http", "ws");
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
private get webSocket() {
|
||||||
|
return TrueNasIntegration.webSocketMap.get(this.integration.id) ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async testingAsync(_input: IntegrationTestingInput): Promise<TestingResult> {
|
||||||
|
const webSocket = await this.connectWebSocketAsync();
|
||||||
|
await this.registerSessionAsync(webSocket);
|
||||||
|
await this.authenticateWebSocketAsync(webSocket);
|
||||||
|
|
||||||
|
// Remove current socket connection so we can authenticate with updated credentials
|
||||||
|
TrueNasIntegration.webSocketMap.delete(this.integration.id);
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TrueNAS API uses WebSocket. This function connects to the socket
|
||||||
|
* and resolves the promise if the connection was successful.
|
||||||
|
* @see https://www.truenas.com/docs/api/scale_websocket_api.html
|
||||||
|
*/
|
||||||
|
private async connectWebSocketAsync(): Promise<WebSocket> {
|
||||||
|
localLogger.debug("Connecting to websocket server", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
const webSocket = new WebSocket(this.wsUrl());
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
webSocket.onopen = () => {
|
||||||
|
localLogger.debug("Connected to websocket server", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
resolve(webSocket);
|
||||||
|
};
|
||||||
|
|
||||||
|
webSocket.onerror = () => {
|
||||||
|
reject(new Error("Failed to connect"));
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Before authentication, a session must be obtained from the server using the "connect" event.
|
||||||
|
* @see https://www.truenas.com/docs/api/scale_websocket_api.html#websocket_protocol
|
||||||
|
*/
|
||||||
|
private async registerSessionAsync(webSocket: WebSocket): Promise<void> {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const subscribe = (event: MessageEvent<string>) => {
|
||||||
|
const data = JSON.parse(event.data) as { msg: string };
|
||||||
|
if (data.msg === "connected") {
|
||||||
|
webSocket.removeEventListener("message", subscribe);
|
||||||
|
resolve();
|
||||||
|
} else if (data.msg === "failed") {
|
||||||
|
webSocket.removeEventListener("message", subscribe);
|
||||||
|
reject(new Error("Unable to establish connection"));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
webSocket.addEventListener("message", subscribe);
|
||||||
|
webSocket.send(
|
||||||
|
JSON.stringify({
|
||||||
|
msg: "connect",
|
||||||
|
version: "1", // this must be number, not string
|
||||||
|
support: ["1"], // this must be number, not string
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* After a session was obtained, the session can be authenticated.
|
||||||
|
* @see https://www.truenas.com/docs/api/scale_websocket_api.html#websocket_protocol
|
||||||
|
*/
|
||||||
|
private async authenticateWebSocketAsync(webSocket?: WebSocket): Promise<void> {
|
||||||
|
localLogger.debug("Authenticating with username and password", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
const response = await this.requestAsync(
|
||||||
|
"auth.login",
|
||||||
|
[this.getSecretValue("username"), this.getSecretValue("password")],
|
||||||
|
webSocket,
|
||||||
|
);
|
||||||
|
const result = await z.boolean().parseAsync(response);
|
||||||
|
if (!result) throw new ResponseError({ status: 401 });
|
||||||
|
localLogger.debug("Authenticated successfully with username and password", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves data using the reporting method
|
||||||
|
* @see https://www.truenas.com/docs/api/scale_websocket_api.html#reporting
|
||||||
|
*/
|
||||||
|
private async getReportingAsync(): Promise<ReportingItem[]> {
|
||||||
|
localLogger.debug("Retrieving reporting data", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await this.requestAsync("reporting.get_data", [
|
||||||
|
[
|
||||||
|
{
|
||||||
|
name: "cpu",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "memory",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "cputemp",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
{
|
||||||
|
aggregate: true,
|
||||||
|
start: dayjs().add(-5, "minutes").unix(),
|
||||||
|
end: dayjs().unix(),
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
const result = await z.array(reportingItemSchema).parseAsync(response);
|
||||||
|
|
||||||
|
localLogger.debug("Retrieved reporting data", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
count: result.length,
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves a list of all available network interfaces
|
||||||
|
* @see https://www.truenas.com/docs/core/13.0/api/core_websocket_api.html#interface
|
||||||
|
*/
|
||||||
|
private async getNetworkInterfacesAsync(): Promise<z.infer<typeof networkInterfaceSchema>> {
|
||||||
|
localLogger.debug("Retrieving available network-interfaces", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await this.requestAsync("interface.query", [
|
||||||
|
[], // no filters
|
||||||
|
{},
|
||||||
|
]);
|
||||||
|
const result = await networkInterfaceSchema.parseAsync(response);
|
||||||
|
|
||||||
|
localLogger.debug("Retrieved available network-interfaces", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
count: result.length,
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves reporting network data of the last 5 minutes
|
||||||
|
* @see https://www.truenas.com/docs/api/scale_websocket_api.html#reporting
|
||||||
|
*/
|
||||||
|
private async getReportingNetdataAsync(): Promise<z.infer<typeof reportingNetDataSchema>> {
|
||||||
|
const networkInterfaces = await this.getNetworkInterfacesAsync();
|
||||||
|
|
||||||
|
localLogger.debug("Retrieving reporting network data", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await this.requestAsync("reporting.netdata_get_data", [
|
||||||
|
networkInterfaces.map((networkInterface) => ({
|
||||||
|
name: "interface",
|
||||||
|
identifier: networkInterface.id,
|
||||||
|
})),
|
||||||
|
{
|
||||||
|
start: dayjs().add(-5, "minutes").unix(),
|
||||||
|
end: dayjs().unix(),
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
const result = await reportingNetDataSchema.parseAsync(response);
|
||||||
|
|
||||||
|
localLogger.debug("Retrieved reporting-network-data", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
count: result.length,
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves information about the system
|
||||||
|
* @see https://www.truenas.com/docs/api/scale_websocket_api.html#system
|
||||||
|
*/
|
||||||
|
private async getSystemInformationAsync(): Promise<z.infer<typeof systemInfoSchema>> {
|
||||||
|
localLogger.debug("Retrieving system-information", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await this.requestAsync("system.info");
|
||||||
|
const result = await systemInfoSchema.parseAsync(response);
|
||||||
|
|
||||||
|
localLogger.debug("Retrieved system-information", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async getSystemInfoAsync(): Promise<SystemHealthMonitoring> {
|
||||||
|
const systemInformation = await this.getSystemInformationAsync();
|
||||||
|
const reporting = await this.getReportingAsync();
|
||||||
|
|
||||||
|
const cpuData = this.extractLatestReportingData(reporting, "cpu");
|
||||||
|
const cpuTempData = this.extractLatestReportingData(reporting, "cputemp");
|
||||||
|
const memoryData = this.extractLatestReportingData(reporting, "memory");
|
||||||
|
|
||||||
|
const netdata = await this.getReportingNetdataAsync();
|
||||||
|
|
||||||
|
const upload = this.extractNetworkTrafficData(netdata, 2); // Index 2 is "sent"
|
||||||
|
const download = this.extractNetworkTrafficData(netdata, 1); // Index 1 is "received"
|
||||||
|
|
||||||
|
return {
|
||||||
|
cpuUtilization: cpuData.reduce((acc, item) => acc + (item > 100 ? 0 : item), 0) / cpuData.length,
|
||||||
|
cpuTemp: Math.max(...cpuTempData.filter((_item, i) => i > 0)),
|
||||||
|
memAvailableInBytes: systemInformation.physmem,
|
||||||
|
memUsedInBytes: memoryData[1] ?? 0, // Index 0 is UNIX timestamp, Index 1 is free space in bytes
|
||||||
|
fileSystem: [],
|
||||||
|
availablePkgUpdates: 0,
|
||||||
|
network: {
|
||||||
|
up: upload * NETWORK_MULTIPLIER,
|
||||||
|
down: download * NETWORK_MULTIPLIER,
|
||||||
|
},
|
||||||
|
loadAverage: null,
|
||||||
|
smart: [],
|
||||||
|
uptime: systemInformation.uptime_seconds,
|
||||||
|
version: systemInformation.version,
|
||||||
|
cpuModelName: systemInformation.model,
|
||||||
|
rebootRequired: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send a request through websocket and return response
|
||||||
|
* Times out after 5 seconds when no response was received.
|
||||||
|
* @param method json-rpc method to call
|
||||||
|
* @param params array of parameters
|
||||||
|
* @param webSocketOverride override of webSocket, helpful for not storing the connection
|
||||||
|
* @returns result of json-rpc call
|
||||||
|
*/
|
||||||
|
private async requestAsync(method: string, params: unknown[] = [], webSocketOverride?: WebSocket) {
|
||||||
|
let webSocket = webSocketOverride ?? this.webSocket;
|
||||||
|
if (!webSocket || webSocket.readyState !== WebSocket.OPEN) {
|
||||||
|
localLogger.debug("Connecting to websocket", {
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
// We can only land here with static webSocket
|
||||||
|
webSocket = await this.connectWebSocketAsync();
|
||||||
|
await this.registerSessionAsync(webSocket);
|
||||||
|
|
||||||
|
TrueNasIntegration.webSocketMap.set(this.integration.id, webSocket);
|
||||||
|
await this.authenticateWebSocketAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
return await new Promise((resolve, reject) => {
|
||||||
|
const id = createId();
|
||||||
|
const handler = (event: MessageEvent<string>) => {
|
||||||
|
const data = JSON.parse(event.data) as Record<string, unknown>;
|
||||||
|
if (data.msg !== "result") return;
|
||||||
|
if (data.id !== id) return;
|
||||||
|
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
webSocket.removeEventListener("message", handler);
|
||||||
|
localLogger.debug("Received method response", {
|
||||||
|
id,
|
||||||
|
method,
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
resolve(data.result);
|
||||||
|
};
|
||||||
|
const timeoutId = setTimeout(() => {
|
||||||
|
webSocket.removeEventListener("message", handler);
|
||||||
|
reject(
|
||||||
|
new RequestError(
|
||||||
|
{
|
||||||
|
type: "timeout",
|
||||||
|
reason: "aborted",
|
||||||
|
code: "ECONNABORTED",
|
||||||
|
},
|
||||||
|
{ cause: new Error("Canceled request after 5 seconds") },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}, 5000);
|
||||||
|
|
||||||
|
webSocket.addEventListener("message", handler);
|
||||||
|
|
||||||
|
localLogger.debug("Sending method request", {
|
||||||
|
id,
|
||||||
|
method,
|
||||||
|
url: this.wsUrl(),
|
||||||
|
});
|
||||||
|
|
||||||
|
webSocket.send(
|
||||||
|
JSON.stringify({
|
||||||
|
id,
|
||||||
|
msg: "method",
|
||||||
|
method,
|
||||||
|
params,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private extractNetworkTrafficData = (data: z.infer<typeof reportingNetDataSchema>, index = 1 | 2) => {
|
||||||
|
return data.reduce((acc, current) => acc + (current.data.at(-1)?.at(index) ?? 0), 0);
|
||||||
|
};
|
||||||
|
|
||||||
|
private extractLatestReportingData(data: ReportingItem[], key: ReportingItem["identifier"]) {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
|
const dataObject = data.find((item) => item.identifier === key)!;
|
||||||
|
// TODO: check why the below sorting is done, because right now it compares number[] with number[]?
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
|
return dataObject.data.sort((item1, item2) => (item1 > item2 ? -1 : 1))[0]!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const reportingItemSchema = z.object({
|
||||||
|
name: z.enum(["cpu", "memory", "cputemp"]),
|
||||||
|
identifier: z.enum(["cpu", "memory", "cputemp"]),
|
||||||
|
aggregations: z.object({
|
||||||
|
min: z.record(z.string(), z.unknown()),
|
||||||
|
mean: z.record(z.string(), z.unknown()),
|
||||||
|
max: z.record(z.string(), z.unknown()),
|
||||||
|
}),
|
||||||
|
start: z.number().min(0),
|
||||||
|
end: z.number().min(0),
|
||||||
|
legend: z.array(z.string()),
|
||||||
|
data: z.array(z.array(z.number())),
|
||||||
|
});
|
||||||
|
|
||||||
|
type ReportingItem = z.infer<typeof reportingItemSchema>;
|
||||||
|
|
||||||
|
const reportingNetDataSchema = z.array(
|
||||||
|
z.object({
|
||||||
|
name: z.string(),
|
||||||
|
identifier: z.string(),
|
||||||
|
data: z.array(z.array(z.number())),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
const systemInfoSchema = z.object({
|
||||||
|
version: z.string(),
|
||||||
|
hostname: z.string(),
|
||||||
|
physmem: z.number().min(0), // pysical memory
|
||||||
|
model: z.string(), // cpu model
|
||||||
|
uptime_seconds: z.number().min(0),
|
||||||
|
});
|
||||||
|
|
||||||
|
const networkInterfaceSchema = z.array(
|
||||||
|
z.object({
|
||||||
|
id: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
@@ -27,13 +27,13 @@
|
|||||||
"@homarr/core": "workspace:^0.1.0",
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"winston": "3.17.0",
|
"winston": "3.17.0",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -33,19 +33,19 @@
|
|||||||
"@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.2.5",
|
"@mantine/core": "^8.2.8",
|
||||||
"@tabler/icons-react": "^3.34.1",
|
"@tabler/icons-react": "^3.34.1",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.18",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1",
|
"react-dom": "19.1.1",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -59,7 +59,7 @@ export const ImportBoardModal = createModal(({ actions }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setFileValid(true);
|
setFileValid(true);
|
||||||
form.setFieldValue("configuration.name", result.data.configProperties.name);
|
form.setFieldValue("configuration.name", result.data.configProperties.name.replaceAll(" ", "-"));
|
||||||
})();
|
})();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -24,15 +24,15 @@
|
|||||||
"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.2.5",
|
"@mantine/core": "^8.2.8",
|
||||||
"@mantine/hooks": "^8.2.5",
|
"@mantine/hooks": "^8.2.8",
|
||||||
"react": "19.1.1"
|
"react": "19.1.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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,14 +24,14 @@
|
|||||||
"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.2.5",
|
"@mantine/notifications": "^8.2.8",
|
||||||
"@tabler/icons-react": "^3.34.1"
|
"@tabler/icons-react": "^3.34.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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -37,22 +37,22 @@
|
|||||||
"@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.2.5",
|
"@mantine/core": "^8.2.8",
|
||||||
"@mantine/hooks": "^8.2.5",
|
"@mantine/hooks": "^8.2.8",
|
||||||
"adm-zip": "0.5.16",
|
"adm-zip": "0.5.16",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1",
|
"react-dom": "19.1.1",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"zod": "^4.0.17",
|
"zod": "^4.1.5",
|
||||||
"zod-form-data": "^3.0.0"
|
"zod-form-data": "^3.0.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/adm-zip": "0.5.7",
|
"@types/adm-zip": "0.5.7",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,7 @@ export const analyseOldmarrImportAsync = async (file: File) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
name: entry.name.replace(".json", ""),
|
name: entry.name.replaceAll(" ", "-").replace(".json", ""),
|
||||||
config: result.data ?? null,
|
config: result.data ?? null,
|
||||||
isError: !result.success,
|
isError: !result.success,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -98,7 +98,6 @@ const optionMapping: OptionMapping = {
|
|||||||
allowMicrophone: (oldOptions) => oldOptions.allowMicrophone,
|
allowMicrophone: (oldOptions) => oldOptions.allowMicrophone,
|
||||||
allowGeolocation: (oldOptions) => oldOptions.allowGeolocation,
|
allowGeolocation: (oldOptions) => oldOptions.allowGeolocation,
|
||||||
allowScrolling: (oldOptions) => oldOptions.allowScrolling,
|
allowScrolling: (oldOptions) => oldOptions.allowScrolling,
|
||||||
allowTransparency: (oldOptions) => oldOptions.allowTransparency,
|
|
||||||
},
|
},
|
||||||
video: {
|
video: {
|
||||||
feedUrl: (oldOptions) => oldOptions.FeedUrl,
|
feedUrl: (oldOptions) => oldOptions.FeedUrl,
|
||||||
@@ -118,6 +117,7 @@ const optionMapping: OptionMapping = {
|
|||||||
enableRtl: (oldOptions) => oldOptions.enableRtl,
|
enableRtl: (oldOptions) => oldOptions.enableRtl,
|
||||||
maximumAmountPosts: (oldOptions) => oldOptions.maximumAmountOfPosts,
|
maximumAmountPosts: (oldOptions) => oldOptions.maximumAmountOfPosts,
|
||||||
textLinesClamp: (oldOptions) => oldOptions.textLinesClamp,
|
textLinesClamp: (oldOptions) => oldOptions.textLinesClamp,
|
||||||
|
hideDescription: () => undefined,
|
||||||
},
|
},
|
||||||
notebook: {
|
notebook: {
|
||||||
allowReadOnlyCheck: (oldOptions) => oldOptions.allowReadOnlyCheck,
|
allowReadOnlyCheck: (oldOptions) => oldOptions.allowReadOnlyCheck,
|
||||||
|
|||||||
@@ -23,13 +23,13 @@
|
|||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"zod": "^4.0.17"
|
"zod": "^4.1.5"
|
||||||
},
|
},
|
||||||
"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.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -30,7 +30,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,23 +22,23 @@
|
|||||||
},
|
},
|
||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@extractus/feed-extractor": "7.1.6",
|
"@extractus/feed-extractor": "7.1.7",
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/db": "workspace:^0.1.0",
|
"@homarr/db": "workspace:^0.1.0",
|
||||||
"@homarr/definitions": "workspace:^0.1.0",
|
"@homarr/definitions": "workspace:^0.1.0",
|
||||||
"@homarr/integrations": "workspace:^0.1.0",
|
"@homarr/integrations": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^0.1.0",
|
"@homarr/log": "workspace:^0.1.0",
|
||||||
"@homarr/redis": "workspace:^0.1.0",
|
"@homarr/redis": "workspace:^0.1.0",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.18",
|
||||||
"octokit": "^5.0.3",
|
"octokit": "^5.0.3",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"undici": "7.14.0"
|
"undici": "7.15.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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,8 +26,8 @@
|
|||||||
"@homarr/api": "workspace:^0.1.0",
|
"@homarr/api": "workspace:^0.1.0",
|
||||||
"@homarr/db": "workspace:^0.1.0",
|
"@homarr/db": "workspace:^0.1.0",
|
||||||
"@homarr/server-settings": "workspace:^0.1.0",
|
"@homarr/server-settings": "workspace:^0.1.0",
|
||||||
"@mantine/dates": "^8.2.5",
|
"@mantine/dates": "^8.2.8",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1"
|
"react-dom": "19.1.1"
|
||||||
},
|
},
|
||||||
@@ -35,7 +35,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -33,12 +33,12 @@
|
|||||||
"@homarr/settings": "workspace:^0.1.0",
|
"@homarr/settings": "workspace:^0.1.0",
|
||||||
"@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.2.5",
|
"@mantine/core": "^8.2.8",
|
||||||
"@mantine/hooks": "^8.2.5",
|
"@mantine/hooks": "^8.2.8",
|
||||||
"@mantine/spotlight": "^8.2.5",
|
"@mantine/spotlight": "^8.2.8",
|
||||||
"@tabler/icons-react": "^3.34.1",
|
"@tabler/icons-react": "^3.34.1",
|
||||||
"jotai": "^2.13.1",
|
"jotai": "^2.13.1",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1",
|
"react-dom": "19.1.1",
|
||||||
"use-deep-compare-effect": "^1.8.1"
|
"use-deep-compare-effect": "^1.8.1"
|
||||||
@@ -47,7 +47,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,11 +29,11 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/definitions": "workspace:^0.1.0",
|
"@homarr/definitions": "workspace:^0.1.0",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.18",
|
||||||
"deepmerge": "4.3.1",
|
"deepmerge": "4.3.1",
|
||||||
"mantine-react-table": "2.0.0-beta.9",
|
"mantine-react-table": "2.0.0-beta.9",
|
||||||
"next": "15.5.0",
|
"next": "15.5.2",
|
||||||
"next-intl": "4.3.4",
|
"next-intl": "4.3.7",
|
||||||
"react": "19.1.1",
|
"react": "19.1.1",
|
||||||
"react-dom": "19.1.1"
|
"react-dom": "19.1.1"
|
||||||
},
|
},
|
||||||
@@ -41,7 +41,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",
|
||||||
"eslint": "^9.33.0",
|
"eslint": "^9.35.0",
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
"apps": "Aplicacions",
|
"apps": "Aplicacions",
|
||||||
"boards": "Tauler",
|
"boards": "Tauler",
|
||||||
"integrations": "Integracions",
|
"integrations": "Integracions",
|
||||||
"credentialUsers": ""
|
"credentialUsers": "Credencials d'usuari"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tokenModal": {
|
"tokenModal": {
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
"form": {
|
"form": {
|
||||||
"name": {
|
"name": {
|
||||||
"label": "Nom del grup",
|
"label": "Nom del grup",
|
||||||
"description": ""
|
"description": "El nom ha de coincidir amb el grup d'Administradors del proveïdor extern"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -110,12 +110,12 @@
|
|||||||
"page": {
|
"page": {
|
||||||
"login": {
|
"login": {
|
||||||
"title": "Entreu al vostre compte",
|
"title": "Entreu al vostre compte",
|
||||||
"subtitle": ""
|
"subtitle": "Benvingut de nou! Si us plau, introduïu les credencials"
|
||||||
},
|
},
|
||||||
"invite": {
|
"invite": {
|
||||||
"title": "Uneix-te a Homarr",
|
"title": "Uneix-te a Homarr",
|
||||||
"subtitle": "",
|
"subtitle": "Benvingut a Homarr! Si us plau, crea el teu compte",
|
||||||
"description": ""
|
"description": "Has sigut invitat per {username}"
|
||||||
},
|
},
|
||||||
"init": {
|
"init": {
|
||||||
"title": "Nova instal·lació de Homarr",
|
"title": "Nova instal·lació de Homarr",
|
||||||
@@ -178,7 +178,7 @@
|
|||||||
},
|
},
|
||||||
"forgotPassword": {
|
"forgotPassword": {
|
||||||
"label": "Heu oblidat la contrasenya?",
|
"label": "Heu oblidat la contrasenya?",
|
||||||
"description": ""
|
"description": "Un administrador pot utilitzar el següent comandament per reinicialitzar la teva contrasenya"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"register": {
|
"register": {
|
||||||
@@ -239,10 +239,10 @@
|
|||||||
"changePingIconsEnabled": {
|
"changePingIconsEnabled": {
|
||||||
"notification": {
|
"notification": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "Icones de ping alternats correctament"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "Impossible d'alternar les icones de ping"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -307,12 +307,12 @@
|
|||||||
"name": "Nom",
|
"name": "Nom",
|
||||||
"members": "Membres",
|
"members": "Membres",
|
||||||
"homeBoard": {
|
"homeBoard": {
|
||||||
"label": "",
|
"label": "Panell d'inici",
|
||||||
"description": ""
|
"description": "Només els panells accessibles al grup es pot seleccionar"
|
||||||
},
|
},
|
||||||
"mobileBoard": {
|
"mobileBoard": {
|
||||||
"label": "",
|
"label": "Panell mòbil",
|
||||||
"description": ""
|
"description": "Només els panells accessibles al grup es pot seleccionar"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"permission": {
|
"permission": {
|
||||||
@@ -384,29 +384,29 @@
|
|||||||
},
|
},
|
||||||
"full-all": {
|
"full-all": {
|
||||||
"label": "Accés total a les integracions",
|
"label": "Accés total a les integracions",
|
||||||
"description": ""
|
"description": "Permetre que els membres gestionin, utilitzin i interactuïn amb cada integració"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"media": {
|
"media": {
|
||||||
"title": "",
|
"title": "Medis",
|
||||||
"item": {
|
"item": {
|
||||||
"upload": {
|
"upload": {
|
||||||
"label": "",
|
"label": "Pujar medis",
|
||||||
"description": ""
|
"description": "Permetre als membres puja medis"
|
||||||
},
|
},
|
||||||
"view-all": {
|
"view-all": {
|
||||||
"label": "",
|
"label": "Veure medis",
|
||||||
"description": ""
|
"description": "Permet que els membres vegin tots els continguts multimèdia"
|
||||||
},
|
},
|
||||||
"full-all": {
|
"full-all": {
|
||||||
"label": "",
|
"label": "Accés complet als medis",
|
||||||
"description": ""
|
"description": "Permet als membres gestionar i esborrar tots els continguts multimèdia"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"other": {
|
"other": {
|
||||||
"title": "",
|
"title": "Altres",
|
||||||
"item": {
|
"item": {
|
||||||
"view-logs": {
|
"view-logs": {
|
||||||
"label": "Veure registres",
|
"label": "Veure registres",
|
||||||
@@ -426,95 +426,95 @@
|
|||||||
"description": "Permet que els membres modifiquin tots els motors de cerca"
|
"description": "Permet que els membres modifiquin tots els motors de cerca"
|
||||||
},
|
},
|
||||||
"full-all": {
|
"full-all": {
|
||||||
"label": "",
|
"label": "Accés complet a la cerca",
|
||||||
"description": ""
|
"description": "Permet als membres gestionar i esborrar els motors de cerca"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"memberNotice": {
|
"memberNotice": {
|
||||||
"mixed": "",
|
"mixed": "Alguns membres de proveïdors externs no es poden gestionar aquí",
|
||||||
"external": ""
|
"external": "Tots els membres de proveïdors externs no es poden gestionar aquí"
|
||||||
},
|
},
|
||||||
"reservedNotice": {
|
"reservedNotice": {
|
||||||
"message": ""
|
"message": "Aquest grup està reservat pel sistema i restringeix algunes accions <checkoutDocs></checkoutDocs>"
|
||||||
},
|
},
|
||||||
"action": {
|
"action": {
|
||||||
"create": {
|
"create": {
|
||||||
"label": "",
|
"label": "Nou grup",
|
||||||
"notification": {
|
"notification": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "El grup s'ha creat satisfactòriament"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "El grup no es pot crear"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"transfer": {
|
"transfer": {
|
||||||
"label": "",
|
"label": "Transferir propietari",
|
||||||
"description": "",
|
"description": "Transferir la propietat del grup a altre usuari.",
|
||||||
"confirm": "",
|
"confirm": "Segur que vols transferir el propietari de {name} a {username}?",
|
||||||
"notification": {
|
"notification": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "Transferència del {group} a {user} satisfactòria"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "No ha sigut possible transferir la propietat"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"addMember": {
|
"addMember": {
|
||||||
"label": ""
|
"label": "Afegir usuari"
|
||||||
},
|
},
|
||||||
"removeMember": {
|
"removeMember": {
|
||||||
"label": "",
|
"label": "Esborrar usuari",
|
||||||
"confirm": ""
|
"confirm": "Segur que vols esborrar {user} d'aquest grup?"
|
||||||
},
|
},
|
||||||
"delete": {
|
"delete": {
|
||||||
"label": "",
|
"label": "Esborrar grup",
|
||||||
"description": "",
|
"description": "Un cop esborris el grup, no el podràs recuperar. ",
|
||||||
"confirm": "",
|
"confirm": "Segur que desitges esborrar el grup {name}?",
|
||||||
"notification": {
|
"notification": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "S'ha esborrat el grup {name}"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "Impossible esborrar el grup {name}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"changePermissions": {
|
"changePermissions": {
|
||||||
"notification": {
|
"notification": {
|
||||||
"success": {
|
"success": {
|
||||||
"title": "",
|
"title": "Privilegis guardats",
|
||||||
"message": ""
|
"message": "Els privilegis s'han guardat satisfactòriament"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"title": "",
|
"title": "Privilegis no guardats",
|
||||||
"message": ""
|
"message": "Els privilegis no s'han guardat"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"update": {
|
"update": {
|
||||||
"notification": {
|
"notification": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "El grup {name} s'ha guardat satisfactòriament"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "No s'ha pogut guardar el grup {name}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"select": {
|
"select": {
|
||||||
"label": "",
|
"label": "Seleccionar grup",
|
||||||
"notFound": ""
|
"notFound": "No s'ha trobat el grup"
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"board": {
|
"board": {
|
||||||
"notification": {
|
"notification": {
|
||||||
"success": {
|
"success": {
|
||||||
"title": "",
|
"title": "Configuració guardada",
|
||||||
"message": ""
|
"message": ""
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
@@ -952,6 +952,18 @@
|
|||||||
"opnsenseApiSecret": {
|
"opnsenseApiSecret": {
|
||||||
"label": "",
|
"label": "",
|
||||||
"newLabel": ""
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubAppId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubInstallationId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"privateKey": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1266,9 +1278,6 @@
|
|||||||
"showTitle": {
|
"showTitle": {
|
||||||
"label": ""
|
"label": ""
|
||||||
},
|
},
|
||||||
"showDescriptionTooltip": {
|
|
||||||
"label": ""
|
|
||||||
},
|
|
||||||
"pingEnabled": {
|
"pingEnabled": {
|
||||||
"label": ""
|
"label": ""
|
||||||
},
|
},
|
||||||
@@ -1280,6 +1289,15 @@
|
|||||||
"column": "",
|
"column": "",
|
||||||
"column-reverse": ""
|
"column-reverse": ""
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"descriptionDisplayMode": {
|
||||||
|
"label": "",
|
||||||
|
"description": "",
|
||||||
|
"option": {
|
||||||
|
"normal": "",
|
||||||
|
"tooltip": "",
|
||||||
|
"hidden": ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
@@ -2253,6 +2271,9 @@
|
|||||||
},
|
},
|
||||||
"maximumAmountPosts": {
|
"maximumAmountPosts": {
|
||||||
"label": ""
|
"label": ""
|
||||||
|
},
|
||||||
|
"hideDescription": {
|
||||||
|
"label": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -952,6 +952,18 @@
|
|||||||
"opnsenseApiSecret": {
|
"opnsenseApiSecret": {
|
||||||
"label": "",
|
"label": "",
|
||||||
"newLabel": ""
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubAppId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubInstallationId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"privateKey": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1266,9 +1278,6 @@
|
|||||||
"showTitle": {
|
"showTitle": {
|
||||||
"label": "显示应用名称"
|
"label": "显示应用名称"
|
||||||
},
|
},
|
||||||
"showDescriptionTooltip": {
|
|
||||||
"label": "显示描述提示"
|
|
||||||
},
|
|
||||||
"pingEnabled": {
|
"pingEnabled": {
|
||||||
"label": "启用状态检查"
|
"label": "启用状态检查"
|
||||||
},
|
},
|
||||||
@@ -1280,6 +1289,15 @@
|
|||||||
"column": "",
|
"column": "",
|
||||||
"column-reverse": ""
|
"column-reverse": ""
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"descriptionDisplayMode": {
|
||||||
|
"label": "",
|
||||||
|
"description": "",
|
||||||
|
"option": {
|
||||||
|
"normal": "",
|
||||||
|
"tooltip": "",
|
||||||
|
"hidden": ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
@@ -2253,6 +2271,9 @@
|
|||||||
},
|
},
|
||||||
"maximumAmountPosts": {
|
"maximumAmountPosts": {
|
||||||
"label": "帖子数量限制"
|
"label": "帖子数量限制"
|
||||||
|
},
|
||||||
|
"hideDescription": {
|
||||||
|
"label": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2471,7 +2492,7 @@
|
|||||||
"description": "",
|
"description": "",
|
||||||
"option": {},
|
"option": {},
|
||||||
"card": {
|
"card": {
|
||||||
"cpu": "",
|
"cpu": "CPU",
|
||||||
"memory": "",
|
"memory": "",
|
||||||
"network": "",
|
"network": "",
|
||||||
"up": "",
|
"up": "",
|
||||||
@@ -3843,7 +3864,7 @@
|
|||||||
"tools": {
|
"tools": {
|
||||||
"label": "工具",
|
"label": "工具",
|
||||||
"tasks": {
|
"tasks": {
|
||||||
"label": ""
|
"label": "任务"
|
||||||
},
|
},
|
||||||
"docker": {
|
"docker": {
|
||||||
"label": "Docker"
|
"label": "Docker"
|
||||||
|
|||||||
@@ -952,6 +952,18 @@
|
|||||||
"opnsenseApiSecret": {
|
"opnsenseApiSecret": {
|
||||||
"label": "",
|
"label": "",
|
||||||
"newLabel": ""
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubAppId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubInstallationId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"privateKey": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1266,9 +1278,6 @@
|
|||||||
"showTitle": {
|
"showTitle": {
|
||||||
"label": ""
|
"label": ""
|
||||||
},
|
},
|
||||||
"showDescriptionTooltip": {
|
|
||||||
"label": ""
|
|
||||||
},
|
|
||||||
"pingEnabled": {
|
"pingEnabled": {
|
||||||
"label": ""
|
"label": ""
|
||||||
},
|
},
|
||||||
@@ -1280,6 +1289,15 @@
|
|||||||
"column": "",
|
"column": "",
|
||||||
"column-reverse": ""
|
"column-reverse": ""
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"descriptionDisplayMode": {
|
||||||
|
"label": "",
|
||||||
|
"description": "",
|
||||||
|
"option": {
|
||||||
|
"normal": "",
|
||||||
|
"tooltip": "",
|
||||||
|
"hidden": ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
@@ -2253,6 +2271,9 @@
|
|||||||
},
|
},
|
||||||
"maximumAmountPosts": {
|
"maximumAmountPosts": {
|
||||||
"label": ""
|
"label": ""
|
||||||
|
},
|
||||||
|
"hideDescription": {
|
||||||
|
"label": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -952,6 +952,18 @@
|
|||||||
"opnsenseApiSecret": {
|
"opnsenseApiSecret": {
|
||||||
"label": "API-nøgle (Secret)",
|
"label": "API-nøgle (Secret)",
|
||||||
"newLabel": "Ny API-nøgle (Key)"
|
"newLabel": "Ny API-nøgle (Key)"
|
||||||
|
},
|
||||||
|
"githubAppId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubInstallationId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"privateKey": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1003,7 +1015,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
"success": "",
|
"success": "Lykkedes",
|
||||||
"beta": "Beta",
|
"beta": "Beta",
|
||||||
"error": "Fejl",
|
"error": "Fejl",
|
||||||
"action": {
|
"action": {
|
||||||
@@ -1266,19 +1278,25 @@
|
|||||||
"showTitle": {
|
"showTitle": {
|
||||||
"label": "Vis app-navn"
|
"label": "Vis app-navn"
|
||||||
},
|
},
|
||||||
"showDescriptionTooltip": {
|
|
||||||
"label": "Vis beskrivelsesværktøjstip"
|
|
||||||
},
|
|
||||||
"pingEnabled": {
|
"pingEnabled": {
|
||||||
"label": "Aktiver statustjek"
|
"label": "Aktiver statustjek"
|
||||||
},
|
},
|
||||||
"layout": {
|
"layout": {
|
||||||
"label": "",
|
"label": "Layout",
|
||||||
"option": {
|
"option": {
|
||||||
"row": "",
|
"row": "Horisontal",
|
||||||
"row-reverse": "",
|
"row-reverse": "Horisontal (omvendt)",
|
||||||
"column": "",
|
"column": "Vertikal",
|
||||||
"column-reverse": ""
|
"column-reverse": "Vertikal (omvendt)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"descriptionDisplayMode": {
|
||||||
|
"label": "Visningstilstand for beskrivelse",
|
||||||
|
"description": "Vælg hvordan beskrivelsen af app skal vises",
|
||||||
|
"option": {
|
||||||
|
"normal": "Indenfor widget",
|
||||||
|
"tooltip": "Som værktøjstip",
|
||||||
|
"hidden": "Skjult"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2253,6 +2271,9 @@
|
|||||||
},
|
},
|
||||||
"maximumAmountPosts": {
|
"maximumAmountPosts": {
|
||||||
"label": "Grænse for antal indlæg"
|
"label": "Grænse for antal indlæg"
|
||||||
|
},
|
||||||
|
"hideDescription": {
|
||||||
|
"label": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -3273,10 +3294,10 @@
|
|||||||
"weeklyMonday": "Hver uge om mandagen",
|
"weeklyMonday": "Hver uge om mandagen",
|
||||||
"update": {
|
"update": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "Intervallet blev opdateret"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "Opdateringsinterval mislykkedes"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -3285,55 +3306,55 @@
|
|||||||
},
|
},
|
||||||
"field": {
|
"field": {
|
||||||
"name": {
|
"name": {
|
||||||
"label": ""
|
"label": "Navn"
|
||||||
},
|
},
|
||||||
"interval": {
|
"interval": {
|
||||||
"label": "Planlæg interval"
|
"label": "Planlæg interval"
|
||||||
},
|
},
|
||||||
"lastExecution": {
|
"lastExecution": {
|
||||||
"label": ""
|
"label": "Sidste kørsel"
|
||||||
},
|
},
|
||||||
"actions": {
|
"actions": {
|
||||||
"label": ""
|
"label": "Handlinger"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"table": {
|
"table": {
|
||||||
"search": ""
|
"search": "Søg efter {count} opgaver..."
|
||||||
},
|
},
|
||||||
"action": {
|
"action": {
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"label": ""
|
"label": "Opdater"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "Opgaver opdateret"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "Kunne ikke genopfriske opgaver"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"trigger": {
|
"trigger": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "Opgave udløst med succes"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "Mislykkedes at udløse opgave"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"enable": {
|
"enable": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "Opgave aktiveret"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"disable": {
|
"disable": {
|
||||||
"success": {
|
"success": {
|
||||||
"message": ""
|
"message": "Opgave deaktiveret"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"toggle": {
|
"toggle": {
|
||||||
"error": {
|
"error": {
|
||||||
"message": ""
|
"message": "Kunne ikke skifte opgavestatus"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -3843,7 +3864,7 @@
|
|||||||
"tools": {
|
"tools": {
|
||||||
"label": "Værktøjer",
|
"label": "Værktøjer",
|
||||||
"tasks": {
|
"tasks": {
|
||||||
"label": ""
|
"label": "Opgaver"
|
||||||
},
|
},
|
||||||
"docker": {
|
"docker": {
|
||||||
"label": "Docker"
|
"label": "Docker"
|
||||||
|
|||||||
@@ -952,6 +952,18 @@
|
|||||||
"opnsenseApiSecret": {
|
"opnsenseApiSecret": {
|
||||||
"label": "",
|
"label": "",
|
||||||
"newLabel": ""
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubAppId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubInstallationId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"privateKey": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1266,9 +1278,6 @@
|
|||||||
"showTitle": {
|
"showTitle": {
|
||||||
"label": "App Namen anzeigen"
|
"label": "App Namen anzeigen"
|
||||||
},
|
},
|
||||||
"showDescriptionTooltip": {
|
|
||||||
"label": "Beschreibungs des Tooltips anzeigen"
|
|
||||||
},
|
|
||||||
"pingEnabled": {
|
"pingEnabled": {
|
||||||
"label": "Statusüberprüfung aktivieren"
|
"label": "Statusüberprüfung aktivieren"
|
||||||
},
|
},
|
||||||
@@ -1280,6 +1289,15 @@
|
|||||||
"column": "",
|
"column": "",
|
||||||
"column-reverse": ""
|
"column-reverse": ""
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"descriptionDisplayMode": {
|
||||||
|
"label": "",
|
||||||
|
"description": "",
|
||||||
|
"option": {
|
||||||
|
"normal": "",
|
||||||
|
"tooltip": "",
|
||||||
|
"hidden": ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
@@ -2253,6 +2271,9 @@
|
|||||||
},
|
},
|
||||||
"maximumAmountPosts": {
|
"maximumAmountPosts": {
|
||||||
"label": "Limit für Beiträge"
|
"label": "Limit für Beiträge"
|
||||||
|
},
|
||||||
|
"hideDescription": {
|
||||||
|
"label": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -952,6 +952,18 @@
|
|||||||
"opnsenseApiSecret": {
|
"opnsenseApiSecret": {
|
||||||
"label": "",
|
"label": "",
|
||||||
"newLabel": ""
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubAppId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"githubInstallationId": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
|
},
|
||||||
|
"privateKey": {
|
||||||
|
"label": "",
|
||||||
|
"newLabel": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1266,9 +1278,6 @@
|
|||||||
"showTitle": {
|
"showTitle": {
|
||||||
"label": "App Namen anzeigen"
|
"label": "App Namen anzeigen"
|
||||||
},
|
},
|
||||||
"showDescriptionTooltip": {
|
|
||||||
"label": "Beschreibungs des Tooltips anzeigen"
|
|
||||||
},
|
|
||||||
"pingEnabled": {
|
"pingEnabled": {
|
||||||
"label": "Statusüberprüfung aktivieren"
|
"label": "Statusüberprüfung aktivieren"
|
||||||
},
|
},
|
||||||
@@ -1280,6 +1289,15 @@
|
|||||||
"column": "",
|
"column": "",
|
||||||
"column-reverse": ""
|
"column-reverse": ""
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"descriptionDisplayMode": {
|
||||||
|
"label": "",
|
||||||
|
"description": "",
|
||||||
|
"option": {
|
||||||
|
"normal": "",
|
||||||
|
"tooltip": "",
|
||||||
|
"hidden": ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
@@ -2253,6 +2271,9 @@
|
|||||||
},
|
},
|
||||||
"maximumAmountPosts": {
|
"maximumAmountPosts": {
|
||||||
"label": "Limit für Beiträge"
|
"label": "Limit für Beiträge"
|
||||||
|
},
|
||||||
|
"hideDescription": {
|
||||||
|
"label": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Loaded 100 of 145 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user