From b0089e8bfaa875b1275a6e4761cb80997cbb081e Mon Sep 17 00:00:00 2001 From: kshitij Date: Mon, 3 Aug 2026 11:07:42 +0530 Subject: [PATCH] perf(desktop): skip store update when pet metadata is unchanged MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mergePetInfoMeta now returns the same object reference when all fields match, and callers skip setPetInfo on reference equality. Without this, every 15s poll and window-focus refetch fired a nanostores set with a new-allocated object, triggering a React re-render of FloatingPet even when nothing changed — a regression from the old samePetRevision guard which returned without calling setPetInfo. --- .../src/components/pet/floating-pet.tsx | 5 ++++- apps/desktop/src/store/pet-gallery.test.ts | 2 +- apps/desktop/src/store/pet-gallery.ts | 5 ++++- apps/desktop/src/store/pet.test.ts | 21 +++++++++++++++++++ apps/desktop/src/store/pet.ts | 15 ++++++++++++- 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src/components/pet/floating-pet.tsx b/apps/desktop/src/components/pet/floating-pet.tsx index 70350ec8c9..2b7dff0d4c 100644 --- a/apps/desktop/src/components/pet/floating-pet.tsx +++ b/apps/desktop/src/components/pet/floating-pet.tsx @@ -171,7 +171,10 @@ export function FloatingPet() { const current = $petInfo.get() if (hasPetSpriteForMeta(current, meta)) { - setPetInfo(mergePetInfoMeta(current, meta)) + const merged = mergePetInfoMeta(current, meta) + if (merged !== current) { + setPetInfo(merged) + } return } diff --git a/apps/desktop/src/store/pet-gallery.test.ts b/apps/desktop/src/store/pet-gallery.test.ts index 08243270e7..de82c06b8f 100644 --- a/apps/desktop/src/store/pet-gallery.test.ts +++ b/apps/desktop/src/store/pet-gallery.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { $petInfo, setPetInfo } from './pet' -import { $petGallery, adoptPet, loadPetGallery, resetPetGallery, type GatewayRequest } from './pet-gallery' +import { $petGallery, adoptPet, loadPetGallery, type GatewayRequest, resetPetGallery } from './pet-gallery' function localGallery() { return { diff --git a/apps/desktop/src/store/pet-gallery.ts b/apps/desktop/src/store/pet-gallery.ts index 01b555b90c..b44e22bd3e 100644 --- a/apps/desktop/src/store/pet-gallery.ts +++ b/apps/desktop/src/store/pet-gallery.ts @@ -215,7 +215,10 @@ async function syncInfo(request: GatewayRequest): Promise { const current = $petInfo.get() if (hasPetSpriteForMeta(current, meta)) { - setPetInfo(mergePetInfoMeta(current, meta)) + const merged = mergePetInfoMeta(current, meta) + if (merged !== current) { + setPetInfo(merged) + } return } diff --git a/apps/desktop/src/store/pet.test.ts b/apps/desktop/src/store/pet.test.ts index fcee70c622..9d7f83add1 100644 --- a/apps/desktop/src/store/pet.test.ts +++ b/apps/desktop/src/store/pet.test.ts @@ -9,6 +9,7 @@ import { flashPetActivity, hasPetSpriteForMeta, mergePetInfoMeta, + type PetInfo, setPetActivity } from './pet' @@ -105,6 +106,26 @@ describe('pet info metadata cache helpers', () => { spritesheetRevision: '100:2048' }) }) + + it('returns the same reference when nothing changed to avoid redundant store updates', () => { + const current: PetInfo = { + enabled: true, + slug: 'boba', + displayName: 'Boba', + scale: 0.33, + spritesheetBase64: 'large-sprite-payload', + spritesheetRevision: '100:2048' + } + const meta = { + enabled: true, + slug: 'boba', + displayName: 'Boba', + scale: 0.33, + spritesheetRevision: '100:2048' + } + + expect(mergePetInfoMeta(current, meta)).toBe(current) + }) }) describe('flashPetActivity', () => { diff --git a/apps/desktop/src/store/pet.ts b/apps/desktop/src/store/pet.ts index 2c0c06581b..ed28cc2dbc 100644 --- a/apps/desktop/src/store/pet.ts +++ b/apps/desktop/src/store/pet.ts @@ -60,7 +60,20 @@ export function hasPetSpriteForMeta(info: PetInfo, meta: PetInfoMeta): boolean { export function mergePetInfoMeta(info: PetInfo, meta: PetInfoMeta): PetInfo { if (!meta.enabled) { - return { enabled: false } + return info.enabled ? { enabled: false } : info + } + + // Fast-path: nothing changed — return the same reference so callers can + // skip the store update (nanostores fires on .set() regardless of deep + // equality; returning `info` avoids a redundant re-render on every poll). + if ( + info.enabled && + info.slug === meta.slug && + info.displayName === meta.displayName && + info.scale === meta.scale && + info.spritesheetRevision === meta.spritesheetRevision + ) { + return info } return {