@editframe/cli 0.12.0-beta.3 → 0.12.0-beta.8

package/dist/VERSION.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.12.0-beta.3";
+export declare const VERSION = "0.12.0-beta.8";

package/dist/VERSION.js

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

package/dist/commands/process-file.js

@@ -1,44 +1,30 @@
-import { createReadStream } from "node:fs";
-import { stat } from "node:fs/promises";
-import { basename } from "node:path";
 import { program } from "commander";
 import { withSpinner } from "../utils/withSpinner.js";
-import { uploadUnprocessedFile, getIsobmffProcessProgress, getIsobmffProcessInfo, createUnprocessedFile, processIsobmffFile } from "@editframe/api";
-import { md5FilePath } from "@editframe/assets";
+import { uploadUnprocessedFile, getIsobmffProcessProgress, getIsobmffProcessInfo, createUnprocessedFileFromPath, processIsobmffFile } from "@editframe/api";
 import ora from "ora";
-import { createReadableStreamFromReadable } from "../utils/createReadableStreamFromReadable.js";
 import { getClient } from "../utils/index.js";
 program.command("process-file <file>").description("Upload a audio/video to Editframe for processing.").action(async (path) => {
   const client = getClient();
-  const md5 = await md5FilePath(path);
-  const byte_size = (await stat(path)).size;
   const unprocessedFile = await withSpinner(
     "Creating unprocessed file record",
-    async () => await createUnprocessedFile(client, {
-      md5,
-      filename: basename(path),
-      byte_size
-    })
-  );
-  const readStream = createReadStream(path);
-  const upload = uploadUnprocessedFile(
-    client,
-    unprocessedFile.id,
-    createReadableStreamFromReadable(readStream),
-    byte_size
+    () => createUnprocessedFileFromPath(client, path)
   );
+  const upload = await uploadUnprocessedFile(client, unprocessedFile, path);
   const uploadSpinner = ora("Uploading file");
   for await (const event of upload) {
     uploadSpinner.text = `Uploading file: ${(100 * event.progress).toFixed(2)}%`;
   }
   uploadSpinner.succeed("Upload complete");
-  const processor = await withSpinner(
+  const processorRecord = await withSpinner(
     "Marking for processing",
     async () => await processIsobmffFile(client, unprocessedFile.id)
   );
   const processSpinner = ora("Waiting for processing to complete");
   processSpinner.start();
-  const progress = await getIsobmffProcessProgress(client, processor.id);
+  const progress = await getIsobmffProcessProgress(
+    client,
+    processorRecord.id
+  );
   for await (const event of progress) {
     if (event.type === "progress") {
       processSpinner.text = `Processing: ${(100 * event.data.progress).toFixed(2)}%`;
@@ -46,7 +32,7 @@ program.command("process-file <file>").description("Upload a audio/video to Edit
       processSpinner.succeed("Processing complete");
     }
   }
-  const info = await getIsobmffProcessInfo(client, processor.id);
+  const info = await getIsobmffProcessInfo(client, processorRecord.id);
   console.log("Processed file info");
   console.log(info);
 });

package/dist/operations/getRenderInfo.d.ts

@@ -18,24 +18,24 @@ export declare const RenderInfo: z.ZodObject<{
         efImage: string[];
     }>;
 }, "strip", z.ZodTypeAny, {
-    height: number;
     width: number;
-    fps: number;
+    height: number;
     assets: {
         efMedia: Record<string, any>;
         efCaptions: string[];
         efImage: string[];
     };
+    fps: number;
     durationMs: number;
 }, {
-    height: number;
     width: number;
-    fps: number;
+    height: number;
     assets: {
         efMedia: Record<string, any>;
         efCaptions: string[];
         efImage: string[];
     };
+    fps: number;
     durationMs: number;
 }>;
 export declare const getRenderInfo: () => Promise<{

package/dist/operations/syncAssetsDirectory/SyncCaption.d.ts

@@ -1,4 +1,4 @@
-import { CreateCaptionFileResult, LookupCaptionFileByMd5Result } from '../../../../api/src/index.ts';
+import { CreateCaptionFileResult, LookupCaptionFileByMd5Result } from '../../../../api/src/browser.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncCaption implements SubAssetSync<CreateCaptionFileResult> {

package/dist/operations/syncAssetsDirectory/SyncFragmentIndex.d.ts

@@ -1,4 +1,4 @@
-import { CreateISOBMFFFileResult, LookupISOBMFFFileByMd5Result } from '../../../../api/src/index.ts';
+import { CreateISOBMFFFileResult, LookupISOBMFFFileByMd5Result } from '../../../../api/src/browser.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncFragmentIndex implements SubAssetSync<CreateISOBMFFFileResult> {

package/dist/operations/syncAssetsDirectory/SyncImage.d.ts

@@ -1,4 +1,4 @@
-import { CreateImageFileResult, LookupImageFileByMd5Result } from '../../../../api/src/index.ts';
+import { CreateImageFileResult, LookupImageFileByMd5Result } from '../../../../api/src/browser.ts';
 import { Probe } from '../../../../assets/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';

package/dist/operations/syncAssetsDirectory/SyncImage.js

@@ -74,9 +74,11 @@ class SyncImage {
     }
     await uploadImageFile(
       getClient(),
-      this.created.id,
-      createReadableStreamFromReadable(createReadStream(this.path)),
-      Number.parseInt(this.probeResult.format.size || "0")
+      {
+        id: this.created.id,
+        byte_size: Number.parseInt(this.probeResult.format.size || "0")
+      },
+      createReadableStreamFromReadable(createReadStream(this.path))
     ).whenUploaded();
   }
   async markSynced() {

package/dist/operations/syncAssetsDirectory/SyncStatus.d.ts

@@ -6,17 +6,17 @@ declare const SyncStatusSchema: z.ZodObject<{
     md5: z.ZodString;
     byte_size: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
+    version: string;
     complete: boolean;
     id: string;
     md5: string;
     byte_size: number;
-    version: string;
 }, {
+    version: string;
     complete: boolean;
     id: string;
     md5: string;
     byte_size: number;
-    version: string;
 }>;
 export interface SyncStatusInfo extends z.infer<typeof SyncStatusSchema> {
 }
@@ -26,11 +26,11 @@ export declare class SyncStatus {
     constructor(basePath: string);
     isSynced(): Promise<boolean>;
     readInfo(): Promise<{
+        version: string;
         complete: boolean;
         id: string;
         md5: string;
         byte_size: number;
-        version: string;
     } | null>;
     markSynced(info: SyncStatusInfo): Promise<void>;
 }

package/dist/operations/syncAssetsDirectory/SyncTrack.d.ts

@@ -1,4 +1,4 @@
-import { CreateISOBMFFFileResult, CreateISOBMFFTrackResult, LookupISOBMFFFileByMd5Result } from '../../../../api/src/index.ts';
+import { CreateISOBMFFTrackResult } from '../../../../api/src/browser.ts';
 import { Probe } from '../../../../assets/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
@@ -12,7 +12,7 @@ export declare class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult>
     created: CreateISOBMFFTrackResult | null;
     constructor(path: string, md5: string);
     private _isoFile;
-    get isoFile(): CreateISOBMFFFileResult | LookupISOBMFFFileByMd5Result;
+    get isoFile(): any;
     byteSize(): Promise<number>;
     private _probeResult;
     get probeResult(): Probe;
@@ -39,8 +39,6 @@ export declare class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult>
         disposition: Record<string, unknown>;
         initial_padding?: number | undefined;
     } | {
-        height: number;
-        width: number;
         index: number;
         codec_name: string;
         codec_long_name: string;
@@ -51,6 +49,8 @@ export declare class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult>
         avg_frame_rate: string;
         time_base: string;
         disposition: Record<string, unknown>;
+        width: number;
+        height: number;
         coded_width: number;
         coded_height: number;
         start_pts?: number | undefined;

package/dist/utils/index.d.ts

@@ -1,2 +1 @@
-import { Client } from '../../../api/src/index.ts';
 export declare const getClient: () => Client;

package/dist/utils/validateVideoResolution.d.ts

@@ -3,7 +3,7 @@ type VideoPayload = {
     height: number;
 };
 export declare const validateVideoResolution: (rawPayload: VideoPayload) => Promise<{
-    height: number;
     width: number;
+    height: number;
 }>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/cli",
-  "version": "0.12.0-beta.3",
+  "version": "0.12.0-beta.8",
   "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.12.0-beta.3",
-    "@editframe/assets": "0.12.0-beta.3",
-    "@editframe/elements": "0.12.0-beta.3",
-    "@editframe/vite-plugin": "0.12.0-beta.3",
+    "@editframe/api": "0.12.0-beta.8",
+    "@editframe/assets": "0.12.0-beta.8",
+    "@editframe/elements": "0.12.0-beta.8",
+    "@editframe/vite-plugin": "0.12.0-beta.8",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.6.8",
     "chalk": "^5.3.0",

package/src/commands/process-file.ts

@@ -1,21 +1,15 @@
-import { createReadStream } from "node:fs";
-import { stat } from "node:fs/promises";
-import { basename } from "node:path";
-
 import { program } from "commander";
 
 import { withSpinner } from "../utils/withSpinner.ts";
 
 import {
-  createUnprocessedFile,
+  createUnprocessedFileFromPath,
   getIsobmffProcessInfo,
   getIsobmffProcessProgress,
   processIsobmffFile,
   uploadUnprocessedFile,
 } from "@editframe/api";
-import { md5FilePath } from "@editframe/assets";
 import ora from "ora";
-import { createReadableStreamFromReadable } from "../utils/createReadableStreamFromReadable.ts";
 import { getClient } from "../utils/index.ts";
 
 program
@@ -24,41 +18,29 @@ program
   .action(async (path: string) => {
     const client = getClient();
 
-    const md5 = await md5FilePath(path);
-
-    const byte_size = (await stat(path)).size;
-
     const unprocessedFile = await withSpinner(
       "Creating unprocessed file record",
-      async () =>
-        await createUnprocessedFile(client, {
-          md5,
-          filename: basename(path),
-          byte_size,
-        }),
+      () => createUnprocessedFileFromPath(client, path),
     );
 
-    const readStream = createReadStream(path);
-
-    const upload = uploadUnprocessedFile(
-      client,
-      unprocessedFile.id,
-      createReadableStreamFromReadable(readStream),
-      byte_size,
-    );
+    const upload = await uploadUnprocessedFile(client, unprocessedFile, path);
     const uploadSpinner = ora("Uploading file");
+
     for await (const event of upload) {
       uploadSpinner.text = `Uploading file: ${(100 * event.progress).toFixed(2)}%`;
     }
     uploadSpinner.succeed("Upload complete");
-    const processor = await withSpinner(
+    const processorRecord = await withSpinner(
       "Marking for processing",
       async () => await processIsobmffFile(client, unprocessedFile.id),
     );
 
     const processSpinner = ora("Waiting for processing to complete");
     processSpinner.start();
-    const progress = await getIsobmffProcessProgress(client, processor.id);
+    const progress = await getIsobmffProcessProgress(
+      client,
+      processorRecord.id,
+    );
 
     for await (const event of progress) {
       if (event.type === "progress") {
@@ -68,7 +50,7 @@ program
       }
     }
 
-    const info = await getIsobmffProcessInfo(client, processor.id);
+    const info = await getIsobmffProcessInfo(client, processorRecord.id);
 
     console.log("Processed file info");
     console.log(info);

package/src/operations/syncAssetsDirectory/SyncImage.ts

@@ -97,9 +97,11 @@ export class SyncImage implements SubAssetSync<CreateImageFileResult> {
     }
     await uploadImageFile(
       getClient(),
-      this.created.id,
+      {
+        id: this.created.id,
+        byte_size: Number.parseInt(this.probeResult.format.size || "0"),
+      },
       createReadableStreamFromReadable(createReadStream(this.path)),
-      Number.parseInt(this.probeResult.format.size || "0"),
     ).whenUploaded();
   }
   async markSynced() {