Code-first video & image, rendered natively on WebGPU.
refactor: drop BASE_URL / R2_CUSTOM_DOMAIN env from asset and font paths
okanasl9b70fda7915c
diff --git a/.changeset/drop-base-url.md b/.changeset/drop-base-url.mdnew file mode 100644index 00000000..d417a1c3--- /dev/null+++ b/.changeset/drop-base-url.md@@ -0,0 +1,10 @@+---+"framefields": patch+"@framefields/client-utils": patch+"@framefields/compositions": patch+"@framefields/webgpu-renderers": patch+---++Asset and font paths no longer depend on the `BASE_URL` and `R2_CUSTOM_DOMAIN` environment variables, left over from the Gatewai web app. With `BASE_URL` set, a font registered from an absolute path was fetched from `$BASE_URL/<path>`, and when that failed the engine quietly used a font from the `R2_CUSTOM_DOMAIN` CDN instead of the project's file. Absolute paths are now always read from disk, and Lottie sources and fonts are used as given instead of being prefixed with `http://localhost:8081`.++Removed from `@framefields/client-utils`: `getEnv`, `BASE_URL`, `R2_CUSTOM_DOMAIN`, `configureAssetUrls` and the `options` argument of `GetAssetEndpoint`, `GetFontAssetUrl`, `resolveMediaSourceUrl` and `ResolveFileDataUrl`. Removed from `@framefields/compositions`: `getFontUrl`.diff --git a/packages/client-utils/src/browser/env.ts b/packages/client-utils/src/browser/env.tsdeleted file mode 100644index 6b22488e..00000000--- a/packages/client-utils/src/browser/env.ts+++ /dev/null@@ -1,43 +0,0 @@-/**- * Utility to safely access environment variables in the browser.- * Prioritizes runtime values injected via /env.js over build-time VITE_ variables.- */--declare global {- interface Window {- GATEWAI_ENV?: {- BASE_URL?: string;- DISABLE_EMAIL_SIGNUP?: boolean;- ENABLE_PRICING?: boolean;- GOOGLE_AUTH_ENABLED?: boolean;- APPLE_AUTH_ENABLED?: boolean;- EMAIL_PSW_AUTH_ENABLED?: boolean;- R2_CUSTOM_DOMAIN?: string;- };- }-}--export function getEnv(- key: keyof NonNullable<Window["GATEWAI_ENV"]>,-): string | boolean | undefined {- // 1. Try runtime environment (injected via /env.js)- if (- typeof window !== "undefined" &&- window.GATEWAI_ENV &&- window.GATEWAI_ENV[key] !== undefined- ) {- return window.GATEWAI_ENV[key];- }-- // 3. Fallback to process.env (webpack server-side rendering)- try {- if (typeof process !== "undefined" && process && process.env) {- const val = process.env[key];- if (val !== undefined) {- return val;- }- }- } catch {}-- return undefined;-}diff --git a/packages/client-utils/src/browser/file.ts b/packages/client-utils/src/browser/file.tsindex a092d618..5daec58b 100644--- a/packages/client-utils/src/browser/file.ts+++ b/packages/client-utils/src/browser/file.ts@@ -2,29 +2,7 @@ const isNodeEnv = () =>(typeof process !== "undefined" && Boolean(process.versions?.node)) ||Boolean((globalThis as any).__IS_HEADLESS_RENDERER__);-import type {- FileAsset,- FileData,- VirtualMediaData,-} from "@framefields/core";-import { getEnv } from "./env.js";--export interface AssetUrlOptions {- baseUrl?: string;- r2CustomDomain?: string;-}--export let BASE_URL = getEnv("BASE_URL") as string;-export let R2_CUSTOM_DOMAIN = getEnv("R2_CUSTOM_DOMAIN") as string;--export function configureAssetUrls(options: AssetUrlOptions) {- if (options.baseUrl !== undefined) {- BASE_URL = options.baseUrl;- }- if (options.r2CustomDomain !== undefined) {- R2_CUSTOM_DOMAIN = options.r2CustomDomain;- }-}+import type { FileAsset, FileData, VirtualMediaData } from "@framefields/core";/*** Resolve the actual playable URL from a VirtualMediaData.@@ -33,7 +11,11 @@ export function configureAssetUrls(options: AssetUrlOptions) {function normalizeLocalBrowserUrl(url: string | undefined): string | undefined {if (!url || isNodeEnv() || typeof window === "undefined") return url;const clean = url.replace(/^file:\/\//, "");- if (clean.startsWith("/") && !clean.startsWith("/@fs/") && !clean.startsWith("/api/")) {+ if (+ clean.startsWith("/") &&+ !clean.startsWith("/@fs/") &&+ !clean.startsWith("/api/")+ ) {return `/@fs${clean}`;}return url;@@ -41,7 +23,6 @@ function normalizeLocalBrowserUrl(url: string | undefined): string | undefined {export function resolveMediaSourceUrl(vv: VirtualMediaData | undefined | null,- options?: AssetUrlOptions,): string | undefined {if (!vv) return undefined;@@ -54,18 +35,21 @@ export function resolveMediaSourceUrl(const directEntity = (vv as any)?.entity;if (directEntity) {- if (typeof directEntity === "string") return normalizeLocalBrowserUrl(directEntity);- if (directEntity.url && typeof directEntity.url === "string") return normalizeLocalBrowserUrl(directEntity.url);- return GetAssetEndpoint(directEntity, options);+ if (typeof directEntity === "string")+ return normalizeLocalBrowserUrl(directEntity);+ if (directEntity.url && typeof directEntity.url === "string")+ return normalizeLocalBrowserUrl(directEntity.url);+ return GetAssetEndpoint(directEntity);}// New structure: leaf source nodeif (vv.operation?.op === "source") {const source = (vv.operation as any).source;if (typeof source === "string") return normalizeLocalBrowserUrl(source);- if (source?.url && typeof source.url === "string") return normalizeLocalBrowserUrl(source.url);+ if (source?.url && typeof source.url === "string")+ return normalizeLocalBrowserUrl(source.url);if (source?.entity) {- return GetAssetEndpoint(source.entity, options);+ return GetAssetEndpoint(source.entity);}if ((vv.operation as any).sourceUrl &&@@ -123,7 +107,7 @@ export function resolveMediaSourceUrl(// Recursively search children (e.g. Blur, Adjust, LUT, Compositor wrapping a media source)if (Array.isArray(vv.children)) {for (const child of vv.children) {- const found = resolveMediaSourceUrl(child, options);+ const found = resolveMediaSourceUrl(child);if (found) return found;}}@@ -138,7 +122,6 @@ export function resolveMediaSourceUrl() {const found = resolveMediaSourceUrl(entry.outputItem.data as VirtualMediaData,- options,);if (found) return found;}@@ -151,10 +134,7 @@ export function resolveMediaSourceUrl(/*** Appends a file extension hint to the URL.*/-export function GetAssetEndpoint(- fileAsset: Pick<FileAsset, "id" | "key">,- options?: AssetUrlOptions,-) {+export function GetAssetEndpoint(fileAsset: Pick<FileAsset, "id" | "key">) {if (!fileAsset) return "";if ((fileAsset as any).url && typeof (fileAsset as any).url === "string") {const u = (fileAsset as any).url as string;@@ -172,12 +152,6 @@ export function GetAssetEndpoint(}const { id, key } = fileAsset;- const r2CustomDomain =- options?.r2CustomDomain ??- (getEnv("R2_CUSTOM_DOMAIN") as string) ??- R2_CUSTOM_DOMAIN;- const baseUrl =- options?.baseUrl ?? (getEnv("BASE_URL") as string) ?? BASE_URL ?? "";if (key &&@@ -199,39 +173,15 @@ export function GetAssetEndpoint(return key.startsWith("/") ? `file://${key}` : key;}- // 1. If using Custom Domain, return the direct link (R2 keys include extensions)- if (r2CustomDomain) {- return `https://${r2CustomDomain}/${key}`;- }-- // If using file:// base URL (local storage in CLI/in-memory mode)- if (baseUrl && baseUrl.startsWith("file://")) {- const basePath = baseUrl.replace(/\/+$/, "");- return `${basePath}/${key}`;- }-- // 2. If using Local API, determine if an extension suffix is needed from the key+ // An asset known only by id: the asset API path on the page's own origin.const extension = key.includes(".") ? key.split(".").pop() : null;const suffix = extension ? `.${extension}` : "";- return `${baseUrl}/api/v1/assets/${id}${suffix}`;+ return `/api/v1/assets/${id}${suffix}`;}-export function GetFontAssetUrl(name: string, options?: AssetUrlOptions) {- const r2CustomDomain =- options?.r2CustomDomain ??- (getEnv("R2_CUSTOM_DOMAIN") as string) ??- R2_CUSTOM_DOMAIN;- const baseUrl =- options?.baseUrl ?? (getEnv("BASE_URL") as string) ?? BASE_URL ?? "";-- // 1. If using Custom Domain, return the direct link (R2 keys include extensions)- if (r2CustomDomain) {- return `https://${r2CustomDomain}/fonts/${name}/font_file.ttf`;- }- if (baseUrl) {- return `${baseUrl}/api/v1/fonts/load/${name}`;- }+/** Conventional path of a font that wasn't registered with a file. */+export function GetFontAssetUrl(name: string) {return `assets/fonts/${name}.ttf`;}@@ -257,8 +207,8 @@ export const isFileData = (data: unknown): data is FileData => {return typeof data === "object" && data !== null && "entity" in data;};-export function ResolveFileDataUrl(data: FileData, options?: AssetUrlOptions) {+export function ResolveFileDataUrl(data: FileData) {if (!data) return null;- if (data.entity) return GetAssetEndpoint(data.entity, options);+ if (data.entity) return GetAssetEndpoint(data.entity);return null;}diff --git a/packages/client-utils/src/browser/index.ts b/packages/client-utils/src/browser/index.tsindex 8424ad4d..88f7bd54 100644--- a/packages/client-utils/src/browser/index.ts+++ b/packages/client-utils/src/browser/index.ts@@ -1,3 +1,2 @@-export * from "./env.js";export * from "./file.js";export * from "./local-font-manager.js";diff --git a/packages/compositions/src/utils/apply-operations.ts b/packages/compositions/src/utils/apply-operations.tsindex 5c716298..26617ee2 100644--- a/packages/compositions/src/utils/apply-operations.ts+++ b/packages/compositions/src/utils/apply-operations.ts@@ -1,4 +1,4 @@-import { getEnv, resolveMediaSourceUrl } from "@framefields/client-utils";+import { resolveMediaSourceUrl } from "@framefields/client-utils";import {getActiveMediaMetadata,resolveMediaMimeType,@@ -25,16 +25,6 @@ export type RenderParams = {mimeType: string | null;};-const BASE_URL = getEnv("BASE_URL") as string;-const CDN_DOMAIN = getEnv("R2_CUSTOM_DOMAIN") as string;--export function getFontUrl(name: string) {- if (CDN_DOMAIN) {- return `https://${CDN_DOMAIN}/fonts/${name}/font_file.ttf`;- }- return `${BASE_URL}/api/v1/fonts/load/${name}`;-}-/*** Compute render parameters for the CURRENT node only — does NOT recurse into* children. Each node in the VirtualMedia tree is responsible for exactly itsdiff --git a/packages/webgpu-renderers/src/headless-font-loader.ts b/packages/webgpu-renderers/src/headless-font-loader.tsindex 991ea899..363da7a1 100644--- a/packages/webgpu-renderers/src/headless-font-loader.ts+++ b/packages/webgpu-renderers/src/headless-font-loader.ts@@ -1,4 +1,3 @@-import { BASE_URL } from "@framefields/client-utils";import { debugLog } from "./debug-log.js";let tempDir: Promise<string> | null = null;@@ -8,19 +7,13 @@ const fontPaths = new Map<string, string>();const fontDataCache = new Map<string, Uint8Array>();async function getLocalFontPath(family: string, url: string): Promise<string> {- let resolvedUrl = url;+ const resolvedUrl = url;if (url.startsWith("/")) {- if (BASE_URL) {- resolvedUrl = `${BASE_URL}${url}`;- } else {- const fs = await import(/* webpackIgnore: true */ "fs/promises");- try {- await fs.access(url);- } catch {- throw new Error(- `Relative font URL "${url}" cannot be resolved because BASE_URL is not configured.`,- );- }+ const fs = await import(/* webpackIgnore: true */ "fs/promises");+ try {+ await fs.access(url);+ } catch {+ throw new Error(`Font file "${url}" not found.`);}}diff --git a/packages/webgpu-renderers/src/nodes/lottie.ts b/packages/webgpu-renderers/src/nodes/lottie.tsindex 5fda0c9c..51b61e4a 100644--- a/packages/webgpu-renderers/src/nodes/lottie.ts+++ b/packages/webgpu-renderers/src/nodes/lottie.ts@@ -1,30 +1,16 @@-import {- BASE_URL,- GetFontAssetUrl,- localFontManager,-} from "@framefields/client-utils";+import { GetFontAssetUrl, localFontManager } from "@framefields/client-utils";import { DotLottie, type Fit } from "@lottiefiles/dotlottie-web";import { premultiplyPixels } from "../color.js";-import {- getHeadlessFontData,- registerHeadlessFont,-} from "../headless-font-loader.js";--function resolveUrl(url: string): string {- if (!url) return url;- if (url.startsWith("/")) {- const base = BASE_URL || "http://localhost:8081";- return `${base}${url}`;- }- return url;-}-import { debugLog } from "../debug-log.js";import {createHeadlessDOMElement,installIntersectionObserverStub,patchCanvasPrototypeForDOM,} from "../headless/dom-shims.js";+import {+ getHeadlessFontData,+ registerHeadlessFont,+} from "../headless-font-loader.js";import type { RenderContextValue } from "../render-context.js";import { textureCache } from "../texture-cache.js";import type { LottieNodeProps } from "./types.js";@@ -184,11 +170,10 @@ async function registerLottieFont(family: string): Promise<void> {// Step 3: Fallback — let DotLottie fetch the font via URLif (!registered) {try {- const resolvedFontUrl = resolveUrl(fontUrl);- registered = await DotLottie.registerFont(family, resolvedFontUrl);+ registered = await DotLottie.registerFont(family, fontUrl);if (!registered) {console.warn(- `[LottieRenderer] DotLottie.registerFont via URL also failed for "${family}" (${resolvedFontUrl})`,+ `[LottieRenderer] DotLottie.registerFont via URL also failed for "${family}" (${fontUrl})`,);}} catch (err) {@@ -226,7 +211,7 @@ class LottieInstance {this.canvas = new OffscreenCanvas(width, height);this.dotLottie = new DotLottie({canvas: this.canvas,- ...(data ? { data } : { src: resolveUrl(src) }),+ ...(data ? { data } : { src }),autoplay: false,loop: false,speed: 0,@@ -499,7 +484,7 @@ class LottieLoader {isRemote &&(resolvedSrc.endsWith(".json") || resolvedSrc.includes("/assets/"))) {- const response = await fetch(resolveUrl(resolvedSrc));+ const response = await fetch(resolvedSrc);if (response.ok) {lottieJson = await response.json();}