@editframe/api 0.13.0-beta.3 → 0.14.0-beta.1

package/dist/resources/renders.bundle.d.ts

@@ -0,0 +1,6 @@
+interface BundlerOptions {
+    root: string;
+    renderData: any;
+}
+export declare const bundleRender: (options: BundlerOptions) => Promise<ReadableStream<Uint8Array>>;
+export {};

package/dist/resources/renders.bundle.js

@@ -0,0 +1,48 @@
+import path from "node:path";
+import { PassThrough } from "node:stream";
+import react from "@vitejs/plugin-react";
+import { build } from "vite";
+import { viteSingleFile } from "vite-plugin-singlefile";
+import tsconfigPaths from "vite-tsconfig-paths";
+import * as tar from "tar";
+import { randomUUID } from "node:crypto";
+import { createReadableStreamFromReadable } from "../utils/createReadableStreamFromReadable.js";
+const bundleRender = async (options) => {
+  const outDir = path.join(process.cwd(), "renders", randomUUID());
+  console.log("outDir", outDir);
+  await build({
+    root: options.root,
+    define: {
+      RENDER_DATA: JSON.stringify(options.renderData)
+    },
+    build: {
+      outDir,
+      rollupOptions: {
+        input: path.resolve(options.root, "index.html")
+      }
+    },
+    plugins: [
+      tsconfigPaths(),
+      react({
+        include: "**/*.{jsx,js,tsx,ts}",
+        jsxRuntime: "automatic"
+      }),
+      viteSingleFile()
+    ]
+  });
+  const tarStream = tar.create(
+    {
+      gzip: true,
+      cwd: outDir
+    },
+    ["."]
+  );
+  console.log("outDir", outDir);
+  const passthrough = new PassThrough();
+  tarStream.pipe(passthrough);
+  const tarReadStream = createReadableStreamFromReadable(passthrough);
+  return tarReadStream;
+};
+export {
+  bundleRender
+};

package/dist/resources/renders.d.ts

