diff --git a/src/backend/common/AbstractComponent.ts b/src/backend/common/AbstractComponent.ts index 4fdc7731..bdcbd41a 100644 --- a/src/backend/common/AbstractComponent.ts +++ b/src/backend/common/AbstractComponent.ts @@ -196,7 +196,7 @@ export default abstract class AbstractComponent extends AbstractInitializable { const shouldLog = log ?? this.config.options?.playTransform?.log ?? isDebugMode(); - const transformHash = `playTransform-${hashObject(hook)}-${hashObject(metaInvariantTransform(play))}`; + const transformHash = `playTransform-${hashObject(hook)}-${hashObject(playContentInvariantTransform(play))}`; const cachedTransformPlay = await this.cache.cacheTransform.get(transformHash); if(cachedTransformPlay !== undefined) { // if(shouldLog) { @@ -349,7 +349,7 @@ export default abstract class AbstractComponent extends AbstractInitializable { // } // ] // } - await this.cache.cacheTransform.set(transformHash, transformedPlay, '5m'); + await this.cache.cacheTransform.set(transformHash, transformedPlay, '10m'); return transformedPlay; } catch (e) { logger.warn(new Error(`Unexpected error occurred, returning original play.`, {cause: e})); diff --git a/src/backend/sources/SonosSource.ts b/src/backend/sources/SonosSource.ts index 7ddf830a..1af0b5e4 100644 --- a/src/backend/sources/SonosSource.ts +++ b/src/backend/sources/SonosSource.ts @@ -8,7 +8,6 @@ import { PlayerStateData, REPORTED_PLAYER_STATUSES, ReportedPlayerStatus, - SINGLE_USER_PLATFORM_ID, } from "../common/infrastructure/Atomic.js"; import { RecentlyPlayedOptions } from "./AbstractSource.js"; import { MemoryPositionalSource } from "./MemoryPositionalSource.js"; @@ -21,7 +20,6 @@ import { parseDurationFromTimestamp } from "../utils/TimeUtils.js"; import { FixedSizeList } from "fixed-size-list"; import { buildStatePlayerPlayIdententifyingInfo, hashObject, parseArrayFromMaybeString } from "../utils/StringUtils.js"; import { isDebugMode, playObjDataMatch, sleep } from "../utils.js"; -import { playContentInvariantTransform } from "../utils/PlayComparisonUtils.js"; import dayjs, { Dayjs } from "dayjs"; import { baseFormatPlayObj } from "../utils/PlayTransformUtils.js"; diff --git a/src/backend/utils/PlayComparisonUtils.ts b/src/backend/utils/PlayComparisonUtils.ts index b97baf60..56e3db2b 100644 --- a/src/backend/utils/PlayComparisonUtils.ts +++ b/src/backend/utils/PlayComparisonUtils.ts @@ -42,6 +42,8 @@ export const playContentInvariantTransform = (play: PlayObject): PlayObjectLifec data: { playDate, playDateCompleted, + listenRanges, + listenedFor, ...rest } } = play;