@editframe/cli 0.7.0-beta.1 → 0.7.0-beta.11

package/src/operations/syncAssetsDirectory.ts

@@ -1,13 +1,21 @@
 import { Probe } from "@editframe/assets";
 import fs from "node:fs/promises";
 import path from "node:path";
-import type { CreateISOBMFFTrackPayload } from "../api";
-import { createCaptionFile, uploadCaptionFile } from "../api/caption-file";
-import { createImageFile, uploadImageFile } from "../api/image-file";
-import { createISOBMFFFile, uploadFragmentIndex } from "../api/isobmff-file";
-import { createISOBMFFTrack, uploadISOBMFFTrack } from "../api/isobmff-track";
+import {
+  createCaptionFile,
+  createImageFile,
+  createISOBMFFFile,
+  createISOBMFFTrack,
+  uploadCaptionFile,
+  uploadFragmentIndex,
+  uploadImageFile,
+  uploadISOBMFFTrack,
+  type CreateISOBMFFTrackPayload,
+} from "@editframe/api";
+
 import { createReadStream } from "node:fs";
 import type { z } from "zod";
+import { getClient } from "../utils";
 
 const imageMatch = /\.(png|jpe?g|gif|webp)$/i;
 const trackMatch = /\.track-[\d]+.mp4$/i;
@@ -30,7 +38,7 @@ class SyncStatus {
   }
 
   async markSynced() {
-    console.log(`✏️  Marking asset as synced: ${this.assetPath}`);
+    process.stderr.write(`✏️  Marking asset as synced: ${this.assetPath}\n`);
     await fs.writeFile(this.infoPath, "{}", "utf-8");
   }
 }
@@ -48,21 +56,26 @@ export const syncAssetDirectory = async (
     "assets",
     ".cache",
   );