@@ -4,36 +4,36 @@ import { Client } from '../client.js';
 export declare const CreateRenderPayload: z.ZodObject<{
     md5: z.ZodOptional<z.ZodString>;
     fps: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-    width: z.ZodNumber;
-    height: z.ZodNumber;
+    width: z.ZodOptional<z.ZodNumber>;
+    height: z.ZodOptional<z.ZodNumber>;
     work_slice_ms: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-    duration_ms: z.ZodNumber;
-    strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<["v1", "v2"]>>>;
+    duration_ms: z.ZodOptional<z.ZodNumber>;
+    strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<["v1"]>>>;
 }, "strip", z.ZodTypeAny, {
-    width: number;
-    height: number;
-    duration_ms: number;
+    width?: number | undefined;
+    height?: number | undefined;
     md5?: string | undefined;
-    strategy?: "v1" | "v2" | undefined;
+    strategy?: "v1" | undefined;
+    duration_ms?: number | undefined;
     fps?: number | undefined;
     work_slice_ms?: number | undefined;
 }, {
-    width: number;
-    height: number;
-    duration_ms: number;
+    width?: number | undefined;
+    height?: number | undefined;
     md5?: string | undefined;
-    strategy?: "v1" | "v2" | undefined;
+    strategy?: "v1" | undefined;
+    duration_ms?: number | undefined;
     fps?: number | undefined;
     work_slice_ms?: number | undefined;
 }>;
 export interface CreateRenderPayload {
     md5?: string;
     fps?: number;
-    width: number;
-    height: number;
+    width?: number;
+    height?: number;
     work_slice_ms?: number;
-    duration_ms: number;
-    strategy?: "v1" | "v2";
+    duration_ms?: number;
+    strategy?: "v1";
 }
 export interface CreateRenderResult {
     id: string;
@@ -46,7 +46,7 @@ export interface LookupRenderByMd5Result {
     status: "complete" | "created" | "failed" | "pending" | "rendering" | string;
 }
 export declare const createRender: (client: Client, payload: CreateRenderPayload) => Promise<CreateRenderResult>;
-export declare const uploadRender: (client: Client, fileId: string, fileStream: ReadableStream) => Promise<any>;
+export declare const uploadRender: (client: Client, renderId: string, fileStream: ReadableStream) => Promise<any>;
 export declare const getRenderInfo: (client: Client, id: string) => Promise<LookupRenderByMd5Result>;
 export declare const lookupRenderByMd5: (client: Client, md5: string) => Promise<LookupRenderByMd5Result | null>;
 export declare const getRenderProgress: (client: Client, id: string) => Promise<CompletionIterator>;

package/dist/resources/renders.js

@@ -5,14 +5,16 @@ const log = debug("ef:api:renders");
 const CreateRenderPayload = z.object({
   md5: z.string().optional(),
   fps: z.number().int().min(1).max(120).default(30).optional(),
-  width: z.number().int().min(2),
-  height: z.number().int().min(2),
+  width: z.number().int().min(2).optional(),
+  height: z.number().int().min(2).optional(),
   work_slice_ms: z.number().int().min(1e3).max(1e4).default(4e3).optional(),
-  duration_ms: z.number().int(),
-  strategy: z.enum(["v1", "v2"]).default("v1").optional()
+  duration_ms: z.number().int().optional(),
+  strategy: z.enum(["v1"]).default("v1").optional()
 });
 const createRender = async (client, payload) => {
   log("Creating render", payload);
+  payload.strategy ??= "v1";
+  payload.work_slice_ms ??= 4e3;
   const response = await client.authenticatedFetch("/api/v1/renders", {
     method: "POST",
     body: JSON.stringify(payload)
@@ -25,10 +27,10 @@ const createRender = async (client, payload) => {
     `Failed to create render ${response.status} ${response.statusText} ${await response.text()}`
   );
 };
-const uploadRender = async (client, fileId, fileStream) => {
-  log("Uploading render", fileId);
+const uploadRender = async (client, renderId, fileStream) => {
+  log("Uploading render", renderId);
   const response = await client.authenticatedFetch(
-    `/api/v1/renders/${fileId}/upload`,
+    `/api/v1/renders/${renderId}/upload`,
     {
       method: "POST",
       body: fileStream,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/api",
-  "version": "0.13.0-beta.3",
+  "version": "0.14.0-beta.1",
   "description": "API functions for EditFrame",
   "exports": {
     ".": {
@@ -14,6 +14,12 @@
         "types": "./dist/node.d.ts",
         "default": "./dist/node.js"
       }
+    },
+    "./bundleRender": {
+      "import": {
+        "types": "./dist/resources/renders.bundle.d.ts",
+        "default": "./dist/resources/renders.bundle.js"
+      }
     }
   },
   "type": "module",
@@ -35,12 +41,15 @@
     "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {
-    "@editframe/assets": "0.13.0-beta.3",
+    "@editframe/assets": "0.14.0-beta.1",
+    "@vitejs/plugin-react": "^4.3.4",
     "debug": "^4.3.5",
     "eventsource-parser": "^3.0.0",
     "jsonwebtoken": "^9.0.2",
     "mime": "^4.0.4",
     "node-fetch": "^3.3.2",
+    "tar": "^7.4.3",
+    "vite-plugin-singlefile": "^2.1.0",
     "zod": "^3.23.8"
   }
 }

package/src/resources/renders.bundle.ts

@@ -0,0 +1,60 @@
+import path from "node:path";
+import { PassThrough } from "node:stream";
+
+import react from "@vitejs/plugin-react";
+import { build } from "vite";
+import { viteSingleFile } from "vite-plugin-singlefile";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+import * as tar from "tar";
+
+import { randomUUID } from "node:crypto";
+import { createReadableStreamFromReadable } from "../utils/createReadableStreamFromReadable.ts";
+
+interface BundlerOptions {
+  root: string;
+  renderData: any;
+}
+
+export const bundleRender = async (options: BundlerOptions) => {
+  const outDir = path.join(process.cwd(), "renders", randomUUID());
+
+  console.log("outDir", outDir);
+
+  await build({
+    root: options.root,
+    define: {
+      RENDER_DATA: JSON.stringify(options.renderData),
+    },
+    build: {
+      outDir,
+      rollupOptions: {
+        input: path.resolve(options.root, "index.html"),
+      },
+    },
+    plugins: [
+      tsconfigPaths(),
+      react({
+        include: "**/*.{jsx,js,tsx,ts}",
+        jsxRuntime: "automatic",
+      }),
+      viteSingleFile(),
+    ],
+  });
+
+  const tarStream = tar.create(
+    {
+      gzip: true,
+      cwd: outDir,
+    },
+    ["."],
+  );
+
+  console.log("outDir", outDir);
+
+  const passthrough = new PassThrough();
+  tarStream.pipe(passthrough);
+  const tarReadStream = createReadableStreamFromReadable(passthrough);
+
+  return tarReadStream;
+};

package/src/resources/renders.ts

@@ -10,8 +10,8 @@ const log = debug("ef:api:renders");
 export const CreateRenderPayload = z.object({
   md5: z.string().optional(),
   fps: z.number().int().min(1).max(120).default(30).optional(),
-  width: z.number().int().min(2),
-  height: z.number().int().min(2),
+  width: z.number().int().min(2).optional(),
+  height: z.number().int().min(2).optional(),
   work_slice_ms: z
     .number()
     .int()
@@ -19,18 +19,18 @@ export const CreateRenderPayload = z.object({
     .max(10_000)
     .default(4_000)
     .optional(),
-  duration_ms: z.number().int(),
-  strategy: z.enum(["v1", "v2"]).default("v1").optional(),
+  duration_ms: z.number().int().optional(),
+  strategy: z.enum(["v1"]).default("v1").optional(),
 });
 
 export interface CreateRenderPayload {
   md5?: string;
   fps?: number;
-  width: number;
-  height: number;
+  width?: number;
+  height?: number;
   work_slice_ms?: number;
-  duration_ms: number;
-  strategy?: "v1" | "v2";
+  duration_ms?: number;
+  strategy?: "v1";
 }
 
 assertTypesMatch<CreateRenderPayload, z.infer<typeof CreateRenderPayload>>(
@@ -54,6 +54,11 @@ export const createRender = async (
   payload: CreateRenderPayload,
 ) => {
   log("Creating render", payload);
+  // FIXME: The order of optional/default matters in zod
+  // And if we set the default last, the type is not inferred correctly
+  // Manually applying defaults here is a hack
+  payload.strategy ??= "v1";
+  payload.work_slice_ms ??= 4_000;
   const response = await client.authenticatedFetch("/api/v1/renders", {
     method: "POST",
     body: JSON.stringify(payload),
@@ -71,12 +76,12 @@ export const createRender = async (
 
 export const uploadRender = async (
   client: Client,
-  fileId: string,
+  renderId: string,
   fileStream: ReadableStream,
 ) => {
-  log("Uploading render", fileId);
+  log("Uploading render", renderId);
   const response = await client.authenticatedFetch(
-    `/api/v1/renders/${fileId}/upload`,
+    `/api/v1/renders/${renderId}/upload`,
     {
       method: "POST",
       body: fileStream,