@editframe/cli 0.10.0-beta.3 → 0.10.0-beta.5

package/dist/VERSION.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.10.0-beta.3";
+export declare const VERSION = "0.10.0-beta.5";

package/dist/VERSION.js

@@ -1,4 +1,4 @@
-const VERSION = "0.10.0-beta.3";
+const VERSION = "0.10.0-beta.5";
 export {
   VERSION
 };

package/dist/commands/process-file.js

@@ -10,26 +10,32 @@ program.command("process-file <file>").description("Upload a audio/video to Edit
   const client = getClient();
   const md5 = await md5FilePath(path);
   const byte_size = (await stat(path)).size;
-  await withSpinner("Creating unprocessed file record", async () => {
-    await createUnprocessedFile(client, {
+  const unprocessedFile = await withSpinner(
+    "Creating unprocessed file record",
+    async () => await createUnprocessedFile(client, {
       md5,
       processes: [],
       filename: basename(path),
       byte_size
-    });
-  });
+    })
+  );
   const readStream = createReadStream(path);
   await withSpinner("Uploading file", async () => {
-    await uploadUnprocessedFile(client, md5, readStream, byte_size);
+    await uploadUnprocessedFile(
+      client,
+      unprocessedFile.id,
+      readStream,
+      byte_size
+    );
   });
-  const unprocessedFile = await withSpinner(
+  const updatedUnprocessedFile = await withSpinner(
     "Marking for processing",
     async () => {
-      return await updateUnprocessedFile(client, md5, {
+      return await updateUnprocessedFile(client, unprocessedFile.id, {
         processes: ["isobmff"]
       });
     }
   );
   process.stderr.write("File uploaded and marked for processing.\n");
-  console.log(JSON.stringify(unprocessedFile, null, 2));
+  console.log(JSON.stringify(updatedUnprocessedFile, null, 2));
 });

package/dist/commands/render.js

@@ -5,7 +5,6 @@ import { PassThrough } from "node:stream";
 import * as tar from "tar";
 import { program, Option } from "commander";
 import { parse } from "node-html-parser";
-import { build } from "vite";
 import { md5Directory, md5FilePath } from "@editframe/assets";
 import { withSpinner } from "../utils/withSpinner.js";
 import { syncAssetDirectory } from "../operations/syncAssetsDirectory.js";
@@ -13,10 +12,11 @@ import { createRender, uploadRender } from "@editframe/api";
 import { launchBrowserAndWaitForSDK } from "../utils/launchBrowserAndWaitForSDK.js";
 import { PreviewServer } from "../utils/startPreviewServer.js";
 import { getClient } from "../utils/index.js";
-import { getRenderInfo } from "../operations/getRenderInfo.js";
+import { RenderInfo, getRenderInfo } from "../operations/getRenderInfo.js";
 import { processRenderInfo } from "../operations/processRenderInfo.js";
 import { validateVideoResolution } from "../utils/validateVideoResolution.js";
 import { getFolderSize } from "../utils/getFolderSize.js";
+import { spawnSync } from "node:child_process";
 const buildAssetId = async (assetPath) => {
   const md5Sum = await md5FilePath(assetPath);
   const basename = path.basename(assetPath);
@@ -52,12 +52,23 @@ program.command("render [directory]").description(
   }
   await withSpinner("Building\n", async () => {
     try {
-      await build({
-        root: directory,
-        logLevel: "info",
-        // Optional: adjust log level as needed
-        clearScreen: false
-        // Optional: keep console output clean
+      await withSpinner("Building\n", async () => {
+        spawnSync(
+          "npx",
+          // biome-ignore format: Grouping CLI arguments
+          [
+            "vite",
+            "build",
+            directory,
+            "--clearScreen",
+            "false",
+            "--logLevel",
+            "debug"
+          ],
+          {
+            stdio: "inherit"
+          }
+        );
       });
     } catch (error) {
       console.error("Build failed:", error);
@@ -75,7 +86,7 @@ program.command("render [directory]").description(
       headless: true
     },
     async (page) => {
-      const renderInfo = await page.evaluate(getRenderInfo);
+      const renderInfo = RenderInfo.parse(await page.evaluate(getRenderInfo));
       validateVideoResolution({
         width: renderInfo.width,
         height: renderInfo.height
@@ -88,6 +99,9 @@ program.command("render [directory]").description(
         "ef-audio, ef-video, ef-image, ef-captions"
       );
       for (const element of elements) {
+        if (element.hasAttribute("asset-id")) {
+          continue;
+        }
         const src = element.getAttribute("src");
         if (!src) {
           continue;
@@ -126,7 +140,7 @@ program.command("render [directory]").description(
       const readable = new PassThrough();
       tarStream.pipe(readable);
       const folderSize = await getFolderSize(distDir);
-      await uploadRender(getClient(), md5, readable, folderSize);
+      await uploadRender(getClient(), render.id, readable, folderSize);
       process.stderr.write("Render assets uploaded\n");
       process.stderr.write(inspect(render));
       process.stderr.write("\n");

package/dist/operations/getRenderInfo.d.ts

@@ -1,7 +1,43 @@
-/**
- * THIS MODULE DOESNT USE THE DEBUG LOGGER BECAUSE IT IS
- * RUN IN A WEB BROWSER. LOGS ARE CAPTURED AND RE-LOGGED.
- */
+import { z } from 'zod';
+export declare const RenderInfo: z.ZodObject<{
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    fps: z.ZodNumber;
+    durationMs: z.ZodNumber;
+    assets: z.ZodObject<{
+        efMedia: z.ZodRecord<z.ZodString, z.ZodAny>;
+        efCaptions: z.ZodArray<z.ZodString, "many">;
+        efImage: z.ZodArray<z.ZodString, "many">;
+    }, "strip", z.ZodTypeAny, {
+        efMedia: Record<string, any>;
+        efCaptions: string[];
+        efImage: string[];
+    }, {
+        efMedia: Record<string, any>;
+        efCaptions: string[];
+        efImage: string[];
+    }>;
+}, "strip", z.ZodTypeAny, {
+    height: number;
+    width: number;
+    fps: number;
+    assets: {
+        efMedia: Record<string, any>;
+        efCaptions: string[];
+        efImage: string[];
+    };
+    durationMs: number;
+}, {
+    height: number;
+    width: number;
+    fps: number;
+    assets: {
+        efMedia: Record<string, any>;
+        efCaptions: string[];
+        efImage: string[];
+    };
+    durationMs: number;
+}>;
 export declare const getRenderInfo: () => Promise<{
     width: number;
     height: number;

package/dist/operations/getRenderInfo.js

@@ -1,3 +1,15 @@
+import { z } from "zod";
+const RenderInfo = z.object({
+  width: z.number().positive(),
+  height: z.number().positive(),
+  fps: z.number().positive(),
+  durationMs: z.number().positive(),
+  assets: z.object({
+    efMedia: z.record(z.any()),
+    efCaptions: z.array(z.string()),
+    efImage: z.array(z.string())
+  })
+});
 const getRenderInfo = async () => {
   const rootTimeGroup = document.querySelector("ef-timegroup");
   if (!rootTimeGroup) {
@@ -55,5 +67,6 @@ const getRenderInfo = async () => {
   return renderInfo;
 };
 export {
+  RenderInfo,
   getRenderInfo
 };

package/dist/operations/processRenderInfo.js

@@ -5,6 +5,9 @@ const processRenderInfo = async (renderInfo) => {
     process.stderr.write(src);
     process.stderr.write("\n");
     for (const trackId in tracks) {
+      process.stderr.write("Generating track: ");
+      process.stderr.write(trackId);
+      process.stderr.write("\n");
       await generateTrack(
         "./src/assets",
         `./src${src}`,

package/dist/operations/syncAssetsDirectory.js

@@ -219,7 +219,7 @@ const syncAssetDirectory = async (projectDirectory) => {
               const readStream = createReadStream(subAssetPath);
               await uploadFragmentIndex(
                 getClient(),
-                assetMd5,
+                createdFile.id,
                 readStream,
                 stats.size
               ).then(() => {
@@ -257,7 +257,7 @@ const syncAssetDirectory = async (projectDirectory) => {
               const stats = statSync(subAssetPath);
               await uploadCaptionFile(
                 getClient(),
-                assetMd5,
+                createdFile.id,
                 readStream,
                 stats.size
               ).then(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/cli",
-  "version": "0.10.0-beta.3",
+  "version": "0.10.0-beta.5",
   "description": "Command line interface for EditFrame",
   "bin": {
     "editframe": "./dist/index.js"
@@ -23,10 +23,10 @@
     "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {
-    "@editframe/api": "0.10.0-beta.3",
-    "@editframe/assets": "0.10.0-beta.3",
-    "@editframe/elements": "0.10.0-beta.3",
-    "@editframe/vite-plugin": "0.10.0-beta.3",
+    "@editframe/api": "0.10.0-beta.5",
+    "@editframe/assets": "0.10.0-beta.5",
+    "@editframe/elements": "0.10.0-beta.5",
+    "@editframe/vite-plugin": "0.10.0-beta.5",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.6.8",
     "chalk": "^5.3.0",

package/src/commands/process-file.ts

@@ -24,25 +24,32 @@ program
 
     const byte_size = (await stat(path)).size;
 
-    await withSpinner("Creating unprocessed file record", async () => {
-      await createUnprocessedFile(client, {
-        md5,
-        processes: [],
-        filename: basename(path),
-        byte_size,
-      });
-    });
+    const unprocessedFile = await withSpinner(
+      "Creating unprocessed file record",
+      async () =>
+        await createUnprocessedFile(client, {
+          md5,
+          processes: [],
+          filename: basename(path),
+          byte_size,
+        }),
+    );
 
     const readStream = createReadStream(path);
 
     await withSpinner("Uploading file", async () => {
-      await uploadUnprocessedFile(client, md5, readStream, byte_size);
+      await uploadUnprocessedFile(
+        client,
+        unprocessedFile.id,
+        readStream,
+        byte_size,
+      );
     });
 
-    const unprocessedFile = await withSpinner(
+    const updatedUnprocessedFile = await withSpinner(
       "Marking for processing",
       async () => {
-        return await updateUnprocessedFile(client, md5, {
+        return await updateUnprocessedFile(client, unprocessedFile.id, {
           processes: ["isobmff"],
         });
       },
@@ -50,5 +57,5 @@ program
 
     process.stderr.write("File uploaded and marked for processing.\n");
 
-    console.log(JSON.stringify(unprocessedFile, null, 2));
+    console.log(JSON.stringify(updatedUnprocessedFile, null, 2));
   });

package/src/commands/process.ts

@@ -17,7 +17,6 @@ program
   .action(async (directory) => {
     directory ??= ".";
 
-    // const srcDir = path.join(directory, "src");
     const distDir = path.join(directory, "dist");
     await withSpinner("Building\n", async () => {
       spawnSync("npx", ["vite", "build", directory], {

package/src/commands/render.ts

@@ -6,7 +6,6 @@ import { PassThrough } from "node:stream";
 import * as tar from "tar";
 import { program, Option } from "commander";
 import { parse as parseHTML } from "node-html-parser";
-import { build } from "vite";
 
 import { md5Directory, md5FilePath } from "@editframe/assets";
 
@@ -16,10 +15,11 @@ import { createRender, uploadRender } from "@editframe/api";
 import { launchBrowserAndWaitForSDK } from "../utils/launchBrowserAndWaitForSDK.ts";
 import { PreviewServer } from "../utils/startPreviewServer.ts";
 import { getClient } from "../utils/index.ts";
-import { getRenderInfo } from "../operations/getRenderInfo.ts";
+import { RenderInfo, getRenderInfo } from "../operations/getRenderInfo.ts";
 import { processRenderInfo } from "../operations/processRenderInfo.ts";
 import { validateVideoResolution } from "../utils/validateVideoResolution.ts";
 import { getFolderSize } from "../utils/getFolderSize.ts";
+import { spawnSync } from "node:child_process";
 
 interface StrategyBuilder {
   buildAssetId: (assetPath: string) => Promise<string>;
@@ -74,10 +74,19 @@ program
     }
     await withSpinner("Building\n", async () => {
       try {
-        await build({
-          root: directory,
-          logLevel: "info", // Optional: adjust log level as needed
-          clearScreen: false, // Optional: keep console output clean
+        await withSpinner("Building\n", async () => {
+          spawnSync(
+            "npx",
+            // biome-ignore format: Grouping CLI arguments
+            [
+              "vite", "build", directory,
+              "--clearScreen", "false",
+              "--logLevel", "debug",
+            ],
+            {
+              stdio: "inherit",
+            },
+          );
         });
       } catch (error) {
         console.error("Build failed:", error);
@@ -96,7 +105,7 @@ program
         headless: true,
       },
       async (page) => {
-        const renderInfo = await page.evaluate(getRenderInfo);
+        const renderInfo = RenderInfo.parse(await page.evaluate(getRenderInfo));
 
         validateVideoResolution({
           width: renderInfo.width,
@@ -112,6 +121,9 @@ program
           "ef-audio, ef-video, ef-image, ef-captions",
         );
         for (const element of elements) {
+          if (element.hasAttribute("asset-id")) {
+            continue;
+          }
           const src = element.getAttribute("src");
           if (!src) {
             continue;
@@ -159,7 +171,7 @@ program
         const readable = new PassThrough();
         tarStream.pipe(readable);
         const folderSize = await getFolderSize(distDir);
-        await uploadRender(getClient(), md5, readable, folderSize);
+        await uploadRender(getClient(), render.id, readable, folderSize);
         process.stderr.write("Render assets uploaded\n");
         process.stderr.write(inspect(render));
         process.stderr.write("\n");

package/src/operations/getRenderInfo.ts

@@ -3,6 +3,8 @@
  * RUN IN A WEB BROWSER. LOGS ARE CAPTURED AND RE-LOGGED.
  */
 
+import { z } from "zod";
+
 import type {
   EFCaptions,
   EFImage,
@@ -10,6 +12,18 @@ import type {
   EFTimegroup,
 } from "@editframe/elements";
 
+export const RenderInfo = z.object({
+  width: z.number().positive(),
+  height: z.number().positive(),
+  fps: z.number().positive(),
+  durationMs: z.number().positive(),
+  assets: z.object({
+    efMedia: z.record(z.any()),
+    efCaptions: z.array(z.string()),
+    efImage: z.array(z.string()),
+  }),
+});
+
 export const getRenderInfo = async () => {
   const rootTimeGroup = document.querySelector("ef-timegroup") as
     | EFTimegroup

package/src/operations/processRenderInfo.ts

@@ -13,6 +13,9 @@ export const processRenderInfo = async (
     process.stderr.write(src);
     process.stderr.write("\n");
     for (const trackId in tracks) {
+      process.stderr.write("Generating track: ");
+      process.stderr.write(trackId);
+      process.stderr.write("\n");
       await generateTrack(
         "./src/assets",
         `./src${src}`,

package/src/operations/syncAssetsDirectory.ts

@@ -269,7 +269,7 @@ export const syncAssetDirectory = async (
               const readStream = createReadStream(subAssetPath);
               await uploadFragmentIndex(
                 getClient(),
-                assetMd5,
+                createdFile.id,
                 readStream,
                 stats.size,
               )
@@ -309,7 +309,7 @@ export const syncAssetDirectory = async (
               const stats = statSync(subAssetPath);
               await uploadCaptionFile(
                 getClient(),
-                assetMd5,
+                createdFile.id,
                 readStream,
                 stats.size,
               )