Compare commits

..
Author SHA1 Message Date
ajnart dd99dd6d7b style: auto-fix lint and format 2026-07-21 14:02:05 +00:00
ajnart e93e9ed839 fix(media-server): guard against undefined playback from stale cache
PR #6315 added playback/location fields to StreamSession but cached
query data may still lack these fields, causing 'can't access property
state, playback is undefined' errors on the media server widget.
2026-07-21 16:00:54 +02:00
homarr-renovate[bot] dd23de7aaa chore(deps): update pnpm to v11.13.1 (#6422)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-07-21 05:54:52 +00:00
Thomas f1602f67d4 fix: stop auto-seeding ArchiveTeam Warrior integration and widget on default dashboards (#6413) 2026-07-20 17:01:07 +02:00
6 changed files with 65 additions and 17 deletions

No files matched your search

+2 -2
View File
@@ -6,7 +6,7 @@
}, },
"engines": { "engines": {
"node": ">=24.18.0", "node": ">=24.18.0",
"pnpm": ">=11.11.0" "pnpm": ">=11.13.1"
}, },
"packageManager": "pnpm@11.11.0" "packageManager": "pnpm@11.13.1"
} }
+2 -2
View File
@@ -69,7 +69,7 @@
}, },
"engines": { "engines": {
"node": ">=24.18.0", "node": ">=24.18.0",
"pnpm": ">=11.11.0" "pnpm": ">=11.13.1"
}, },
"packageManager": "pnpm@11.11.0" "packageManager": "pnpm@11.13.1"
} }
@@ -271,6 +271,7 @@ export const onboardRouter = createTRPCRouter({
setupIntegrations: onboardingProcedure.requiresStep("integrations").mutation(async ({ ctx }) => { setupIntegrations: onboardingProcedure.requiresStep("integrations").mutation(async ({ ctx }) => {
const db = ctx.db; const db = ctx.db;
const allIntegrations = await db.query.integrations.findMany();
const allApps = await db.query.apps.findMany(); const allApps = await db.query.apps.findMany();
const board = await db.query.boards.findFirst({ const board = await db.query.boards.findFirst({
@@ -315,6 +316,7 @@ export const onboardRouter = createTRPCRouter({
layoutId: layout.id, layoutId: layout.id,
columnCount: layout.columnCount, columnCount: layout.columnCount,
}, },
allIntegrations,
allApps, allApps,
); );
} }
+2
View File
@@ -698,11 +698,13 @@ const seedBoardWidgetsAsync = async (db: Database) => {
const layout = board.layouts[0]; const layout = board.layouts[0];
if (!section || !layout) return; if (!section || !layout) return;
const allIntegrations = await db.query.integrations.findMany();
const allApps = await db.query.apps.findMany(); const allApps = await db.query.apps.findMany();
const count = await placeAllWidgetsAsync( const count = await placeAllWidgetsAsync(
db, db,
{ boardId: board.id, sectionId: section.id, layoutId: layout.id, columnCount: layout.columnCount }, { boardId: board.id, sectionId: section.id, layoutId: layout.id, columnCount: layout.columnCount },
allIntegrations,
allApps, allApps,
); );
+48 -8
View File
@@ -1,11 +1,19 @@
import { stringify } from "superjson"; import superjson from "superjson";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { defaultBookmarkApps, defaultWidgetConfigs, emptySuperJSON } from "@homarr/definitions"; import {
defaultBookmarkApps,
defaultWidgetConfigs,
emptySuperJSON,
getWidgetKindsForIntegration,
} from "@homarr/definitions";
import type { WidgetKind } from "@homarr/definitions"; import type { WidgetKind } from "@homarr/definitions";
import type { Database } from ".."; import type { Database } from "..";
import { integrationItems, itemLayouts, items } from "../schema"; import { integrationItems, itemLayouts, items } from "../schema";
import type { Integration } from "../schema";
const widgetConfigMap = new Map(defaultWidgetConfigs.map((config) => [config.kind, config]));
interface BoardTarget { interface BoardTarget {
boardId: string; boardId: string;
@@ -69,7 +77,12 @@ interface App {
name: string; name: string;
} }
export const placeAllWidgetsAsync = async (db: Database, target: BoardTarget, allApps: App[]) => { export const placeAllWidgetsAsync = async (
db: Database,
target: BoardTarget,
allIntegrations: Integration[],
allApps: App[],
) => {
const ctx: PlacementContext = { const ctx: PlacementContext = {
...target, ...target,
xOffset: 0, xOffset: 0,
@@ -79,11 +92,38 @@ export const placeAllWidgetsAsync = async (db: Database, target: BoardTarget, al
const placedWidgets = new Set<WidgetKind>(); const placedWidgets = new Set<WidgetKind>();
for (const integration of allIntegrations) {
for (const widgetKind of getWidgetKindsForIntegration(integration.kind)) {
if (placedWidgets.has(widgetKind)) continue;
const config = widgetConfigMap.get(widgetKind);
if (config?.skip) continue;
placedWidgets.add(widgetKind);
const matchingIds = allIntegrations
.filter((row) => getWidgetKindsForIntegration(row.kind).includes(widgetKind))
.map((row) => row.id);
const options = config?.options ? superjson.stringify(config.options) : undefined;
await placeWidgetAsync(
db,
ctx,
widgetKind,
matchingIds,
options,
config && { width: config.width, height: config.height },
);
}
}
for (const app of allApps) { for (const app of allApps) {
await placeWidgetAsync(db, ctx, "app", [], stringify({ appId: app.id, openInNewTab: true, showTitle: true }), { await placeWidgetAsync(
width: 1, db,
height: 1, ctx,
}); "app",
[],
superjson.stringify({ appId: app.id, openInNewTab: true, showTitle: true }),
{ width: 1, height: 1 },
);
} }
const bookmarkAppNames = new Set(defaultBookmarkApps.map((bookmark) => bookmark.name)); const bookmarkAppNames = new Set(defaultBookmarkApps.map((bookmark) => bookmark.name));
@@ -98,7 +138,7 @@ export const placeAllWidgetsAsync = async (db: Database, target: BoardTarget, al
options = { ...options, items: bookmarkAppIds }; options = { ...options, items: bookmarkAppIds };
} }
await placeWidgetAsync(db, ctx, config.kind, [], options ? stringify(options) : undefined, { await placeWidgetAsync(db, ctx, config.kind, [], options ? superjson.stringify(options) : undefined, {
width: config.width, width: config.width,
height: config.height, height: config.height,
}); });
@@ -66,16 +66,20 @@ export default function MediaServerWidget({ options, integrationIds }: WidgetCom
const currentlyPlaying = row.original.currentlyPlaying; const currentlyPlaying = row.original.currentlyPlaying;
if (!currentlyPlaying) return null; if (!currentlyPlaying) return null;
const isPaused = currentlyPlaying.playback.state === "paused"; const playback = currentlyPlaying.playback;
const isPaused = playback?.state === "paused";
const Icon = isPaused ? IconPlayerPause : mediaTypeIconMap[currentlyPlaying.type]; const Icon = isPaused ? IconPlayerPause : mediaTypeIconMap[currentlyPlaying.type];
const { positionMs, durationMs } = currentlyPlaying.playback; const positionMs = playback?.positionMs ?? null;
const durationMs = playback?.durationMs ?? null;
const progressPercent = const progressPercent =
positionMs !== null && durationMs !== null && durationMs > 0 positionMs !== null && durationMs !== null && durationMs > 0
? Math.min(100, Math.round((positionMs / durationMs) * 100)) ? Math.min(100, Math.round((positionMs / durationMs) * 100))
: null; : null;
const remainingMinutes = const remainingMinutes =
positionMs !== null && durationMs !== null ? Math.max(0, Math.round((durationMs - positionMs) / 60_000)) : null; positionMs !== null && durationMs !== null
? Math.max(0, Math.round((durationMs - positionMs) / 60_000))
: null;
return ( return (
<Stack gap={4} style={{ minWidth: 0 }}> <Stack gap={4} style={{ minWidth: 0 }}>
@@ -122,8 +126,8 @@ export default function MediaServerWidget({ options, integrationIds }: WidgetCom
const isTranscoding = Boolean( const isTranscoding = Boolean(
currentlyPlaying.metadata?.transcoding.target.videoCodec ?? currentlyPlaying.metadata?.transcoding.target.videoCodec ??
currentlyPlaying.metadata?.transcoding.target.audioCodec ?? currentlyPlaying.metadata?.transcoding.target.audioCodec ??
currentlyPlaying.metadata?.transcoding.container, currentlyPlaying.metadata?.transcoding.container,
); );
return ( return (