@editframe/api 0.9.0-beta.3 → 0.10.0-beta.3

package/dist/resources/caption-file.d.ts

@@ -2,21 +2,22 @@ import { Readable } from 'node:stream';
 import { z } from 'zod';
 import { Client } from '../client.ts';
 export declare const CreateCaptionFilePayload: z.ZodObject<{
-    id: z.ZodString;
+    md5: z.ZodString;
     filename: z.ZodString;
     byte_size: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
-    id: string;
+    md5: string;
     filename: string;
     byte_size: number;
 }, {
-    id: string;
+    md5: string;
     filename: string;
     byte_size: number;
 }>;
 export interface CreateCaptionFileResult {
     complete: boolean | null;
     id: string;
+    md5: string;
     asset_id: string;
 }
 /**

package/dist/resources/caption-file.js

@@ -3,7 +3,7 @@ import debug from "debug";
 const log = debug("ef:api:caption-file");
 const MAX_CAPTION_SIZE = 1024 * 1024 * 2;
 const CreateCaptionFilePayload = z.object({
-  id: z.string(),
+  md5: z.string(),
   filename: z.string(),
   byte_size: z.number().int().max(MAX_CAPTION_SIZE)
 });
@@ -18,13 +18,10 @@ const restrictSize = (size) => {
 const createCaptionFile = async (client, payload) => {
   log("Creating caption file", payload);
   restrictSize(payload.byte_size);
-  const response = await client.authenticatedFetch(
-    "/api/video2/caption_files",
-    {
-      method: "POST",
-      body: JSON.stringify(payload)
-    }
-  );
+  const response = await client.authenticatedFetch("/api/v1/caption_files", {
+    method: "POST",
+    body: JSON.stringify(payload)
+  });
   log("Caption file created", response);
   if (response.ok) {
     return await response.json();
@@ -37,7 +34,7 @@ const uploadCaptionFile = async (client, fileId, fileStream, fileSize) => {
   log("Uploading caption file", fileId);
   restrictSize(fileSize);
   const response = await client.authenticatedFetch(
-    `/api/video2/caption_files/${fileId}/upload`,
+    `/api/v1/caption_files/${fileId}/upload`,
     {
       method: "POST",
       body: fileStream

package/dist/resources/image-file.d.ts

@@ -2,21 +2,21 @@ import { Readable } from 'node:stream';
 import { z } from 'zod';
 import { Client } from '../client.ts';
 export declare const CreateImageFilePayload: z.ZodObject<{
-    id: z.ZodString;
+    md5: z.ZodString;
     height: z.ZodNumber;
     width: z.ZodNumber;
     mime_type: z.ZodEnum<["image/jpeg", "image/png", "image/jpg", "image/webp"]>;
     filename: z.ZodString;
     byte_size: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
-    id: string;
+    md5: string;
     filename: string;
     byte_size: number;
     height: number;
     width: number;
     mime_type: "image/jpeg" | "image/png" | "image/jpg" | "image/webp";
 }, {
-    id: string;
+    md5: string;
     filename: string;
     byte_size: number;
     height: number;
@@ -26,6 +26,7 @@ export declare const CreateImageFilePayload: z.ZodObject<{
 export interface CreateImageFileResult {
     complete: boolean | null;
     id: string;
+    md5: string;
     asset_id: string;
 }
 export declare const createImageFile: (client: Client, payload: z.infer<typeof CreateImageFilePayload>) => Promise<CreateImageFileResult>;

package/dist/resources/image-file.js

@@ -4,7 +4,7 @@ import { uploadChunks } from "../uploadChunks.js";
 const log = debug("ef:api:image-file");
 const MAX_IMAGE_SIZE = 1024 * 1024 * 16;
 const CreateImageFilePayload = z.object({
-  id: z.string(),
+  md5: z.string(),
   height: z.number().int(),
   width: z.number().int(),
   mime_type: z.enum(["image/jpeg", "image/png", "image/jpg", "image/webp"]),
@@ -14,7 +14,7 @@ const CreateImageFilePayload = z.object({
 const createImageFile = async (client, payload) => {
   log("Creating image file", payload);
   CreateImageFilePayload.parse(payload);
-  const response = await client.authenticatedFetch("/api/video2/image_files", {
+  const response = await client.authenticatedFetch("/api/v1/image_files", {
     method: "POST",
     body: JSON.stringify(payload)
   });
@@ -34,7 +34,7 @@ const uploadImageFile = async (client, fileId, fileStream, fileSize) => {
     );
   }
   const result = await uploadChunks(client, {
-    url: `/api/video2/image_files/${fileId}/upload`,
+    url: `/api/v1/image_files/${fileId}/upload`,
     fileSize,
     fileStream
   });

package/dist/resources/isobmff-file.d.ts

@@ -2,18 +2,20 @@ import { Readable } from 'node:stream';
 import { z } from 'zod';
 import { Client } from '../client.ts';
 export declare const CreateISOBMFFFilePayload: z.ZodObject<{
-    id: z.ZodString;
+    md5: z.ZodString;
     filename: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    id: string;
+    md5: string;
     filename: string;
 }, {
-    id: string;
+    md5: string;
     filename: string;
 }>;
 export interface CreateISOBMFFFileResult {
     fragment_index_complete: boolean;
+    filename: string;
     id: string;
+    md5: string;
     asset_id: string;
 }
 export declare const createISOBMFFFile: (client: Client, payload: z.infer<typeof CreateISOBMFFFilePayload>) => Promise<CreateISOBMFFFileResult>;

package/dist/resources/isobmff-file.js

@@ -3,18 +3,15 @@ import debug from "debug";
 const log = debug("ef:api:isobmff-file");
 const FILE_SIZE_LIMIT = 1024 * 1024 * 2;
 const CreateISOBMFFFilePayload = z.object({
-  id: z.string(),
+  md5: z.string(),
   filename: z.string()
 });
 const createISOBMFFFile = async (client, payload) => {
   log("Creating isobmff file", payload);
-  const response = await client.authenticatedFetch(
-    "/api/video2/isobmff_files",
-    {
-      method: "POST",
-      body: JSON.stringify(payload)
-    }
-  );
+  const response = await client.authenticatedFetch("/api/v1/isobmff_files", {
+    method: "POST",
+    body: JSON.stringify(payload)
+  });
   log("ISOBMFF file created", response);
   if (response.ok) {
     return await response.json();
@@ -29,7 +26,7 @@ const uploadFragmentIndex = async (client, fileId, fileStream, fileSize) => {
     throw new Error(`File size exceeds limit of ${FILE_SIZE_LIMIT} bytes`);
   }
   const response = await client.authenticatedFetch(
-    `/api/video2/isobmff_files/${fileId}/index/upload`,
+    `/api/v1/isobmff_files/${fileId}/index/upload`,
     {
       method: "POST",
       body: fileStream

package/dist/resources/isobmff-track.js

@@ -27,13 +27,10 @@ const CreateISOBMFFTrackPayload = z.discriminatedUnion("type", [
 const createISOBMFFTrack = async (client, payload) => {
   log("Creating isobmff track", payload);
   CreateISOBMFFTrackPayload.parse(payload);
-  const response = await client.authenticatedFetch(
-    "/api/video2/isobmff_tracks",
-    {
-      method: "POST",
-      body: JSON.stringify(payload)
-    }
-  );
+  const response = await client.authenticatedFetch("/api/v1/isobmff_tracks", {
+    method: "POST",
+    body: JSON.stringify(payload)
+  });
   log("ISOBMFF track created", response);
   if (response.ok) {
     return await response.json();
@@ -45,7 +42,7 @@ const createISOBMFFTrack = async (client, payload) => {
 const uploadISOBMFFTrack = async (client, fileId, trackId, fileStream, trackSize) => {
   log("Uploading fragment track", fileId);
   await uploadChunks(client, {
-    url: `/api/video2/isobmff_tracks/${fileId}/${trackId}/upload`,
+    url: `/api/v1/isobmff_tracks/${fileId}/${trackId}/upload`,
     fileStream,
     fileSize: trackSize
   });

package/dist/resources/renders.d.ts

@@ -2,7 +2,7 @@ import { Readable } from 'node:stream';
 import { z } from 'zod';
 import { Client } from '../client.ts';
 export declare const CreateRenderPayload: z.ZodObject<{
-    id: z.ZodString;
+    md5: z.ZodString;
     fps: z.ZodNumber;
     width: z.ZodNumber;
     height: z.ZodNumber;
@@ -10,7 +10,7 @@ export declare const CreateRenderPayload: z.ZodObject<{
     duration_ms: z.ZodNumber;
     strategy: z.ZodEnum<["v1", "v2"]>;
 }, "strip", z.ZodTypeAny, {
-    id: string;
+    md5: string;
     height: number;
     width: number;
     strategy: "v1" | "v2";
@@ -18,7 +18,7 @@ export declare const CreateRenderPayload: z.ZodObject<{
     fps: number;
     work_slice_ms: number;
 }, {
-    id: string;
+    md5: string;
     height: number;
     width: number;
     strategy: "v1" | "v2";
@@ -27,8 +27,9 @@ export declare const CreateRenderPayload: z.ZodObject<{
     work_slice_ms: number;
 }>;
 export interface CreateRenderResult {
-    status: "complete" | "created" | "failed" | "pending" | "rendering";
     id: string;
+    md5: string;
+    status: "complete" | "created" | "failed" | "pending" | "rendering";
 }
 export declare const createRender: (client: Client, payload: z.infer<typeof CreateRenderPayload>) => Promise<CreateRenderResult>;
 export declare const uploadRender: (client: Client, fileId: string, fileStream: Readable, folderSize: number) => Promise<unknown>;

package/dist/resources/renders.js

@@ -3,7 +3,7 @@ import debug from "debug";
 const log = debug("ef:api:renders");
 const FILE_SIZE_LIMIT = 1024 * 1024 * 16;
 const CreateRenderPayload = z.object({
-  id: z.string().uuid(),
+  md5: z.string(),
   fps: z.number(),
   width: z.number().int(),
   height: z.number().int(),
@@ -13,7 +13,7 @@ const CreateRenderPayload = z.object({
 });
 const createRender = async (client, payload) => {
   log("Creating render", payload);
-  const response = await client.authenticatedFetch("/api/video2/renders", {
+  const response = await client.authenticatedFetch("/api/v1/renders", {
     method: "POST",
     body: JSON.stringify(payload)
   });
@@ -32,7 +32,7 @@ const uploadRender = async (client, fileId, fileStream, folderSize) => {
     throw new Error(`File size exceeds limit of ${FILE_SIZE_LIMIT} bytes`);
   }
   const response = await client.authenticatedFetch(
-    `/api/video2/renders/${fileId}/upload`,
+    `/api/v1/renders/${fileId}/upload`,
     {
       method: "POST",
       body: fileStream

package/dist/resources/unprocessed-file.d.ts

@@ -3,17 +3,17 @@ import { z } from 'zod';
 import { Client } from '../client.ts';
 declare const FileProcessors: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"isobmff">, z.ZodLiteral<"image">, z.ZodLiteral<"captions">]>, "many">, ("captions" | "image" | "isobmff")[], ("captions" | "image" | "isobmff")[]>;
 export declare const CreateUnprocessedFilePayload: z.ZodObject<{
-    id: z.ZodString;
+    md5: z.ZodString;
     filename: z.ZodString;
     processes: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"isobmff">, z.ZodLiteral<"image">, z.ZodLiteral<"captions">]>, "many">, ("captions" | "image" | "isobmff")[], ("captions" | "image" | "isobmff")[]>>;
     byte_size: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
-    id: string;
+    md5: string;
     filename: string;
     byte_size: number;
     processes?: ("captions" | "image" | "isobmff")[] | undefined;
 }, {
-    id: string;
+    md5: string;
     filename: string;
     byte_size: number;
     processes?: ("captions" | "image" | "isobmff")[] | undefined;
@@ -28,14 +28,18 @@ export declare const UpdateUnprocessedFilePayload: z.ZodObject<{
 export interface CreateUnprocessedFileResult {
     byte_size: number;
     next_byte: number;
+    complete: boolean;
     id: string;
+    md5: string;
     processes: z.infer<typeof FileProcessors>;
     asset_id: string;
 }
 export interface UpdateUnprocessedFileResult {
     byte_size?: number;
     next_byte: number;
+    complete: boolean;
     id: string;
+    md5: string;
     processes: z.infer<typeof FileProcessors>;
     asset_id: string;
 }

package/dist/resources/unprocessed-file.js

@@ -22,7 +22,7 @@ const FileProcessors = z.array(FileProcessor).refine(
 );
 const MAX_FILE_SIZE = 1024 * 1024 * 1024;
 const CreateUnprocessedFilePayload = z.object({
-  id: z.string(),
+  md5: z.string(),
   filename: z.string(),
   processes: FileProcessors.optional(),
   byte_size: z.number().int().max(MAX_FILE_SIZE)
@@ -80,55 +80,69 @@ const uploadUnprocessedFile = async (client, fileId, fileStream, fileSize) => {
   });
   log("Unprocessed file upload complete");
 };
+const processResource = async (client, filename, md5, byteSize, processor, doUpload) => {
+  log("Processing", { filename, md5, byteSize, processor });
+  const unprocessedFile = await createUnprocessedFile(client, {
+    md5,
+    processes: [],
+    filename,
+    byte_size: byteSize
+  });
+  if (unprocessedFile.complete === false) {
+    await doUpload(unprocessedFile.id);
+  }
+  if (unprocessedFile.processes.includes(processor)) {
+    log("File already processed", unprocessedFile);
+    return unprocessedFile;
+  }
+  const fileInformation = await updateUnprocessedFile(
+    client,
+    unprocessedFile.id,
+    {
+      processes: [processor]
+    }
+  );
+  log("File processed", fileInformation);
+  return fileInformation;
+};
 const buildBufferProcessor = (processor) => {
   return async (client, buffer, filename = "buffer") => {
     log(`Processing file buffer: ${processor}`, filename);
-    const fileId = md5Buffer(buffer);
-    log("File ID", fileId);
-    log(`File size: ${buffer.byteLength} bytes`);
-    await createUnprocessedFile(client, {
-      id: fileId,
-      processes: [],
+    const md5 = md5Buffer(buffer);
+    return await processResource(
+      client,
       filename,
-      byte_size: buffer.byteLength
-    });
-    const readStream = new Readable({
-      read() {
-        readStream.push(buffer);
-        readStream.push(null);
+      md5,
+      buffer.byteLength,
+      processor,
+      async (id) => {
+        const readStream = new Readable({
+          read() {
+            readStream.push(buffer);
+            readStream.push(null);
+          }
+        });
+        await uploadUnprocessedFile(client, id, readStream, buffer.byteLength);
       }
-    });
-    await uploadUnprocessedFile(client, fileId, readStream, buffer.byteLength);
-    const fileInformation = await updateUnprocessedFile(client, fileId, {
-      processes: [processor]
-    });
-    log("File processed", fileInformation);
-    return fileInformation;
+    );
   };
 };
 const buildFileProcessor = (processor) => {
   return async (client, filePath) => {
     log(`Processing file ${processor}`, filePath);
-    const fileId = await md5FilePath(filePath);
-    log("File ID", fileId);
-    await createUnprocessedFile(client, {
-      id: fileId,
-      processes: [],
-      filename: basename(filePath),
-      byte_size: (await stat(filePath)).size
-    });
-    const readStream = createReadStream(filePath);
-    await uploadUnprocessedFile(
+    const md5 = await md5FilePath(filePath);
+    const byteSize = (await stat(filePath)).size;
+    return await processResource(
       client,
-      fileId,
-      readStream,
-      (await stat(filePath)).size
+      basename(filePath),
+      md5,
+      byteSize,
+      processor,
+      async (id) => {
+        const readStream = createReadStream(filePath);
+        return await uploadUnprocessedFile(client, id, readStream, byteSize);
+      }
     );
-    const fileInformation = await updateUnprocessedFile(client, fileId, {
-      processes: [processor]
-    });
-    log("File processed", fileInformation);
-    return fileInformation;
   };
 };
 const processAVFileBuffer = buildBufferProcessor("isobmff");

package/dist/uploadChunks.js

@@ -40,6 +40,12 @@ async function uploadChunks(client, {
   fileStream,
   chunkSizeBytes = CHUNK_SIZE_BYTES
 }) {
+  log("Checking upload status", url);
+  const uploadStatus = await client.authenticatedFetch(url);
+  if (uploadStatus.status === 200) {
+    log("Fragment track already uploaded");
+    return;
+  }
   let chunkNumber = 0;
   let complete = false;
   for await (const chunkBuffer of streamChunker(fileStream, chunkSizeBytes)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/api",
-  "version": "0.9.0-beta.3",
+  "version": "0.10.0-beta.3",
   "description": "API functions for EditFrame",
   "exports": {
     ".": {
@@ -28,7 +28,7 @@
     "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {
-    "@editframe/assets": "0.9.0-beta.3",
+    "@editframe/assets": "0.10.0-beta.3",
     "debug": "^4.3.5",
     "jsonwebtoken": "^9.0.2",
     "node-fetch": "^3.3.2",

package/src/resources/caption-file.test.ts

@@ -18,7 +18,7 @@ describe("CaptionFile", () => {
     test("Throws when file is too large", async () => {
       await expect(
         createCaptionFile(client, {
-          id: "test-id",
+          md5: "test-md5",
           filename: "test",
           byte_size: 1024 * 1024 * 3,
         }),
@@ -29,14 +29,14 @@ describe("CaptionFile", () => {
 
     test("Throws when server returns an error", async () => {
       server.use(
-        http.post("http://localhost/api/video2/caption_files", () =>
+        http.post("http://localhost/api/v1/caption_files", () =>
           HttpResponse.text("Internal Server Error", { status: 500 }),
         ),
       );
 
       await expect(
         createCaptionFile(client, {
-          id: "test-id",
+          md5: "test-md5",
           filename: "test",
           byte_size: 4,
         }),
@@ -47,7 +47,7 @@ describe("CaptionFile", () => {
 
     test("Returns json data from the http response", async () => {
       server.use(
-        http.post("http://localhost/api/video2/caption_files", () =>
+        http.post("http://localhost/api/v1/caption_files", () =>
           HttpResponse.json(
             { id: "test-id" },
             { status: 200, statusText: "OK" },
@@ -56,7 +56,7 @@ describe("CaptionFile", () => {
       );
 
       const response = await createCaptionFile(client, {
-        id: "test-id",
+        md5: "test-md5",
         filename: "test",
         byte_size: 4,
       });
@@ -81,9 +81,8 @@ describe("CaptionFile", () => {
 
     test("Throws when server returns an error", async () => {
       server.use(
-        http.post(
-          "http://localhost/api/video2/caption_files/test-id/upload",
-          () => HttpResponse.text("Internal Server Error", { status: 500 }),
+        http.post("http://localhost/api/v1/caption_files/test-id/upload", () =>
+          HttpResponse.text("Internal Server Error", { status: 500 }),
         ),
       );
 
@@ -101,13 +100,11 @@ describe("CaptionFile", () => {
 
     test("Returns json data from the http response", async () => {
       server.use(
-        http.post(
-          "http://localhost/api/video2/caption_files/test-id/upload",
-          () =>
-            HttpResponse.json(
-              { id: "test-id" },
-              { status: 200, statusText: "OK" },
-            ),
+        http.post("http://localhost/api/v1/caption_files/test-id/upload", () =>
+          HttpResponse.json(
+            { id: "test-id" },
+            { status: 200, statusText: "OK" },
+          ),
         ),
       );
 

package/src/resources/caption-file.ts

@@ -10,7 +10,7 @@ const log = debug("ef:api:caption-file");
 const MAX_CAPTION_SIZE = 1024 * 1024 * 2; // 2MB
 
 export const CreateCaptionFilePayload = z.object({
-  id: z.string(),
+  md5: z.string(),
   filename: z.string(),
   byte_size: z.number().int().max(MAX_CAPTION_SIZE),
 });
@@ -18,6 +18,7 @@ export const CreateCaptionFilePayload = z.object({
 export interface CreateCaptionFileResult {
   complete: boolean | null;
   id: string;
+  md5: string;
   asset_id: string;
 }
 
@@ -52,13 +53,10 @@ export const createCaptionFile = async (
 ) => {
   log("Creating caption file", payload);
   restrictSize(payload.byte_size);
-  const response = await client.authenticatedFetch(
-    "/api/video2/caption_files",
-    {
-      method: "POST",
-      body: JSON.stringify(payload),
-    },
-  );
+  const response = await client.authenticatedFetch("/api/v1/caption_files", {
+    method: "POST",
+    body: JSON.stringify(payload),
+  });
   log("Caption file created", response);
 
   if (response.ok) {
@@ -80,7 +78,7 @@ export const uploadCaptionFile = async (
   restrictSize(fileSize);
 
   const response = await client.authenticatedFetch(
-    `/api/video2/caption_files/${fileId}/upload`,
+    `/api/v1/caption_files/${fileId}/upload`,
     {
       method: "POST",
       body: fileStream,