@editframe/cli 0.10.0-beta.7 → 0.11.0-beta.10

package/dist/VERSION.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.10.0-beta.7";
+export declare const VERSION = "0.11.0-beta.10";

package/dist/VERSION.js

@@ -1,4 +1,4 @@
-const VERSION = "0.10.0-beta.7";
+const VERSION = "0.11.0-beta.10";
 export {
   VERSION
 };

package/dist/commands/auth.d.ts

@@ -1,9 +1,9 @@
 export interface APIOrgResult {
-    name: string;
+    apiKeyName: string;
     id: string;
     org_id: string;
     created_at: unknown;
     updated_at: unknown;
-    org_display_name: string;
+    displayName: string;
 }
 export declare const getApiData: () => Promise<APIOrgResult>;

package/dist/commands/auth.js

@@ -1,11 +1,11 @@
-import { program } from "commander";
-import ora from "ora";
 import chalk from "chalk";
+import { program } from "commander";
 import debug from "debug";
+import ora from "ora";
 import { getClient } from "../utils/index.js";
 const log = debug("ef:cli:auth");
 const getApiData = async () => {
-  const response = await getClient().authenticatedFetch("/api/org");
+  const response = await getClient().authenticatedFetch("/api/v1/organization");
   return response.json();
 };
 const authCommand = program.command("auth").description("Fetch organization data using API token").action(async () => {
@@ -15,16 +15,16 @@ const authCommand = program.command("auth").description("Fetch organization data
   try {
     const apiData = await getApiData();
     spinner.succeed("You are authenticated! 🎉");
-    process.stderr.write(chalk.green(`Name: ${apiData.name}
-`));
     process.stderr.write(
-      chalk.green(`Welcome to ${apiData.org_display_name}!
+      chalk.green(`You're using ${apiData.apiKeyName} API key 🚀
+`)
+    );
+    process.stderr.write(
+      chalk.blue(`Welcome to ${apiData.displayName} organization 🎉
 `)
     );
   } catch (error) {
     spinner.fail("Authentication failed!");
-    process.stderr.write(error?.message);
-    process.stderr.write("\n");
     log("Error:", error);
   }
 });

package/dist/operations/syncAssetsDirectory/SubAssetSync.js

@@ -1,3 +1,4 @@
+import debug from "debug";
 import { SyncCaption } from "./SyncCaption.js";
 import { SyncFragmentIndex } from "./SyncFragmentIndex.js";
 import { SyncImage } from "./SyncImage.js";
@@ -6,7 +7,9 @@ const trackMatch = /\.track-[\d]+.mp4$/i;
 const fragmentIndexMatch = /\.tracks.json$/i;
 const captionsMatch = /\.captions.json$/i;
 const imageMatch = /\.(png|jpe?g|gif|webp)$/i;
+const log = debug("ef:SubAssetSync");
 const getAssetSync = (subAssetPath, md5) => {
+  log("getAssetSync", { subAssetPath, md5 });
   if (imageMatch.test(subAssetPath)) {
     return new SyncImage(subAssetPath, md5);
   }

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

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

package/dist/operations/syncAssetsDirectory/SyncCaption.js

@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 import { createCaptionFile, uploadCaptionFile } from "@editframe/api";
 import { Readable } from "node:stream";
 import { getClient } from "../../utils/index.js";
+import { basename } from "node:path";
 import { SyncStatus } from "./SyncStatus.js";
 class SyncCaption {
   constructor(path, md5) {
@@ -22,7 +23,7 @@ class SyncCaption {
   async create() {
     this.created = await createCaptionFile(getClient(), {
       md5: this.md5,
-      filename: this.path.replace(/\.captions.json$/, ""),
+      filename: basename(this.path).replace(/\.captions.json$/, ""),
       byte_size: await this.byteSize()
     });
   }

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

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

package/dist/operations/syncAssetsDirectory/SyncFragmentIndex.js

@@ -1,5 +1,5 @@
 import fs from "node:fs/promises";
-import { join, dirname } from "node:path";
+import { join, dirname, basename } from "node:path";
 import { Readable } from "node:stream";
 import { createISOBMFFFile, uploadFragmentIndex } from "@editframe/api";
 import { getClient } from "../../utils/index.js";
@@ -11,9 +11,7 @@ class SyncFragmentIndex {
     this.icon = "📋";
     this.label = "fragment index";
     this.syncStatus = new SyncStatus(this.path);
-    this.fileSyncStatus = new SyncStatus(
-      join(dirname(this.path), "isobmff")
-    );
+    this.fileSyncStatus = new SyncStatus(join(dirname(this.path), "isobmff"));
     this.created = null;
   }
   async byteSize() {
@@ -26,7 +24,7 @@ class SyncFragmentIndex {
   async create() {
     this.created = await createISOBMFFFile(getClient(), {
       md5: this.md5,
-      filename: this.path.replace(/\.tracks.json$/, "")
+      filename: basename(this.path).replace(/\.tracks.json$/, "")
     });
   }
   isComplete() {

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

@@ -1,5 +1,5 @@
-import { CreateImageFileResult } from '../../../../api/src';
-import { Probe } from '../../../../assets/src';
+import { CreateImageFileResult } from '../../../../api/src/index.ts';
+import { Probe } from '../../../../assets/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncImage implements SubAssetSync<CreateImageFileResult> {

package/dist/operations/syncAssetsDirectory/SyncImage.js

@@ -60,18 +60,18 @@ class SyncImage {
   isComplete() {
     return !!this.created?.complete;
   }
-  upload() {
+  async upload() {
     if (!this.created) {
       throw new Error(
         "Image not created. Should have been prevented by .isComplete()"
       );
     }
-    return uploadImageFile(
+    await uploadImageFile(
       getClient(),
       this.created.id,
       createReadStream(this.path),
       Number.parseInt(this.probeResult.format.size || "0")
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

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

@@ -25,8 +25,8 @@ export interface SyncStatusInfo extends z.infer<typeof SyncStatusSchema> {
 }
 export declare class SyncStatus {
     private basePath;
-    constructor(basePath: string);
     infoPath: string;
+    constructor(basePath: string);
     isSynced(): Promise<boolean>;
     readInfo(): Promise<{
         md5: string;

package/dist/operations/syncAssetsDirectory/SyncStatus.js

@@ -19,6 +19,7 @@ class SyncStatus {
     if (!syncInfo) {
       return false;
     }
+    console.log("syncInfo.infoPath", this.infoPath);
     return syncInfo.version === SYNC_VERSION && syncInfo.complete;
   }
   async readInfo() {

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

@@ -1,5 +1,5 @@
-import { CreateISOBMFFFileResult, CreateISOBMFFTrackResult } from '../../../../api/src';
-import { Probe } from '../../../../assets/src';
+import { CreateISOBMFFFileResult, CreateISOBMFFTrackResult } from '../../../../api/src/index.ts';
+import { Probe } from '../../../../assets/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult> {

package/dist/operations/syncAssetsDirectory/SyncTrack.js

@@ -1,6 +1,6 @@
 import { createReadStream } from "node:fs";
 import fs from "node:fs/promises";
-import { join, dirname } from "node:path";
+import { join, dirname, basename } from "node:path";
 import { createISOBMFFFile, createISOBMFFTrack, uploadISOBMFFTrack } from "@editframe/api";
 import { Probe } from "@editframe/assets";
 import { getClient } from "../../utils/index.js";
@@ -12,9 +12,7 @@ class SyncTrack {
     this.icon = "📼";
     this.label = "track";
     this.syncStatus = new SyncStatus(this.path);
-    this.fileSyncStatus = new SyncStatus(
-      join(dirname(this.path), "isobmff")
-    );
+    this.fileSyncStatus = new SyncStatus(join(dirname(this.path), "isobmff"));
     this.created = null;
     this._isoFile = null;
     this._probeResult = null;
@@ -44,7 +42,7 @@ class SyncTrack {
   async prepare() {
     this._isoFile = await createISOBMFFFile(getClient(), {
       md5: this.md5,
-      filename: this.path.replace(/\.track-[\d]+.mp4$/, "")
+      filename: basename(this.path).replace(/\.track-[\d]+.mp4$/, "")
     });
     this._probeResult = await Probe.probePath(this.path);
   }
@@ -98,13 +96,13 @@ class SyncTrack {
         "Track not created. Should have been prevented by .isComplete()"
       );
     }
-    return uploadISOBMFFTrack(
+    await uploadISOBMFFTrack(
       getClient(),
       this.isoFile.id,
       Number(this.trackId),
       createReadStream(this.path),
       this.created?.byte_size
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

package/dist/utils/index.d.ts

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

package/dist/utils/index.js

@@ -5,10 +5,16 @@ let client;
 const getClient = () => {
   if (!client) {
     const programOpts = program.opts();
-    client = new Client(
-      programOpts.token || process.env.EF_TOKEN,
-      programOpts.efHost || process.env.EF_HOST
-    );
+    const token = programOpts.token || process.env.EF_TOKEN;
+    const efHost = programOpts.efHost || process.env.EF_HOST;
+    console.log("token", token);
+    console.log("efHost", efHost);
+    if (!token) {
+      throw new Error(
+        "EF_TOKEN must be set or supplied as command line argument"
+      );
+    }
+    client = new Client(token, efHost);
   }
   return client;
 };

package/package.json

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

package/src/commands/auth.ts

@@ -1,23 +1,23 @@
-import { program } from "commander";
-import ora from "ora";
 import chalk from "chalk";
+import { program } from "commander";
 import debug from "debug";
+import ora from "ora";
 
 import { getClient } from "../utils/index.ts";
 
 const log = debug("ef:cli:auth");
 
 export interface APIOrgResult {
-  name: string;
+  apiKeyName: string;
   id: string;
   org_id: string;
   created_at: unknown;
   updated_at: unknown;
-  org_display_name: string;
+  displayName: string;
 }
 
 export const getApiData = async () => {
-  const response = await getClient().authenticatedFetch("/api/org");
+  const response = await getClient().authenticatedFetch("/api/v1/organization");
   return response.json() as Promise<APIOrgResult>;
 };
 
@@ -33,14 +33,14 @@ const authCommand = program
     try {
       const apiData = await getApiData();
       spinner.succeed("You are authenticated! 🎉");
-      process.stderr.write(chalk.green(`Name: ${apiData.name}\n`));
       process.stderr.write(
-        chalk.green(`Welcome to ${apiData.org_display_name}!\n`),
+        chalk.green(`You're using ${apiData.apiKeyName} API key 🚀\n`),
+      );
+      process.stderr.write(
+        chalk.blue(`Welcome to ${apiData.displayName} organization 🎉\n`),
       );
     } catch (error: any) {
       spinner.fail("Authentication failed!");
-      process.stderr.write(error?.message);
-      process.stderr.write("\n");
       log("Error:", error);
     }
   });

package/src/operations/syncAssetsDirectory/SubAssetSync.ts

@@ -1,3 +1,4 @@
+import debug from "debug";
 import type { SyncStatus } from "./SyncStatus.ts";
 
 import { SyncCaption } from "./SyncCaption.ts";
@@ -25,7 +26,10 @@ const fragmentIndexMatch = /\.tracks.json$/i;
 const captionsMatch = /\.captions.json$/i;
 const imageMatch = /\.(png|jpe?g|gif|webp)$/i;
 
+const log = debug("ef:SubAssetSync");
+
 export const getAssetSync = (subAssetPath: string, md5: string) => {
+  log("getAssetSync", { subAssetPath, md5 });
   if (imageMatch.test(subAssetPath)) {
     return new SyncImage(subAssetPath, md5);
   }

package/src/operations/syncAssetsDirectory/SyncCaption.ts

@@ -8,9 +8,10 @@ import {
 
 import { Readable } from "node:stream";
 import { getClient } from "../../utils/index.ts";
+
+import { basename } from "node:path";
 import type { SubAssetSync } from "./SubAssetSync.ts";
 import { SyncStatus } from "./SyncStatus.ts";
-
 export class SyncCaption implements SubAssetSync<CreateCaptionFileResult> {
   icon = "📝";
   label = "captions";
@@ -32,7 +33,7 @@ export class SyncCaption implements SubAssetSync<CreateCaptionFileResult> {
   async create() {
     this.created = await createCaptionFile(getClient(), {
       md5: this.md5,
-      filename: this.path.replace(/\.captions.json$/, ""),
+      filename: basename(this.path).replace(/\.captions.json$/, ""),
       byte_size: await this.byteSize(),
     });
   }

package/src/operations/syncAssetsDirectory/SyncFragmentIndex.ts

@@ -1,5 +1,5 @@
 import fs from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { Readable } from "node:stream";
 
 import {
@@ -17,10 +17,8 @@ export class SyncFragmentIndex
 {
   icon = "📋";
   label = "fragment index";
-  syncStatus: SyncStatus = new SyncStatus(this.path);
-  fileSyncStatus: SyncStatus = new SyncStatus(
-    join(dirname(this.path), "isobmff"),
-  );
+  syncStatus = new SyncStatus(this.path);
+  fileSyncStatus = new SyncStatus(join(dirname(this.path), "isobmff"));
   created: CreateISOBMFFFileResult | null = null;
 
   constructor(
@@ -39,7 +37,7 @@ export class SyncFragmentIndex
   async create() {
     this.created = await createISOBMFFFile(getClient(), {
       md5: this.md5,
-      filename: this.path.replace(/\.tracks.json$/, ""),
+      filename: basename(this.path).replace(/\.tracks.json$/, ""),
     });
   }
 

package/src/operations/syncAssetsDirectory/SyncImage.test.ts

@@ -70,9 +70,7 @@ describe("SyncImage", async () => {
         test("throws when not created", async () => {
           const syncImage = new SyncImage(await cacheImage(image!), image!.md5);
           await syncImage.prepare();
-          // This is throwing syncronously because the error is thrown before
-          // any async operations are awaited.
-          expect(() => syncImage.upload()).toThrow();
+          await expect(() => syncImage.upload()).rejects.toThrow();
         });
         test("uploads image", async () => {
           server.use(

package/src/operations/syncAssetsDirectory/SyncImage.ts

@@ -80,18 +80,18 @@ export class SyncImage implements SubAssetSync<CreateImageFileResult> {
   isComplete() {
     return !!this.created?.complete;
   }
-  upload() {
+  async upload() {
     if (!this.created) {
       throw new Error(
         "Image not created. Should have been prevented by .isComplete()",
       );
     }
-    return uploadImageFile(
+    await uploadImageFile(
       getClient(),
       this.created.id,
       createReadStream(this.path),
       Number.parseInt(this.probeResult.format.size || "0"),
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

package/src/operations/syncAssetsDirectory/SyncStatus.ts

@@ -16,15 +16,16 @@ const SyncStatusSchema = z.object({
 export interface SyncStatusInfo extends z.infer<typeof SyncStatusSchema> {}
 
 export class SyncStatus {
-  constructor(private basePath: string) {}
-
   infoPath = `${this.basePath}.info`;
 
+  constructor(private basePath: string) {}
+
   async isSynced() {
     const syncInfo = await this.readInfo();
     if (!syncInfo) {
       return false;
     }
+    console.log("syncInfo.infoPath", this.infoPath);
     return syncInfo.version === SYNC_VERSION && syncInfo.complete;
   }
 

package/src/operations/syncAssetsDirectory/SyncTrack.ts

@@ -1,6 +1,6 @@
 import { createReadStream } from "node:fs";
 import fs from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 
 import type { z } from "zod";
 
@@ -21,10 +21,8 @@ import { SyncStatus } from "./SyncStatus.ts";
 export class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult> {
   icon = "📼";
   label = "track";
-  syncStatus: SyncStatus = new SyncStatus(this.path);
-  fileSyncStatus: SyncStatus = new SyncStatus(
-    join(dirname(this.path), "isobmff"),
-  );
+  syncStatus = new SyncStatus(this.path);
+  fileSyncStatus = new SyncStatus(join(dirname(this.path), "isobmff"));
   created: CreateISOBMFFTrackResult | null = null;
 
   constructor(
@@ -64,7 +62,7 @@ export class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult> {
   async prepare() {
     this._isoFile = await createISOBMFFFile(getClient(), {
       md5: this.md5,
-      filename: this.path.replace(/\.track-[\d]+.mp4$/, ""),
+      filename: basename(this.path).replace(/\.track-[\d]+.mp4$/, ""),
     });
     this._probeResult = await Probe.probePath(this.path);
   }
@@ -127,13 +125,13 @@ export class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult> {
         "Track not created. Should have been prevented by .isComplete()",
       );
     }
-    return uploadISOBMFFTrack(
+    await uploadISOBMFFTrack(
       getClient(),
       this.isoFile.id,
       Number(this.trackId),
       createReadStream(this.path),
       this.created?.byte_size,
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

package/src/utils/index.ts

@@ -7,10 +7,16 @@ let client: Client;
 export const getClient = () => {
   if (!client) {
     const programOpts = program.opts();
-    client = new Client(
-      programOpts.token || process.env.EF_TOKEN,
-      programOpts.efHost || process.env.EF_HOST,
-    );
+    const token = programOpts.token || process.env.EF_TOKEN;
+    const efHost = programOpts.efHost || process.env.EF_HOST;
+    console.log("token", token);
+    console.log("efHost", efHost);
+    if (!token) {
+      throw new Error(
+        "EF_TOKEN must be set or supplied as command line argument",
+      );
+    }
+    client = new Client(token, efHost);
   }
   return client;
 };

package/dist/test-fixtures/fixture.d.ts

@@ -1,26 +0,0 @@
-import { SyncStatusInfo } from '../src/operations/syncAssetsDirectory/SyncStatus.ts';
-export declare const fixture: (fixture: string, name: string) => Promise<Fixture>;
-export interface Fixture {
-    name: string;
-    fixture: string;
-    md5: string;
-    content: Buffer;
-    originalPath: string;
-    write: (dir: string) => Promise<void>;
-}
-export declare const withFixtures: (fixtures: Promise<Fixture>[], fn: (props: {
-    files: Fixture[];
-    rootDir: string;
-    srcDir: string;
-    assetsDir: string;
-    cacheDir: string;
-    expectCacheFiles: (fixture: Fixture, files: string[]) => Promise<void>;
-    expectInfoFileContent: (fileName: string, fixture: Fixture, expectedContent: Pick<SyncStatusInfo, "complete" | "id"> & {
-        byte_size?: number;
-    }) => Promise<void>;
-    syncAssetsDirectory: () => Promise<void>;
-    cacheImage: (fixture: Fixture) => Promise<string>;
-    generateTrack: (fixture: Fixture, trackId: number) => Promise<string>;
-    generateTrackFragmentIndex: (fixture: Fixture) => Promise<string>;
-    generateCaptions: (fixture: Fixture) => Promise<string>;
-}) => Promise<void>) => Promise<void>;