@editframe/cli 0.8.0-beta.8 → 0.9.0-beta.1

package/dist/VERSION.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.8.0-beta.8";
+export declare const VERSION = "0.9.0-beta.1";

package/dist/VERSION.js

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

package/dist/commands/render.d.ts

@@ -1 +1 @@
-export {};
+export declare const buildAssetId: (assetPath: string) => Promise<string>;

package/dist/commands/render.js

@@ -17,34 +17,19 @@ import { getRenderInfo } from "../operations/getRenderInfo.js";
 import { processRenderInfo } from "../operations/processRenderInfo.js";
 import { validateVideoResolution } from "../utils/validateVideoResolution.js";
 import { getFolderSize } from "../utils/getFolderSize.js";
-const buildProductionUrl = async (origin, tagName, assetPath) => {
+const buildAssetId = async (assetPath) => {
   const md5Sum = await md5FilePath(assetPath);
   const basename = path.basename(assetPath);
-  switch (tagName) {
-    case "ef-audio":
-    case "ef-video": {
-      return `${origin}/api/video2/isobmff_files/${md5Sum}/${basename}`;
-    }
-    case "ef-captions": {
-      return `${origin}/api/video2/caption_files/${md5Sum}/${basename}`;
-    }
-    case "ef-image": {
-      return `${origin}/api/video2/image_files/${md5Sum}/${basename}`;
-    }
-    default: {
-      return assetPath;
-    }
-  }
+  return `${md5Sum}:${basename}`;
 };
 class V1Builder {
-  async buildProductionUrl(tagName, assetPath) {
-    return buildProductionUrl("editframe://", tagName, assetPath);
+  async buildAssetId(assetPath) {
+    return buildAssetId(assetPath);
   }
 }
 class V2Builder {
-  async buildProductionUrl(tagName, assetPath) {
-    const efRenderHost = program.opts().efRenderHost;
-    return buildProductionUrl(efRenderHost, tagName, assetPath);
+  async buildAssetId(assetPath) {
+    return buildAssetId(assetPath);
   }
 }
 const strategyBuilders = {
@@ -109,11 +94,8 @@ program.command("render [directory]").description(
         }
         const assetPath = path.join(srcDir, src);
         element.setAttribute(
-          "src",
-          await builder.buildProductionUrl(
-            element.tagName.toLowerCase(),
-            assetPath
-          )
+          "asset-id",
+          await builder.buildAssetId(assetPath)
         );
       }
       await writeFile(path.join(distDir, "index.html"), doc.toString());
@@ -151,3 +133,6 @@ program.command("render [directory]").description(
     }
   );
 });
+export {
+  buildAssetId
+};

package/dist/commands/render.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/operations/syncAssetsDirectory.js

@@ -119,14 +119,14 @@ const syncAssetDirectory = async (projectDirectory) => {
                 created.id,
                 createReadStream(subAssetPath),
                 Number.parseInt(format.size || "0")
-              ).catch((error) => {
+              ).then(() => {
+                reportSuccess(subAsset, "Image has been synced.");
+                return syncStatus.markSynced();
+              }).catch((error) => {
                 reportError(
                   subAsset,
                   `Error uploading image: ${error.message}`
                 );
-              }).then(() => {
-                reportSuccess(subAsset, "Image has been synced.");
-                return syncStatus.markSynced();
               });
             }
           }
