@teamscala/service-boot 0.23.348 → 0.23.349

package/package.json

@@ -1062,5 +1062,5 @@
   "repository": "https://github.com/teamgbg/service-boot",
   "sideEffects": false,
   "type": "module",
-  "version": "0.23.348"
+  "version": "0.23.349"
 }

package/src/resource-not-found.test.ts

@@ -7,7 +7,12 @@
  * the response builder are pure (no S3), so the behaviour is exercised directly.
  */
 import { describe, expect, it } from "bun:test";
-import { PrimaryResourceMissingError, buildResourceNotFoundResponse } from "./resource-not-found.ts";
+import {
+	PrimaryResourceMissingError,
+	buildResourceNotFoundResponse,
+	inlineLogoAsDataUri,
+} from "./resource-not-found.ts";
+import { buildWakingPageHtml } from "@teamscala/os/brand/waking-page-html";
 
 describe("PrimaryResourceMissingError", () => {
 	it("is an Error carrying resourceType + httpStatus", () => {
@@ -29,6 +34,43 @@ describe("PrimaryResourceMissingError", () => {
 });
 
 describe("buildResourceNotFoundResponse", () => {
+	it("loads the organization logo from its stored upload path", async () => {
+		const bytes = new Uint8Array([137, 80, 78, 71]);
+		const requested: string[] = [];
+		const logo = await inlineLogoAsDataUri(
+			"/api/files/c503629a/logos/cropped.png",
+			async () => ({
+				file(key) {
+					requested.push(key);
+					return {
+						stat: async () => ({}),
+						arrayBuffer: async () => bytes.buffer,
+					};
+				},
+			}),
+		);
+		expect(requested).toEqual(["c503629a/logos/cropped.png"]);
+		expect(logo).toBe("data:image/png;base64,iVBORw==");
+	});
+
+	it("passes the resolved logo to the waking page instead of its placeholder", async () => {
+		const logo = await inlineLogoAsDataUri(
+			"/api/files/c503629a/logos/cropped.png",
+			async () => ({
+				file() {
+					return {
+						stat: async () => ({}),
+						arrayBuffer: async () => new Uint8Array([137, 80, 78, 71]).buffer,
+					};
+				},
+			}),
+		);
+		const html = buildWakingPageHtml({ logoUrl: logo });
+		expect(logo).toStartWith("data:image/png;base64,");
+		expect(html).toContain('<img src="data:image/png;base64,iVBORw=="');
+		expect(html).not.toContain('class="uif-logo-loading-pulse" aria-hidden="true"');
+	});
+
 	it("returns a 404 Response for a dead link", () => {
 		const res = buildResourceNotFoundResponse("project");
 		expect(res).toBeInstanceOf(Response);

package/src/resource-not-found.ts

@@ -34,6 +34,7 @@ import { createNotifyListener, getDirectDatabaseUrl } from "@teamscala/db/notify
 import { getServerClient } from "@teamscala/orpc/server-client-registry";
 import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
 import { toAssetPath } from "@teamscala/formatters/asset-url";
+import { getAppLogger } from "@teamscala/logger/app-loggers";
 import { brandLogoImgTag } from "@teamscala/os/brand/brand-logo-img-tag";
 import { ServiceInstallConfigSchema } from "./load-service-install-row.ts";
 
@@ -72,6 +73,7 @@ export async function resolveErrorPageLogo(
 	serviceSlug: string,
 ): Promise<string | null> {
 	return logoCache.fetchOrCompute(serviceSlug, async () => {
+		const log = getAppLogger();
 		try {
 			const cfg = await loadRegistryConfig(
 				"service_install",
@@ -79,7 +81,10 @@ export async function resolveErrorPageLogo(
 				ServiceInstallConfigSchema,
 			);
 			const org = (cfg as { brand_org?: string }).brand_org;
-			if (!org) return null;
+			if (!org) {
+				log.warn(`[brand-logo:${serviceSlug}] no brand_org configured`);
+				return null;
+			}
 			const prisma = (await getServerClient()) as {
 				organisation_profile?: {
 					findFirst?: (a: unknown) => Promise<unknown>;
@@ -99,8 +104,22 @@ export async function resolveErrorPageLogo(
 				row?.company_logo_for_dark_theme ||
 				row?.company_logo_for_light_theme ||
 				null;
-			return stored ? inlineLogoAsDataUri(stored) : null;
-		} catch {
+			if (!stored) {
+				log.error(`[brand-logo:${serviceSlug}] organization ${org} has no logo configured`);
+				return null;
+			}
+			const logo = await inlineLogoAsDataUri(stored);
+			if (!logo) {
+				log.error(`[brand-logo:${serviceSlug}] failed to load logo`, {
+					organizationId: org,
+					storedPath: stored,
+				});
+			}
+			return logo;
+		} catch (error) {
+			log.error(`[brand-logo:${serviceSlug}] failed to resolve organization logo`, {
+				error: error instanceof Error ? error.message : String(error),
+			});
 			return null;
 		}
 	});
@@ -120,16 +139,26 @@ const ASSETS_PREFIX = "/api/assets/";
  * key, `/api/files/`, tigris URL) to `/api/assets/<key>`, and the proxy
  * decodes that path segment to the S3 key. Skew-tolerant: any miss → null.
  */
-async function inlineLogoAsDataUri(
+type LogoStorage = {
+	file(key: string): {
+		stat(): Promise<unknown>;
+		arrayBuffer(): Promise<ArrayBuffer>;
+	};
+};
+
+export async function inlineLogoAsDataUri(
 	stored: string,
+	getStorage: () => Promise<LogoStorage | null> = getClient as unknown as () => Promise<LogoStorage | null>,
 ): Promise<string | null> {
 	try {
 		const assetPath = toAssetPath(stored);
 		if (!assetPath.startsWith(ASSETS_PREFIX)) return null;
 		const key = decodeURIComponent(assetPath.slice(ASSETS_PREFIX.length));
-		const s3 = await getClient();
+		const s3 = await getStorage();
 		if (!s3) return null;
-		const bytes = await s3.file(key).arrayBuffer();
+		const file = s3.file(key);
+		await file.stat();
+		const bytes = await file.arrayBuffer();
 		if (bytes.byteLength === 0 || bytes.byteLength > MAX_INLINE_LOGO_BYTES) {
 			return null;
 		}