-  const stat = await fs.stat(fullPath);
-  if (!stat.isDirectory()) {
+  const stat = await fs.stat(fullPath).catch((error) => {
+    if (error.code === "ENOENT") {
+      return;
+    }
+    throw error;
+  });
+  if (!stat?.isDirectory()) {
     console.error(`No assets cache directory found at ${fullPath}`);
     return;
   }
   const assets = await fs.readdir(fullPath);
 
-  console.log(`Syncing asset dir: ${fullPath}`);
+  process.stderr.write(`Syncing asset dir: ${fullPath}\n`);
 
   for (const asset of assets) {
-    console.log(`Syncing asset: ${asset}`);
+    process.stderr.write(`Syncing asset: ${asset}\n`);
     const assetDir = path.join(fullPath, asset);
     const stat = await fs.stat(assetDir);
     if (!stat.isDirectory()) {
-      console.error("Invalid asset. Did not find asset directory.");
+      process.stderr.write("Invalid asset. Did not find asset directory.\n");
       return;
     }
     const subAssets = await fs.readdir(assetDir);
@@ -75,7 +88,9 @@ export const syncAssetDirectory = async (
       const subAssetPath = path.join(assetDir, subAsset);
       const syncStatus = new SyncStatus(subAssetPath);
       if (await syncStatus.isSynced()) {
-        console.log(`  ✔ Sub-asset has already been synced: ${subAsset}`);
+        process.stderr.write(
+          `  ✔ Sub-asset has already been synced: ${subAsset}\n`,
+        );
         continue;
       }
       switch (true) {
@@ -83,7 +98,9 @@ export const syncAssetDirectory = async (
           const probeResult = await Probe.probePath(subAssetPath);
           const [videoProbe] = probeResult.videoStreams;
           if (!videoProbe) {
-            console.error(`🚫 No video stream found in image: ${subAsset}`);
+            process.stderr.write(
+              `🚫 No video stream found in image: ${subAsset}\n`,
+            );
             break;
           }
           const ext = path.extname(subAsset).slice(1);
@@ -95,11 +112,11 @@ export const syncAssetDirectory = async (
               ext === "webp"
             )
           ) {
-            console.error(`🚫 Invalid image format: ${subAsset}`);
+            process.stderr.write(`🚫 Invalid image format: ${subAsset}\n`);
             break;
           }
-          console.log(`🖼️  Syncing image: ${subAsset}`);
-          const created = await createImageFile({
+          process.stderr.write(`🖼️  Syncing image: ${subAsset}\n`);
+          const created = await createImageFile(getClient(), {
             id: asset,
             filename: subAsset,
             width: videoProbe.width,
@@ -108,18 +125,22 @@ export const syncAssetDirectory = async (
           });
           if (created) {
             if (created.complete) {
-              console.log("  ✔ Image has already been synced.");
+              process.stderr.write("  ✔ Image has already been synced.\n");
             } else {
-              await uploadImageFile(created.id, createReadStream(subAssetPath));
-              console.log("  ✅ Image has been synced.");
+              await uploadImageFile(
+                getClient(),
+                created.id,
+                createReadStream(subAssetPath),
+              );
+              process.stderr.write("  ✅ Image has been synced.\n");
             }
             await syncStatus.markSynced();
           }
           break;
         }
         case trackMatch.test(subAsset): {
-          console.log(`📼 Syncing a/v track: ${subAsset}`);
-          const createdFile = await createISOBMFFFile({
+          process.stderr.write(`📼 Syncing a/v track: ${subAsset}\n`);
+          const createdFile = await createISOBMFFFile(getClient(), {
             id: asset,
             filename: subAsset.replace(/\.track-[\d]+.mp4$/, ""),
           });
@@ -127,16 +148,22 @@ export const syncAssetDirectory = async (
             const probe = await Probe.probePath(subAssetPath);
             const trackId = subAsset.match(/track-([\d]+).mp4/)?.[1];
             if (!trackId) {
-              console.error(`🚫 No track ID found for track: ${subAsset}`);
+              process.stderr.write(
+                `🚫 No track ID found for track: ${subAsset}\n`,
+              );
               break;
             }
             const [track] = probe.streams;
             if (!track) {
-              console.error(`🚫 No track stream found in track: ${subAsset}`);
+              process.stderr.write(
+                `🚫 No track stream found in track: ${subAsset}\n`,
+              );
               break;
             }
             if (track.duration === undefined) {
-              console.error(`🚫 No duration found in track: ${subAsset}`);
+              process.stderr.write(
+                `🚫 No duration found in track: ${subAsset}\n`,
+              );
               break;
             }
 
@@ -168,21 +195,25 @@ export const syncAssetDirectory = async (
                     codec_name: track.codec_name,
                     byte_size: stat.size,
                   };
-            const createdTrack = await createISOBMFFTrack(createPayload);
+            const createdTrack = await createISOBMFFTrack(
+              getClient(),
+              createPayload,
+            );
 
             if (createdTrack) {
               if (
                 createdTrack.last_received_byte ===
                 createdTrack.byte_size - 1
               ) {
-                console.log("  ✔ Track has already been synced.");
+                process.stderr.write("  ✔ Track has already been synced.\n");
               } else {
                 await uploadISOBMFFTrack(
+                  getClient(),
                   createdFile.id,
                   Number(trackId),
                   createReadStream(subAssetPath),
                 );
-                console.log("  ✅ Track has been synced.");
+                process.stderr.write("  ✅ Track has been synced.\n");
               }
               await syncStatus.markSynced();
             }
@@ -191,49 +222,55 @@ export const syncAssetDirectory = async (
           break;
         }
         case fragmentIndexMatch.test(subAsset): {
-          console.log(`📋 Syncing fragment index: ${subAsset}`);
-          const createdFile = await createISOBMFFFile({
+          process.stderr.write(`📋 Syncing fragment index: ${subAsset}\n`);
+          const createdFile = await createISOBMFFFile(getClient(), {
             id: asset,
             filename: subAsset.replace(/\.tracks.json$/, ""),
           });
           if (createdFile) {
             if (createdFile.fragment_index_complete) {
-              console.log("  ✔ Fragment index has already been synced.");
+              process.stderr.write(
+                "  ✔ Fragment index has already been synced.\n",
+              );
             } else {
               const readStream = createReadStream(subAssetPath);
-              await uploadFragmentIndex(asset, readStream);
-              console.log("  ✅ Fragment index has been synced.");
+              await uploadFragmentIndex(getClient(), asset, readStream);
+              process.stderr.write("  ✅ Fragment index has been synced.\n");
             }
             await syncStatus.markSynced();
           } else {
-            console.error(`🚫 No file found for fragment index: ${subAsset}`);
+            process.stderr.write(
+              `🚫 No file found for fragment index: ${subAsset}\n`,
+            );
             break;
           }
           break;
         }
         case captionsMatch.test(subAsset): {
-          console.log(`📝 Syncing captions: ${subAsset}`);
-          const createdFile = await createCaptionFile({
+          process.stderr.write(`📝 Syncing captions: ${subAsset}\n`);
+          const createdFile = await createCaptionFile(getClient(), {
             id: asset,
             filename: subAsset.replace(/\.captions.json$/, ""),
           });
           if (createdFile) {
             if (createdFile.complete) {
-              console.log("  ✔ Captions have already been synced.");
+              process.stderr.write("  ✔ Captions have already been synced.\n");
             } else {
               const readStream = createReadStream(subAssetPath);
-              await uploadCaptionFile(asset, readStream);
-              console.log("  ✅ Captions have been synced.");
+              await uploadCaptionFile(getClient(), asset, readStream);
+              process.stderr.write("  ✅ Captions have been synced.\n");
             }
             await syncStatus.markSynced();
           } else {
-            console.error(`🚫 No file found for captions: ${subAsset}`);
+            process.stderr.write(
+              `🚫 No file found for captions: ${subAsset}\n`,
+            );
             break;
           }
           break;
         }
         default: {
-          console.error(`🚫 Unknown sub-asset: ${subAsset}`);
+          process.stderr.write(`🚫 Unknown sub-asset: ${subAsset}\n`);
           break;
         }
       }

package/src/utils/index.ts

@@ -1,22 +1,13 @@
 import { program } from "commander";
 import "dotenv/config";
-import fetch, { type RequestInit } from "node-fetch";
+import { Client } from "@editframe/api";
 
-export const authenticatedFetch = (path: string, init: RequestInit = {}) => {
-  const programOpts = program.opts();
+let client: Client;
 
-  if (!programOpts.token) {
-    throw new Error(
-      "API Token is required to make authenticated requests.\nSet it with --token or EF_TOKEN env variable.\n\n(This tool will read from a .env file if it is present.)",
-    );
+export const getClient = () => {
+  if (!client) {
+    const programOpts = program.opts();
+    client = new Client(programOpts.token, programOpts.efHost);
   }
-  init.headers ||= {};
-  Object.assign(init.headers, {
-    Authorization: `Bearer ${programOpts.token}`,
-    "Content-Type": "application/json",
-  });
-
-  const url = new URL(path, programOpts.efHost);
-  // console.log("Fetching", url.toString());
-  return fetch(url, init);
+  return client;
 };

package/src/utils/launchBrowserAndWaitForSDK.ts

@@ -1,7 +1,11 @@
 import chalk from "chalk";
 import { type Browser, type Page, chromium } from "playwright";
+import debug from "debug";
+
 import { withSpinner } from "./withSpinner";
 
+const browserLog = debug("ef:cli::browser");
+
 interface LaunchOptions {
   url: string;
   headless?: boolean;
@@ -32,11 +36,13 @@ export async function launchBrowserAndWaitForSDK(
     }
     const page = await browser.newPage(pageOptions);
     page.on("console", (msg) => {
-      console.error(chalk.blue(`browser (${msg.type()}) |`), msg.text());
+      browserLog(chalk.blue(`browser (${msg.type()}) |`), msg.text());
     });
     const url =
       options.url + (options.efInteractive ? "" : "?EF_NONINTERACTIVE=1");
-    console.log("Loading url", url);
+    process.stderr.write("\nLoading url: ");
+    process.stderr.write(url);
+    process.stderr.write("\n");
     await page.goto(url);
     await page.waitForFunction(
       () => {
@@ -46,7 +52,7 @@ export async function launchBrowserAndWaitForSDK(
         );
       },
       [],
-      { timeout: 100000 },
+      { timeout: 10_000 },
     );
     return page;
   });

package/src/utils/validateVideoResolution.ts

@@ -0,0 +1,33 @@
+import { z } from "zod";
+import ora from "ora";
+import debug from "debug";
+
+const log = debug("ef:cli:auth");
+
+type VideoPayload = {
+  width: number;
+  height: number;
+};
+
+const schema = z
+  .object({
+    width: z.number().int(),
+    height: z.number().int(),
+  })
+  .refine((data) => data.width % 2 === 0 && data.height % 2 === 0, {
+    message: "Both width and height must be divisible by 2.",
+    path: ["width", "height"],
+  });
+export const validateVideoResolution = async (rawPayload: VideoPayload) => {
+  const spinner = ora("Validating video resolution").start();
+  const result = schema.safeParse(rawPayload);
+  if (result.success) {
+    spinner.succeed("Video resolution is valid");
+    return result.data;
+  }
+  spinner.fail("Invalid video resolution");
+  process.stderr.write(result.error?.errors.map((e) => e.message).join("\n"));
+  process.stderr.write("\n");
+  log("Error:", result.error?.errors.map((e) => e.message).join("\n"));
+  process.exit(1);
+};

package/dist/api/caption-file.cjs

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const zod = require("zod");
-const index = require("../utils/index.cjs");
-const CreateCaptionFilePayload = zod.z.object({
-  id: zod.z.string(),
-  filename: zod.z.string()
-});
-const createCaptionFile = async (payload) => {
-  const fileCreation = await index.authenticatedFetch("/api/video2/caption_files", {
-    method: "POST",
-    body: JSON.stringify(payload)
-  });
-  switch (fileCreation.status) {
-    case 200: {
-      return await fileCreation.json();
-    }
-    default: {
-      console.log(
-        `Failed to create file ${fileCreation.status} ${fileCreation.statusText}`
-      );
-      return;
-    }
-  }
-};
-const uploadCaptionFile = async (fileId, fileStream) => {
-  const fileIndex = await index.authenticatedFetch(
-    `/api/video2/caption_files/${fileId}/upload`,
-    {
-      method: "POST",
-      body: fileStream
-    }
-  );
-  switch (fileIndex.status) {
-    case 200: {
-      return fileIndex.json();
-    }
-    default: {
-      console.log(
-        `Failed to upload caption ${fileIndex.status} ${fileIndex.statusText}`
-      );
-      return;
-    }
-  }
-};
-exports.CreateCaptionFilePayload = CreateCaptionFilePayload;
-exports.createCaptionFile = createCaptionFile;
-exports.uploadCaptionFile = uploadCaptionFile;

package/dist/api/caption-file.js

@@ -1,48 +0,0 @@
-import { z } from "zod";
-import { authenticatedFetch } from "../utils/index.js";
-const CreateCaptionFilePayload = z.object({
-  id: z.string(),
-  filename: z.string()
-});
-const createCaptionFile = async (payload) => {
-  const fileCreation = await authenticatedFetch("/api/video2/caption_files", {
-    method: "POST",
-    body: JSON.stringify(payload)
-  });
-  switch (fileCreation.status) {
-    case 200: {
-      return await fileCreation.json();
-    }
-    default: {
-      console.log(
-        `Failed to create file ${fileCreation.status} ${fileCreation.statusText}`
-      );
-      return;
-    }
-  }
-};
-const uploadCaptionFile = async (fileId, fileStream) => {
-  const fileIndex = await authenticatedFetch(
-    `/api/video2/caption_files/${fileId}/upload`,
-    {
-      method: "POST",
-      body: fileStream
-    }
-  );
-  switch (fileIndex.status) {
-    case 200: {
-      return fileIndex.json();
-    }
-    default: {
-      console.log(
-        `Failed to upload caption ${fileIndex.status} ${fileIndex.statusText}`
-      );
-      return;
-    }
-  }
-};
-export {
-  CreateCaptionFilePayload,
-  createCaptionFile,
-  uploadCaptionFile
-};

package/dist/api/image-file.cjs

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const zod = require("zod");
-const index = require("../utils/index.cjs");
-const CreateImageFilePayload = zod.z.object({
-  id: zod.z.string(),
-  height: zod.z.number().int(),
-  width: zod.z.number().int(),
-  mime_type: zod.z.enum(["image/jpeg", "image/png", "image/jpg", "image/webp"]),
-  filename: zod.z.string()
-});
-const createImageFile = async (payload) => {
-  const response = await index.authenticatedFetch("/api/video2/image_files", {
-    method: "POST",
-    body: JSON.stringify(payload)
-  });
-  switch (response.status) {
-    case 200: {
-      return await response.json();
-    }
-    default: {
-      console.error(
-        `Failed to create file ${response.status} ${response.statusText}`
-      );
-      return;
-    }
-  }
-};
-const uploadImageFile = async (fileId, fileStream) => {
-  const fileIndex = await index.authenticatedFetch(
-    `/api/video2/image_files/${fileId}/upload`,
-    {
-      method: "POST",
-      body: fileStream
-    }
-  );
-  switch (fileIndex.status) {
-    case 200: {
-      return fileIndex.json();
-    }
-    default: {
-      console.log("Failed to upload image");
-      return;
-    }
-  }
-};
-exports.CreateImageFilePayload = CreateImageFilePayload;
-exports.createImageFile = createImageFile;
-exports.uploadImageFile = uploadImageFile;

package/dist/api/image-file.js

@@ -1,49 +0,0 @@
-import { z } from "zod";
-import { authenticatedFetch } from "../utils/index.js";
-const CreateImageFilePayload = z.object({
-  id: z.string(),
-  height: z.number().int(),
-  width: z.number().int(),
-  mime_type: z.enum(["image/jpeg", "image/png", "image/jpg", "image/webp"]),
-  filename: z.string()
-});
-const createImageFile = async (payload) => {
-  const response = await authenticatedFetch("/api/video2/image_files", {
-    method: "POST",
-    body: JSON.stringify(payload)
-  });
-  switch (response.status) {
-    case 200: {
-      return await response.json();
-    }
-    default: {
-      console.error(
-        `Failed to create file ${response.status} ${response.statusText}`
-      );
-      return;
-    }
-  }
-};
-const uploadImageFile = async (fileId, fileStream) => {
-  const fileIndex = await authenticatedFetch(
-    `/api/video2/image_files/${fileId}/upload`,
-    {
-      method: "POST",
-      body: fileStream
-    }
-  );
-  switch (fileIndex.status) {
-    case 200: {
-      return fileIndex.json();
-    }
-    default: {
-      console.log("Failed to upload image");
-      return;
-    }
-  }
-};
-export {
-  CreateImageFilePayload,
-  createImageFile,
-  uploadImageFile
-};

package/dist/api/index.cjs

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const captionFile = require("./caption-file.cjs");
-const imageFile = require("./image-file.cjs");
-const isobmffFile = require("./isobmff-file.cjs");
-const isobmffTrack = require("./isobmff-track.cjs");
-const renders = require("./renders.cjs");
-exports.CreateCaptionFilePayload = captionFile.CreateCaptionFilePayload;
-exports.CreateImageFilePayload = imageFile.CreateImageFilePayload;
-exports.CreateISOBMFFFilePayload = isobmffFile.CreateISOBMFFFilePayload;
-exports.CreateISOBMFFTrackPayload = isobmffTrack.CreateISOBMFFTrackPayload;
-exports.CreateRenderPayload = renders.CreateRenderPayload;

package/dist/api/index.js

@@ -1,12 +0,0 @@
-import { CreateCaptionFilePayload } from "./caption-file.js";
-import { CreateImageFilePayload } from "./image-file.js";
-import { CreateISOBMFFFilePayload } from "./isobmff-file.js";
-import { CreateISOBMFFTrackPayload } from "./isobmff-track.js";
-import { CreateRenderPayload } from "./renders.js";
-export {
-  CreateCaptionFilePayload,
-  CreateISOBMFFFilePayload,
-  CreateISOBMFFTrackPayload,
-  CreateImageFilePayload,
-  CreateRenderPayload
-};

package/dist/api/isobmff-file.cjs

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const zod = require("zod");
-const index = require("../utils/index.cjs");
-const CreateISOBMFFFilePayload = zod.z.object({
-  id: zod.z.string(),
-  filename: zod.z.string()
-});
-const createISOBMFFFile = async (payload) => {
-  const response = await index.authenticatedFetch("/api/video2/isobmff_files", {
-    method: "POST",
-    body: JSON.stringify(payload)
-  });
-  switch (response.status) {
-    case 200: {
-      return await response.json();
-    }
-    default: {
-      console.log(
-        `Failed to create file ${response.status} ${response.statusText}`
-      );
-      return;
-    }
-  }
-};
-const uploadFragmentIndex = async (fileId, fileStream) => {
-  const fileIndex = await index.authenticatedFetch(
-    `/api/video2/isobmff_files/${fileId}/index/upload`,
-    {
-      method: "POST",
-      body: fileStream
-    }
-  );
-  switch (fileIndex.status) {
-    case 200: {
-      return fileIndex.json();
-    }
-    default: {
-      console.log(
-        `Failed to create fragment index ${fileIndex.status} ${fileIndex.statusText}`
-      );
-      return;
-    }
-  }
-};
-exports.CreateISOBMFFFilePayload = CreateISOBMFFFilePayload;
-exports.createISOBMFFFile = createISOBMFFFile;
-exports.uploadFragmentIndex = uploadFragmentIndex;

package/dist/api/isobmff-file.js

@@ -1,48 +0,0 @@
-import { z } from "zod";
-import { authenticatedFetch } from "../utils/index.js";
-const CreateISOBMFFFilePayload = z.object({
-  id: z.string(),
-  filename: z.string()
-});
-const createISOBMFFFile = async (payload) => {
-  const response = await authenticatedFetch("/api/video2/isobmff_files", {
-    method: "POST",
-    body: JSON.stringify(payload)
-  });
-  switch (response.status) {
-    case 200: {
-      return await response.json();
-    }
-    default: {
-      console.log(
-        `Failed to create file ${response.status} ${response.statusText}`
-      );
-      return;
-    }
-  }
-};
-const uploadFragmentIndex = async (fileId, fileStream) => {
-  const fileIndex = await authenticatedFetch(
-    `/api/video2/isobmff_files/${fileId}/index/upload`,
-    {
-      method: "POST",
-      body: fileStream
-    }
-  );
-  switch (fileIndex.status) {
-    case 200: {
-      return fileIndex.json();
-    }
-    default: {
-      console.log(
-        `Failed to create fragment index ${fileIndex.status} ${fileIndex.statusText}`
-      );
-      return;
-    }
-  }
-};
-export {
-  CreateISOBMFFFilePayload,
-  createISOBMFFFile,
-  uploadFragmentIndex
-};