Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Use client-side fallbacks for missing project favicons (#3959)
Julius Marminge8de254a685f4
diff --git a/apps/mobile/src/components/ProjectFavicon.tsx b/apps/mobile/src/components/ProjectFavicon.tsxindex 7c29eeaa2..772d5e8cc 100644--- a/apps/mobile/src/components/ProjectFavicon.tsx+++ b/apps/mobile/src/components/ProjectFavicon.tsx@@ -3,6 +3,7 @@ import { Image } from "expo-image";import { useState } from "react";import { View } from "react-native";import type { EnvironmentId } from "@t3tools/contracts";+import { isProjectFaviconFallbackUrl } from "@t3tools/shared/projectFavicon";import { useThemeColor } from "../lib/useThemeColor";import { useAssetUrl } from "../state/assets";@@ -24,11 +25,12 @@ export function ProjectFavicon(props: {? null: { _tag: "project-favicon", cwd: props.workspaceRoot },);+ const renderableFaviconUrl = isProjectFaviconFallbackUrl(faviconUrl) ? null : faviconUrl;return (<ProjectFaviconImagekey={faviconUrl}- faviconUrl={faviconUrl}+ faviconUrl={renderableFaviconUrl}open={props.open}projectTitle={props.projectTitle}size={size}diff --git a/apps/server/src/assets/AssetAccess.test.ts b/apps/server/src/assets/AssetAccess.test.tsindex f790e71f5..06a22754e 100644--- a/apps/server/src/assets/AssetAccess.test.ts+++ b/apps/server/src/assets/AssetAccess.test.ts@@ -1,5 +1,6 @@import * as NodeServices from "@effect/platform-node/NodeServices";import { ThreadId } from "@t3tools/contracts";+import { PROJECT_FAVICON_FALLBACK_MARKER } from "@t3tools/shared/projectFavicon";import { describe, expect, it } from "@effect/vitest";import * as Effect from "effect/Effect";import * as FileSystem from "effect/FileSystem";@@ -228,6 +229,7 @@ describe("AssetAccess", () => {const fallbackResult = yield* issueAssetUrl({resource: { _tag: "project-favicon", cwd: root },});+ expect(fallbackResult.relativeUrl.endsWith(`/${PROJECT_FAVICON_FALLBACK_MARKER}`)).toBe(true);const fallbackSuffix = fallbackResult.relativeUrl.slice(`${ASSET_ROUTE_PREFIX}/`.length);const fallbackSeparatorIndex = fallbackSuffix.indexOf("/");expect(@@ -235,7 +237,7 @@ describe("AssetAccess", () => {fallbackSuffix.slice(0, fallbackSeparatorIndex),fallbackSuffix.slice(fallbackSeparatorIndex + 1),),- ).toEqual({ kind: "project-favicon-fallback" });+ ).toBeNull();}).pipe(Effect.provide(testLayer)),);diff --git a/apps/server/src/assets/AssetAccess.ts b/apps/server/src/assets/AssetAccess.tsindex 8d8ecbc2a..b469e0e31 100644--- a/apps/server/src/assets/AssetAccess.ts+++ b/apps/server/src/assets/AssetAccess.ts@@ -19,6 +19,7 @@ import {WORKSPACE_BROWSER_PREVIEW_EXTENSIONS,WORKSPACE_IMAGE_PREVIEW_EXTENSIONS,} from "@t3tools/shared/filePreview";+import { PROJECT_FAVICON_FALLBACK_MARKER } from "@t3tools/shared/projectFavicon";import * as Clock from "effect/Clock";import * as Effect from "effect/Effect";import * as FileSystem from "effect/FileSystem";@@ -40,7 +41,6 @@ import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";export const ASSET_ROUTE_PREFIX = "/api/assets";-export const FALLBACK_PROJECT_FAVICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="none" stroke="#6b728080" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" data-fallback="project-favicon"><path d="M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-8l-2-2H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2Z"/></svg>`;const SIGNING_SECRET_NAME = "asset-access-signing-key";const ASSET_TOKEN_TTL_MS = 60 * 60 * 1000;@@ -91,9 +91,7 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);-export type ResolvedAsset =- | { readonly kind: "file"; readonly path: string }- | { readonly kind: "project-favicon-fallback" };+export type ResolvedAsset = { readonly kind: "file"; readonly path: string };function decodeClaims(encodedPayload: string): AssetClaims | null {try {@@ -326,7 +324,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (irelativePath,expiresAt,};- fileName = relativePath ? path.basename(relativePath) : "favicon.svg";+ fileName = relativePath ? path.basename(relativePath) : PROJECT_FAVICON_FALLBACK_MARKER;break;}}@@ -391,9 +389,7 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (}if (claims.kind === "project-favicon") {- if (claims.relativePath === null) {- return { kind: "project-favicon-fallback" } satisfies ResolvedAsset;- }+ if (claims.relativePath === null) return null;const faviconPath = yield* resolveCanonicalWorkspaceFileForRequest({workspaceRoot: claims.workspaceRoot,relativePath: claims.relativePath,diff --git a/apps/server/src/http.ts b/apps/server/src/http.tsindex fc7a9ef13..b9bb40f37 100644--- a/apps/server/src/http.ts+++ b/apps/server/src/http.ts@@ -25,11 +25,7 @@ import * as HttpApiBuilder from "effect/unstable/httpapi/HttpApiBuilder";import { OtlpTracer } from "effect/unstable/observability";import * as ServerConfig from "./config.ts";-import {- ASSET_ROUTE_PREFIX,- FALLBACK_PROJECT_FAVICON_SVG,- resolveAsset,-} from "./assets/AssetAccess.ts";+import { ASSET_ROUTE_PREFIX, resolveAsset } from "./assets/AssetAccess.ts";import * as BrowserTraceCollector from "./observability/BrowserTraceCollector.ts";import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";import { traceRelayRequest } from "./cloud/traceRelayRequest.ts";@@ -196,17 +192,6 @@ export const assetRouteLayer = HttpRouter.add(if (!asset) {return HttpServerResponse.text("Not Found", { status: 404 });}- if (asset.kind === "project-favicon-fallback") {- return HttpServerResponse.text(FALLBACK_PROJECT_FAVICON_SVG, {- status: 200,- contentType: "image/svg+xml",- headers: {- "Cache-Control": "private, max-age=3600",- "X-Content-Type-Options": "nosniff",- },- });- }-return yield* HttpServerResponse.file(asset.path, {status: 200,headers: {diff --git a/apps/web/src/components/ProjectFavicon.tsx b/apps/web/src/components/ProjectFavicon.tsxindex 481ddab05..f7603a36e 100644--- a/apps/web/src/components/ProjectFavicon.tsx+++ b/apps/web/src/components/ProjectFavicon.tsx@@ -1,4 +1,5 @@import type { EnvironmentId } from "@t3tools/contracts";+import { isProjectFaviconFallbackUrl } from "@t3tools/shared/projectFavicon";import { FolderIcon } from "lucide-react";import { useState } from "react";import { useAssetUrl } from "../assets/assetUrls";@@ -15,7 +16,7 @@ export function ProjectFavicon(input: {cwd: input.cwd,});- if (!src) {+ if (!src || isProjectFaviconFallbackUrl(src)) {return <ProjectFaviconFallback className={input.className} />;}diff --git a/packages/shared/package.json b/packages/shared/package.jsonindex e08844cbf..bf68ce766 100644--- a/packages/shared/package.json+++ b/packages/shared/package.json@@ -3,6 +3,10 @@"private": true,"type": "module","exports": {+ "./projectFavicon": {+ "types": "./src/projectFavicon.ts",+ "import": "./src/projectFavicon.ts"+ },"./model": {"types": "./src/model.ts","import": "./src/model.ts"diff --git a/packages/shared/src/projectFavicon.test.ts b/packages/shared/src/projectFavicon.test.tsnew file mode 100644index 000000000..0011b2fc7--- /dev/null+++ b/packages/shared/src/projectFavicon.test.ts@@ -0,0 +1,28 @@+import { describe, expect, it } from "vite-plus/test";++import { isProjectFaviconFallbackUrl, PROJECT_FAVICON_FALLBACK_MARKER } from "./projectFavicon.ts";++describe("project favicon", () => {+ it("identifies fallback asset URLs by their dedicated filename", () => {+ expect(+ isProjectFaviconFallbackUrl(+ `https://environment.example/api/assets/signed-token/${PROJECT_FAVICON_FALLBACK_MARKER}`,+ ),+ ).toBe(true);+ expect(+ isProjectFaviconFallbackUrl(`/api/assets/signed-token/${PROJECT_FAVICON_FALLBACK_MARKER}`),+ ).toBe(true);+ });++ it("does not mistake real favicons or query parameters for fallbacks", () => {+ expect(+ isProjectFaviconFallbackUrl("https://environment.example/api/assets/token/favicon.svg"),+ ).toBe(false);+ expect(+ isProjectFaviconFallbackUrl(+ `https://environment.example/api/assets/token/favicon.svg?name=${PROJECT_FAVICON_FALLBACK_MARKER}`,+ ),+ ).toBe(false);+ expect(isProjectFaviconFallbackUrl(null)).toBe(false);+ });+});diff --git a/packages/shared/src/projectFavicon.ts b/packages/shared/src/projectFavicon.tsnew file mode 100644index 000000000..2e46429b6--- /dev/null+++ b/packages/shared/src/projectFavicon.ts@@ -0,0 +1,12 @@+export const PROJECT_FAVICON_FALLBACK_MARKER = "project-favicon-missing";++export function isProjectFaviconFallbackUrl(url: string | null | undefined): boolean {+ if (!url) return false;++ try {+ const pathname = new URL(url, "https://t3.invalid").pathname;+ return pathname.slice(pathname.lastIndexOf("/") + 1) === PROJECT_FAVICON_FALLBACK_MARKER;+ } catch {+ return false;+ }+}