@@ -180,7 +180,7 @@ const syncAssetDirectory = async (projectDirectory) => {
               createPayload
             );
             if (createdTrack) {
-              if (createdTrack.next_byte === createdTrack.byte_size - 1) {
+              if (createdTrack.next_byte === createdTrack.byte_size) {
                 reportInfo(subAsset, "✔ Track has already been synced.");
                 await syncStatus.markSynced();
               } else {
@@ -190,14 +190,14 @@ const syncAssetDirectory = async (projectDirectory) => {
                   Number(trackId),
                   createReadStream(subAssetPath),
                   createdTrack.byte_size
-                ).catch((error) => {
+                ).then(() => {
+                  reportSuccess(subAsset, "Track has been synced.");
+                  return syncStatus.markSynced();
+                }).catch((error) => {
                   reportError(
                     subAsset,
                     `Error uploading track: ${error.message}`
                   );
-                }).then(() => {
-                  reportSuccess(subAsset, "Track has been synced.");
-                  return syncStatus.markSynced();
                 });
               }
             }
@@ -222,14 +222,14 @@ const syncAssetDirectory = async (projectDirectory) => {
                 asset,
                 readStream,
                 stats.size
-              ).catch((error) => {
+              ).then(() => {
+                reportSuccess(subAsset, "Fragment index has been synced.");
+                return syncStatus.markSynced();
+              }).catch((error) => {
                 reportError(
                   subAsset,
                   `Error uploading fragment index: ${error.message}`
                 );
-              }).then(() => {
-                reportSuccess(subAsset, "Fragment index has been synced.");
-                return syncStatus.markSynced();
               });
             }
           } else {
@@ -260,14 +260,14 @@ const syncAssetDirectory = async (projectDirectory) => {
                 asset,
                 readStream,
                 stats.size
-              ).catch((error) => {
+              ).then(() => {
+                reportSuccess(subAsset, "Captions have been synced.");
+                return syncStatus.markSynced();
+              }).catch((error) => {
                 reportError(
                   subAsset,
                   `Error uploading captions: ${error.message}`
                 );
-              }).then(() => {
-                reportSuccess(subAsset, "Captions have been synced.");
-                return syncStatus.markSynced();
               });
             }
           } else {

package/package.json

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

package/src/commands/render.test.ts

@@ -0,0 +1,34 @@
+// @vitest-environment node
+import { join } from "node:path";
+import { describe, expect, test } from "vitest";
+import { buildAssetId } from "./render.ts";
+
+const testAssetPath = join(__dirname, "test-asset.file");
+
+describe("render", () => {
+  describe("buildProductionUrl", () => {
+    test("builds urls for ef-audio", async () => {
+      await expect(buildAssetId(testAssetPath)).resolves.toBe(
+        "d41d8cd9-8f00-b204-e980-0998ecf8427e:test-asset.file",
+      );
+    });
+
+    test("builds urls for ef-video", async () => {
+      await expect(buildAssetId(testAssetPath)).resolves.toBe(
+        "d41d8cd9-8f00-b204-e980-0998ecf8427e:test-asset.file",
+      );
+    });
+
+    test("builds urls for ef-captions", async () => {
+      await expect(buildAssetId(testAssetPath)).resolves.toBe(
+        "d41d8cd9-8f00-b204-e980-0998ecf8427e:test-asset.file",
+      );
+    });
+
+    test("builds urls for ef-image", async () => {
+      await expect(buildAssetId(testAssetPath)).resolves.toBe(
+        "d41d8cd9-8f00-b204-e980-0998ecf8427e:test-asset.file",
+      );
+    });
+  });
+});

package/src/commands/render.ts

@@ -22,45 +22,26 @@ import { validateVideoResolution } from "../utils/validateVideoResolution.ts";
 import { getFolderSize } from "../utils/getFolderSize.ts";
 
 interface StrategyBuilder {
-  buildProductionUrl: (tagName: string, assetPath: string) => Promise<string>;
+  buildAssetId: (assetPath: string) => Promise<string>;
 }
 
-const buildProductionUrl = async (
-  origin: string,
-  tagName: string,
-  assetPath: string,
-) => {
+export const buildAssetId = async (assetPath: string) => {
   const md5Sum = await md5FilePath(assetPath);
 
   const basename = path.basename(assetPath);
 
-  switch (tagName) {
-    case "ef-audio":
-    case "ef-video": {
-      return `${origin}/api/video2/isobmff_files/${md5Sum}/${basename}`;
-    }
-    case "ef-captions": {
-      return `${origin}/api/video2/caption_files/${md5Sum}/${basename}`;
-    }
-    case "ef-image": {
-      return `${origin}/api/video2/image_files/${md5Sum}/${basename}`;
-    }
-    default: {
-      return assetPath;
-    }
-  }
+  return `${md5Sum}:${basename}`;
 };
 
 class V1Builder implements StrategyBuilder {
-  async buildProductionUrl(tagName: string, assetPath: string) {
-    return buildProductionUrl("editframe://", tagName, assetPath);
+  async buildAssetId(assetPath: string) {
+    return buildAssetId(assetPath);
   }
 }
 
 class V2Builder implements StrategyBuilder {
-  async buildProductionUrl(tagName: string, assetPath: string) {
-    const efRenderHost = program.opts().efRenderHost;
-    return buildProductionUrl(efRenderHost, tagName, assetPath);
+  async buildAssetId(assetPath: string) {
+    return buildAssetId(assetPath);
   }
 }
 
@@ -138,11 +119,8 @@ program
           const assetPath = path.join(srcDir, src);
 
           element.setAttribute(
-            "src",
-            await builder.buildProductionUrl(
-              element.tagName.toLowerCase(),
-              assetPath,
-            ),
+            "asset-id",
+            await builder.buildAssetId(assetPath),
           );
         }
 

package/src/operations/syncAssetsDirectory.ts

@@ -153,15 +153,15 @@ export const syncAssetDirectory = async (
                 createReadStream(subAssetPath),
                 Number.parseInt(format.size || "0"),
               )
+                .then(() => {
+                  reportSuccess(subAsset, "Image has been synced.");
+                  return syncStatus.markSynced();
+                })
                 .catch((error) => {
                   reportError(
                     subAsset,
                     `Error uploading image: ${error.message}`,
                   );
-                })
-                .then(() => {
-                  reportSuccess(subAsset, "Image has been synced.");
-                  return syncStatus.markSynced();
                 });
             }
           }
@@ -227,7 +227,7 @@ export const syncAssetDirectory = async (
             );
 
             if (createdTrack) {
-              if (createdTrack.next_byte === createdTrack.byte_size - 1) {
+              if (createdTrack.next_byte === createdTrack.byte_size) {
                 reportInfo(subAsset, "✔ Track has already been synced.");
                 await syncStatus.markSynced();
               } else {
@@ -238,15 +238,15 @@ export const syncAssetDirectory = async (
                   createReadStream(subAssetPath),
                   createdTrack.byte_size,
                 )
+                  .then(() => {
+                    reportSuccess(subAsset, "Track has been synced.");
+                    return syncStatus.markSynced();
+                  })
                   .catch((error) => {
                     reportError(
                       subAsset,
                       `Error uploading track: ${error.message}`,
                     );
-                  })
-                  .then(() => {
-                    reportSuccess(subAsset, "Track has been synced.");
-                    return syncStatus.markSynced();
                   });
               }
             }
@@ -273,15 +273,15 @@ export const syncAssetDirectory = async (
                 readStream,
                 stats.size,
               )
+                .then(() => {
+                  reportSuccess(subAsset, "Fragment index has been synced.");
+                  return syncStatus.markSynced();
+                })
                 .catch((error) => {
                   reportError(
                     subAsset,
                     `Error uploading fragment index: ${error.message}`,
                   );
-                })
-                .then(() => {
-                  reportSuccess(subAsset, "Fragment index has been synced.");
-                  return syncStatus.markSynced();
                 });
             }
           } else {
@@ -313,15 +313,15 @@ export const syncAssetDirectory = async (
                 readStream,
                 stats.size,
               )
+                .then(() => {
+                  reportSuccess(subAsset, "Captions have been synced.");
+                  return syncStatus.markSynced();
+                })
                 .catch((error) => {
                   reportError(
                     subAsset,
                     `Error uploading captions: ${error.message}`,
                   );
-                })
-                .then(() => {
-                  reportSuccess(subAsset, "Captions have been synced.");
-                  return syncStatus.markSynced();
                 });
             }
           } else {