Skip to content

Commit 275cf65

Browse files
fix: harden favicon cache invalidation
1 parent f77304e commit 275cf65

4 files changed

Lines changed: 25 additions & 8 deletions

File tree

‎apps/mobile/src/components/ProjectFavicon.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ function ProjectFaviconImage(props: {
101101
if (props.cacheKey) loadedFaviconKeys.add(props.cacheKey);
102102
setStatus("loaded");
103103
}}
104-
onError={() => setStatus("error")}
104+
onError={() => {
105+
if (props.cacheKey) loadedFaviconKeys.delete(props.cacheKey);
106+
setStatus("error");
107+
}}
105108
/>
106109
) : null}
107110
</View>

‎apps/server/src/assets/AssetAccess.test.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,16 @@ describe("AssetAccess", () => {
214214
prefix: "t3-asset-favicon-",
215215
});
216216
const faviconPath = path.join(root, "favicon.svg");
217-
yield* fileSystem.writeFileString(faviconPath, "<svg />");
217+
const initialFavicon = "<svg>a</svg>";
218+
const updatedFavicon = "<svg>b</svg>";
219+
expect(updatedFavicon).toHaveLength(initialFavicon.length);
220+
yield* fileSystem.writeFileString(faviconPath, initialFavicon);
218221
const canonicalFaviconPath = yield* fileSystem.realPath(faviconPath);
219222

220223
const faviconResult = yield* issueAssetUrl({
221224
resource: { _tag: "project-favicon", cwd: root },
222225
});
223-
expect(faviconResult.relativeUrl).toMatch(/\/v[0-9a-z]+-[0-9a-z]+-favicon\.svg$/);
226+
expect(faviconResult.relativeUrl).toMatch(/\/v[0-9a-f]{64}-favicon\.svg$/);
224227
expect(
225228
yield* issueAssetUrl({
226229
resource: { _tag: "project-favicon", cwd: root },
@@ -235,7 +238,7 @@ describe("AssetAccess", () => {
235238
),
236239
).toEqual({ kind: "file", path: canonicalFaviconPath });
237240

238-
yield* fileSystem.writeFileString(faviconPath, "<svg>updated favicon</svg>");
241+
yield* fileSystem.writeFileString(faviconPath, updatedFavicon);
239242
const updatedFaviconResult = yield* issueAssetUrl({
240243
resource: { _tag: "project-favicon", cwd: root },
241244
});

‎apps/server/src/assets/AssetAccess.ts‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import {
2121
} from "@t3tools/shared/filePreview";
2222
import { PROJECT_FAVICON_FALLBACK_MARKER } from "@t3tools/shared/projectFavicon";
2323
import * as Clock from "effect/Clock";
24+
import * as Crypto from "effect/Crypto";
2425
import * as Effect from "effect/Effect";
26+
import * as Encoding from "effect/Encoding";
2527
import * as FileSystem from "effect/FileSystem";
2628
import * as Option from "effect/Option";
2729
import * as Path from "effect/Path";
@@ -168,6 +170,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
168170
readonly resource: AssetResource;
169171
readonly workspaceRoot?: string;
170172
}) {
173+
const crypto = yield* Crypto.Crypto;
171174
const fileSystem = yield* FileSystem.FileSystem;
172175
const path = yield* Path.Path;
173176
const workspacePaths = yield* WorkspacePaths.WorkspacePaths;
@@ -332,7 +335,17 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
332335
expiresAt,
333336
};
334337
if (relativePath && canonicalFaviconPath) {
335-
const faviconInfo = yield* fileSystem.stat(canonicalFaviconPath).pipe(
338+
const faviconBytes = yield* fileSystem.readFile(canonicalFaviconPath).pipe(
339+
Effect.mapError(
340+
(cause) =>
341+
new AssetProjectFaviconInspectionError({
342+
resource: input.resource,
343+
cause,
344+
}),
345+
),
346+
);
347+
const revision = yield* crypto.digest("SHA-256", faviconBytes).pipe(
348+
Effect.map(Encoding.encodeHex),
336349
Effect.mapError(
337350
(cause) =>
338351
new AssetProjectFaviconInspectionError({
@@ -341,8 +354,6 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
341354
}),
342355
),
343356
);
344-
const modifiedAt = Option.getOrUndefined(faviconInfo.mtime)?.getTime() ?? 0;
345-
const revision = `${modifiedAt.toString(36)}-${faviconInfo.size.toString(36)}`;
346357
fileName = `${PROJECT_FAVICON_VERSION_PREFIX}${revision}-${path.basename(relativePath)}`;
347358
} else {
348359
fileName = PROJECT_FAVICON_FALLBACK_MARKER;

‎packages/shared/src/projectFavicon.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export function getProjectFaviconCacheKey(
44
environmentId: string,
55
workspaceRoot: string,
66
url: string,
7-
): string {
7+
) {
88
let revision = url;
99

1010
try {

0 commit comments

Comments
 (0)