Skip to content

Code-first video & image, rendered natively on WebGPU.

remove aws in bundle

okanaslb86e49a46350
diff --git a/packages/compositions/package.json b/packages/compositions/package.json
index a6e8f5a6..4df58d30 100644
--- a/packages/compositions/package.json
+++ b/packages/compositions/package.json
@@ -39,7 +39,6 @@
"devDependencies": {
"@framefields/client-utils": "workspace:*",
"@framefields/core": "workspace:*",
- "@framefields/server-utils": "workspace:*",
"@framefields/tsconfig": "workspace:*",
"@webgpu/types": "^0.1.70",
"dotenv": "^16.4.5",
@@ -54,11 +53,11 @@
"zod": "^4.3.6"
},
"dependencies": {
+ "@framefields/node-sdk": "workspace:*",
"@framefields/renderers": "workspace:*",
"@framefields/webgpu-renderers": "workspace:*",
"@mediabunny/mp3-encoder": "^1.51.0",
- "yoga-layout": "^3.2.1",
- "@framefields/node-sdk": "workspace:*"
+ "yoga-layout": "^3.2.1"
},
"publishConfig": {
"access": "public"
diff --git a/packages/compositions/src/utils/audio-extractor.ts b/packages/compositions/src/utils/audio-extractor.ts
index 5aec18f7..d2534435 100644
--- a/packages/compositions/src/utils/audio-extractor.ts
+++ b/packages/compositions/src/utils/audio-extractor.ts
@@ -14,8 +14,7 @@ const verbose =
typeof process !== "undefined" &&
/^(debug|trace)$/i.test(process.env?.LOG_LEVEL ?? "");
-// Fallback logger for browser environment. In Node.js environment, we dynamically load @framefields/server-utils to avoid bundling it on the frontend.
-let mediaLogger = {
+const mediaLogger = {
debug: (msg: unknown, ...args: unknown[]) => {
if (!verbose) return;
if (typeof msg === "object" && msg !== null) {
@@ -40,21 +39,6 @@ let mediaLogger = {
},
};
-if (
- typeof window === "undefined" ||
- (typeof process !== "undefined" && process.versions?.node)
-) {
- import(
- /* webpackIgnore: true */ /* @vite-ignore */ "@framefields/server-utils"
- )
- .then((m) => {
- if (m.mediaLogger) {
- mediaLogger = m.mediaLogger;
- }
- })
- .catch(() => {});
-}
-
const yieldToMain = (): Promise<void> => {
if (typeof window === "undefined") {
return Promise.resolve();
diff --git a/packages/compositions/tsdown.config.ts b/packages/compositions/tsdown.config.ts
index b4e76633..10e95dac 100644
--- a/packages/compositions/tsdown.config.ts
+++ b/packages/compositions/tsdown.config.ts
@@ -14,7 +14,6 @@ export default defineConfig({
"@framefields/core",
"@framefields/client-utils",
"@framefields/node-sdk",
- "@framefields/server-utils",
"@framefields/renderers",
"zod",
],
diff --git a/packages/framefields/src/preview/bundle.ts b/packages/framefields/src/preview/bundle.ts
index 1f26328f..3809324f 100644
--- a/packages/framefields/src/preview/bundle.ts
+++ b/packages/framefields/src/preview/bundle.ts
@@ -66,7 +66,6 @@ const NODE_ONLY = new Set([
"dotenv",
"esbuild",
"@framefields/renderer",
- "@framefields/server-utils",
"framefields/renderer",
"framefields/preview",
]);
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
index a65c8415..c7501235 100644
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -98,11 +98,11 @@
"@framefields/node-vignette": "workspace:*",
"@framefields/node-vision": "workspace:*",
"@framefields/renderers": "workspace:*",
- "@framefields/server-utils": "workspace:*",
"@framefields/webgpu-renderers": "workspace:*",
"@mediabunny/server": "^1.51.0",
"@napi-rs/webcodecs": "^1.3.1",
"mediabunny": "^1.51.0",
+ "pino": "^10.3.1",
"sharp": "^0.35.4",
"skia-canvas": "^3.0.8",
"webgpu": "^0.4.0"
diff --git a/packages/renderer/src/asset-preloader.ts b/packages/renderer/src/asset-preloader.ts
index d96526aa..51563db1 100644
--- a/packages/renderer/src/asset-preloader.ts
+++ b/packages/renderer/src/asset-preloader.ts
@@ -1,7 +1,7 @@
import type { VirtualMediaData } from "@framefields/core";
import { preloadCompositionFonts } from "@framefields/renderers";
-import { rendererLogger } from "@framefields/server-utils";
import type {} from "webgpu";
+import { rendererLogger } from "./logger.js";
/**
* Preloads only the fonts (and emoji) a VirtualMediaData tree's text uses, so
diff --git a/packages/renderer/src/dynamic-node-discovery.ts b/packages/renderer/src/dynamic-node-discovery.ts
index 11c93390..ec9c3231 100644
--- a/packages/renderer/src/dynamic-node-discovery.ts
+++ b/packages/renderer/src/dynamic-node-discovery.ts
@@ -6,8 +6,8 @@ import {
type NodeRendererPlugin,
registerWebGPURenderer,
} from "@framefields/node-sdk";
-import { rendererLogger } from "@framefields/server-utils";
import { BUILTIN_NODE_RENDERERS } from "./generated/node-renderers.js";
+import { rendererLogger } from "./logger.js";
import {
loadNodeManifests,
type NodeManifest,
diff --git a/packages/renderer/src/headless-webgpu-renderer.ts b/packages/renderer/src/headless-webgpu-renderer.ts
index 9bd4dd1d..245a4161 100644
--- a/packages/renderer/src/headless-webgpu-renderer.ts
+++ b/packages/renderer/src/headless-webgpu-renderer.ts
@@ -3,45 +3,6 @@ import { randomUUID } from "node:crypto";
import fs from "node:fs/promises";
import os from "node:os";
import path from "node:path";
-
-async function convertMp4ToGif(
- inputMp4Path: string,
- outputGifPath: string,
-): Promise<void> {
- return new Promise<void>((resolve, reject) => {
- const ffmpeg = spawn("ffmpeg", [
- "-i",
- inputMp4Path,
- "-vf",
- "split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse",
- "-y",
- outputGifPath,
- ]);
-
- let errorOutput = "";
- ffmpeg.stderr.on("data", (data) => {
- errorOutput += data.toString();
- });
-
- ffmpeg.on("close", async (code) => {
- if (code === 0) {
- resolve();
- } else {
- rendererLogger.error(
- { code, err: errorOutput },
- "[convertMp4ToGif] ffmpeg conversion failed",
- );
- reject(new Error(`ffmpeg exited with code ${code}: ${errorOutput}`));
- }
- });
-
- ffmpeg.on("error", (err) => {
- rendererLogger.error({ err }, "[convertMp4ToGif] ffmpeg spawn error");
- reject(err);
- });
- });
-}
-
import {
compositionStateStore,
drawCompositionTree,
@@ -53,7 +14,6 @@ import {
updateClockSignals,
type VirtualMediaData,
} from "@framefields/core";
-import { rendererLogger } from "@framefields/server-utils";
import {
clearAllVideoCache,
ensureDevice,
@@ -87,7 +47,9 @@ import {
import sharp from "sharp";
import { Canvas as SkiaCanvas, Image as SkiaImage } from "skia-canvas";
import { preloadFonts } from "./asset-preloader.js";
+import { bootstrapMediabunny, isAMD } from "./bootstrap-mediabunny.js";
import { discoverAndRegisterNodeRenderers } from "./dynamic-node-discovery.js";
+import { rendererLogger } from "./logger.js";
import {
type AudioQaStats,
analyzeAudio,
@@ -99,9 +61,45 @@ import {
} from "./video-qa.js";
import { ZeroCopyWebCodecsPipeline } from "./zero-copy-webcodecs-pipeline.js";
-// ─── Bootstrap ─────────────────────────────────────────────────────────────────
+async function convertMp4ToGif(
+ inputMp4Path: string,
+ outputGifPath: string,
+): Promise<void> {
+ return new Promise<void>((resolve, reject) => {
+ const ffmpeg = spawn("ffmpeg", [
+ "-i",
+ inputMp4Path,
+ "-vf",
+ "split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse",
+ "-y",
+ outputGifPath,
+ ]);
-import { bootstrapMediabunny, isAMD } from "./bootstrap-mediabunny.js";
+ let errorOutput = "";
+ ffmpeg.stderr.on("data", (data) => {
+ errorOutput += data.toString();
+ });
+
+ ffmpeg.on("close", async (code) => {
+ if (code === 0) {
+ resolve();
+ } else {
+ rendererLogger.error(
+ { code, err: errorOutput },
+ "[convertMp4ToGif] ffmpeg conversion failed",
+ );
+ reject(new Error(`ffmpeg exited with code ${code}: ${errorOutput}`));
+ }
+ });
+
+ ffmpeg.on("error", (err) => {
+ rendererLogger.error({ err }, "[convertMp4ToGif] ffmpeg spawn error");
+ reject(err);
+ });
+ });
+}
+
+// ─── Bootstrap ─────────────────────────────────────────────────────────────────
bootstrapMediabunny();
diff --git a/packages/renderer/src/index.ts b/packages/renderer/src/index.ts
index 0de6cc97..a8defd36 100644
--- a/packages/renderer/src/index.ts
+++ b/packages/renderer/src/index.ts
@@ -2,6 +2,7 @@ export * from "./asset-preloader.js";
export * from "./dma-staging-ring.js";
export * from "./dynamic-node-discovery.js";
export * from "./headless-webgpu-renderer.js";
+export * from "./logger.js";
export * from "./node-manifest.js";
export * from "./video-qa.js";
export * from "./zero-copy-webcodecs-pipeline.js";
diff --git a/packages/renderer/src/logger.ts b/packages/renderer/src/logger.ts
new file mode 100644
index 00000000..8672f7e6
--- /dev/null
+++ b/packages/renderer/src/logger.ts
@@ -0,0 +1,9 @@
+import pino from "pino";
+
+export const rendererLogger = pino({
+ level: (typeof process !== "undefined" && process.env?.LOG_LEVEL) || "info",
+ timestamp: pino.stdTimeFunctions.isoTime,
+ base: {
+ component: "renderer",
+ },
+});
diff --git a/packages/renderer/src/video-worker.ts b/packages/renderer/src/video-worker.ts
index 4e5ead87..c93930f6 100644
--- a/packages/renderer/src/video-worker.ts
+++ b/packages/renderer/src/video-worker.ts
@@ -4,7 +4,6 @@ import {
drawCompositionTree,
} from "@framefields/compositions";
import type { VirtualMediaData } from "@framefields/core";
-import { rendererLogger } from "@framefields/server-utils";
import {
clearAllVideoCache,
createHeadlessDOMElement,
@@ -26,6 +25,7 @@ import { Canvas as SkiaCanvas, Image as SkiaImage } from "skia-canvas";
import { preloadFonts } from "./asset-preloader.js";
import { DmaStagingRing } from "./dma-staging-ring.js";
import { discoverAndRegisterNodeRenderers } from "./dynamic-node-discovery.js";
+import { rendererLogger } from "./logger.js";
const globalObj = globalThis as unknown as Record<string, unknown>;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e88a188b..87818ea5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2206,9 +2206,6 @@ importers:
'@framefields/core':
specifier: workspace:*
version: link:../core
- '@framefields/server-utils':
- specifier: workspace:*
- version: link:../server-utils
'@framefields/tsconfig':
specifier: workspace:*
version: link:../tsconfig
@@ -2765,9 +2762,6 @@ importers:
'@framefields/renderers':
specifier: workspace:*
version: link:../renderers
- '@framefields/server-utils':
- specifier: workspace:*
- version: link:../server-utils
'@framefields/webgpu-renderers':
specifier: workspace:*
version: link:../webgpu-renderers
@@ -2780,6 +2774,9 @@ importers:
mediabunny:
specifier: ^1.51.0
version: 1.51.0
+ pino:
+ specifier: ^10.3.1
+ version: 10.3.1
sharp:
specifier: ^0.35.4
version: 0.35.5(@types/[email protected])